Merge remote-tracking branch 'origin/ui' into ui

new-ui/projects/admin/src/components/PermissionRender.vue

@@ -0,0 +1,10 @@
+<script lang="ts" setup>
+import { hasPermission } from "@/directives/permission";
+defineProps<{
+  permission: string | string[] | true;
+}>();
+</script>
+<template>
+  <slot v-if="hasPermission(permission)" />
+  <slot v-else name="none" />
+</template>

new-ui/projects/admin/src/composables/useSubmit.ts

@@ -1,5 +1,4 @@
 import { ref, reactive, unref } from "vue";
-import { Message } from "@arco-design/web-vue";
 import type { BaseResponse } from "@chatgpt-plus/packages/type";
 function useSubmit<T extends Record<string, any> = Record<string, any>, R = any>(defaultData?: T) {
   const formRef = ref();
@@ -10,14 +9,16 @@ function useSubmit<T extends Record<string, any> = Record<string, any>, R = any>
     submitting.value = true;
     try {
       const hasError = await formRef.value?.validate();
-      if (!hasError) {
-        const { data, message } = await api({ ...formData ?? {}, ...unref(params) });
-        message && Message.success(message);
-        return Promise.resolve({ formData, data });
+      if (hasError) return Promise.reject({ validateErrors: hasError });
+
+      const { data, code, message } = await api({ ...formData ?? {}, ...unref(params) });
+      if (code) {
+        return Promise.reject({ requestErrors: message })
       }
-      return Promise.reject(false);
+
+      return Promise.resolve({ formData, data });
     } catch (err) {
-      return Promise.reject(err);
+      return Promise.reject({ errors: err });
     } finally {
       submitting.value = false;
     }

new-ui/projects/admin/src/directives/permission.ts

@@ -0,0 +1,32 @@
+import { useAuthStore } from "@/stores/auth";
+
+// 判断操作权限
+export function hasPermission(permissionTag: string | string[] | boolean) {
+  const authStore = useAuthStore();
+  const { is_super_admin, permissions = [] } = authStore;
+  if (is_super_admin) {
+    return true;
+  }
+  if (Array.isArray(permissionTag)) {
+    return permissionTag.every((tag) => permissions.includes(tag));
+  }
+  if (typeof permissionTag === "string") {
+    return permissions.includes(permissionTag);
+  }
+  return permissionTag;
+}
+
+function checkPermission(el, binding) {
+  if (!hasPermission(binding.value)) {
+    el.parentNode && el.parentNode.removeChild(el);
+  }
+}
+
+export const permission = {
+  mounted(el, binding) {
+    checkPermission(el, binding);
+  },
+  updated(el, binding) {
+    checkPermission(el, binding);
+  },
+};

new-ui/projects/admin/src/http/config.ts

@@ -8,8 +8,9 @@ export const uploadUrl = import.meta.env.VITE_PROXY_BASE_URL + "/api/admin/uploa
 export const instance = createInstance(import.meta.env.VITE_PROXY_BASE_URL)
 
 instance.interceptors.request.use((config) => {
-  config.headers[__AUTH_KEY] = localStorage.getItem(__AUTH_KEY);
-  config.headers["Authorization"] = localStorage.getItem(__AUTH_KEY);
+  const TOKEN = JSON.parse(localStorage.getItem(__AUTH_KEY))?.token
+  config.headers[__AUTH_KEY] = TOKEN;
+  config.headers["Authorization"] = TOKEN;
   return config;
 });
 

new-ui/projects/admin/src/http/login.ts

@@ -1,9 +1,6 @@
 import http from "@/http/config";
 
-export const userLogin = (data: {
-  username: string;
-  password: string;
-}) => {
+export const userLogin = (data) => {
   return http({
     url: "/api/admin/login",
     method: "post",
@@ -26,7 +23,7 @@ export const getSession = () => {
 };
 
 
-export const loginLog = (params?: Record<string, unknown>) => {
+export const loginLog = (params) => {
   return http({
     url: "/api/admin/user/loginLog",
     method: "get",

new-ui/projects/admin/src/main.ts

@@ -3,6 +3,8 @@ import { createPinia } from "pinia";
 import ArcoVue from "@arco-design/web-vue";
 import ArcoVueIcon from "@arco-design/web-vue/es/icon";
 import "@arco-design/web-vue/dist/arco.css";
+import PermissionRender from "@/components/PermissionRender.vue";
+import { permission } from "@/directives/permission";
 
 import App from "./App.vue";
 import router from "./router";
@@ -14,6 +16,9 @@ app.use(router);
 app.use(ArcoVue);
 app.use(ArcoVueIcon);
 
+app.component("PermissionRender", PermissionRender);
+app.directive("permission", permission);
+
 app.mount("#app");
 app.config.warnHandler = (msg, vm, trace) => {
   if (msg.includes('Invalid prop name: "key" is a reserved property.')) {

new-ui/projects/admin/src/router/index.ts

@@ -1,14 +1,27 @@
 import { createRouter, createWebHashHistory } from 'vue-router'
 import { useAuthStore } from "@/stores/auth";
 import CustomLayout from '@/components/CustomLayout.vue'
+import { hasPermission } from "@/directives/permission";
 import menu from './menu'
 
+declare module 'vue-router' {
+  interface RouteMeta {
+    title?: string
+    permission?: string
+  }
+}
+
 const whiteListRoutes = [
   {
     path: "/login",
     name: "Login",
     component: () => import("@/views/LoginView.vue"),
   },
+  {
+    path: "/403",
+    name: "403",
+    component: () => import("@/views/NoPermission.vue"),
+  },
   {
     path: "/:pathMatch(.*)*",
     name: "404",
@@ -44,9 +57,13 @@ router.beforeEach((to, _, next) => {
     return;
   }
   if (!authStore.token) {
+    authStore.$reset();
     next({ name: "Login" });
     return;
   }
+  if (to.meta.permission) {
+    next(!hasPermission(to.meta.permission) ? { name: "403" } : undefined);
+  }
   next();
 });
 

new-ui/projects/admin/src/router/menu.ts

@@ -12,6 +12,7 @@ import {
   IconCodepen,
   IconWechatpay,
   IconRobot,
+  IconSafe,
 } from "@arco-design/web-vue/es/icon";
 
 const menu = [
@@ -133,6 +134,15 @@ const menu = [
     },
     component: () => import("@/views/SysAdmin/SysAdminContainer.vue"),
   },
+  {
+    path: "/sysPermission",
+    name: "SysPermission",
+    meta: {
+      title: "权限配置",
+      icon: IconSafe,
+    },
+    component: () => import("@/views/SysPermission/SysPermissionContainer.vue"),
+  },
 ];
 
 export default menu;

new-ui/projects/admin/src/stores/auth.ts

@@ -3,19 +3,29 @@ import { Message } from '@arco-design/web-vue'
 import { userLogin, userLogout } from '@/http/login'
 import router from '@/router'
 
+const defaultState: {
+  token: string
+  is_super_admin?: boolean;
+  permissions?: string[]
+} = {
+  token: null,
+  is_super_admin: false,
+  permissions: []
+}
+
 export const useAuthStore = defineStore({
-  id: __AUTH_KEY,
-  state: () => ({ token: null } as { token: string | null }),
+  id: Symbol(__AUTH_KEY).toString(),
+  state: () => ({ ...defaultState }),
   actions: {
     init() {
-      this.$state.token = localStorage.getItem(__AUTH_KEY);
+      this.$state = JSON.parse(localStorage.getItem(__AUTH_KEY));
     },
     async login(params: any) {
       try {
         const { data } = await userLogin(params)
         if (data) {
-          this.$state.token = data;
-          localStorage.setItem(__AUTH_KEY, data)
+          this.$state = data;
+          localStorage.setItem(__AUTH_KEY, JSON.stringify(data))
           Message.success('登录成功');
           router.replace({ name: 'home' })
           return Promise.resolve(data)

new-ui/projects/admin/src/stores/counter.ts

@@ -1,12 +0,0 @@
-import { ref, computed } from 'vue'
-import { defineStore } from 'pinia'
-
-export const useCounterStore = defineStore('counter', () => {
-  const count = ref(0)
-  const doubleCount = computed(() => count.value * 2)
-  function increment() {
-    count.value++
-  }
-
-  return { count, doubleCount, increment }
-})

new-ui/projects/admin/src/views/NoPermission.vue

@@ -0,0 +1,11 @@
+<script setup lang="ts"></script>
+
+<template>
+  <AResult status="403" subtitle="没有权限">
+    <template #extra>
+      <MButton preset="back" type="primary" />
+    </template>
+  </AResult>
+</template>
+
+<style scoped lang="less"></style>

new-ui/projects/admin/src/views/Order/OrderContainer.vue

@@ -1,8 +1,9 @@
 <script lang="ts" setup>
+import { Message } from "@arco-design/web-vue";
 import SearchTable from "@/components/SearchTable/SearchTable.vue";
 import type { SearchTableColumns } from "@/components/SearchTable/type";
 import { dateFormat } from "@chatgpt-plus/packages/utils";
-import { getList } from "./api";
+import { getList, remove } from "./api";
 
 const columns: SearchTableColumns[] = [
   {
@@ -71,6 +72,12 @@ const columns: SearchTableColumns[] = [
     width: 80,
   },
 ];
+const handleRemove = async (id, reload) => {
+  await remove({ id });
+  Message.success("删除成功");
+  await reload();
+  return true;
+};
 </script>
 <template>
   <SearchTable :request="getList" :columns="columns">
@@ -78,8 +85,15 @@ const columns: SearchTableColumns[] = [
       <a-tag v-if="!record.pay_time" color="blue">未支付</a-tag>
       <span v-else>{{ dateFormat(record.pay_time) }}</span>
     </template>
-    <template #actions="{ record }">
-      <a-link :key="record.id" status="danger">删除</a-link>
+    <template #actions="{ record, reload }">
+      <a-popconfirm
+        content="是否删除？"
+        position="left"
+        type="warning"
+        :on-before-ok="() => handleRemove(record.id, reload)"
+      >
+        <a-link status="danger">删除</a-link>
+      </a-popconfirm>
     </template>
   </SearchTable>
 </template>

new-ui/projects/admin/src/views/Order/api.ts

@@ -7,3 +7,11 @@ export const getList = (data?: Record<string, unknown>) => {
     data
   })
 }
+
+export const remove = (data) => {
+  return http({
+    url: "/api/admin/order/remove",
+    method: "post",
+    data
+  })
+}

new-ui/projects/admin/src/views/SysPermission/SysPermissionContainer.vue

@@ -0,0 +1,82 @@
+<script lang="ts" setup>
+import type { TableColumnData } from "@arco-design/web-vue";
+import { Message } from "@arco-design/web-vue";
+import useRequest from "@/composables/useRequest";
+import usePopup from "@/composables/usePopup";
+import SysPermissionForm from "./SysPermissionForm.vue";
+import { getList, save, remove } from "./api";
+
+const columns: TableColumnData[] = [
+  {
+    dataIndex: "name",
+    title: "权限名称",
+  },
+  {
+    dataIndex: "slug",
+    title: "权限标识",
+  },
+  {
+    dataIndex: "sort",
+    title: "排序",
+  },
+  {
+    title: "操作",
+    slotName: "actions",
+  },
+];
+
+const [reload, data, loading] = useRequest(getList);
+
+const openFormModal = usePopup(SysPermissionForm, {
+  nodeProps: ([_, record]) => ({ record, options: data.value }),
+  popupProps: ([reload, record], exposed) => ({
+    title: `${record?.id ? "编辑" : "新增"}权限`,
+    onBeforeOk: async (done) => {
+      await exposed()?.handleSubmit(save, {
+        id: record?.id,
+      });
+      await reload();
+      done(true);
+    },
+  }),
+});
+
+const handleRemove = async (id) => {
+  await remove({ id });
+  Message.success("删除成功");
+  await reload();
+  return true;
+};
+
+reload();
+</script>
+<template>
+  <div style="padding-bottom: 10px; text-align: right">
+    <a-button type="primary" :loading="loading" @click="openFormModal(reload, {})">
+      <template #icon>
+        <icon-plus />
+      </template>
+      新增
+    </a-button>
+  </div>
+  <a-table
+    :key="String(loading)"
+    :data="data"
+    :loading="loading"
+    :columns="columns"
+    :pagination="false"
+    default-expand-all-rows
+  >
+    <template #actions="{ record, reload }">
+      <a-link @click="openFormModal(reload, record)">编辑</a-link>
+      <a-popconfirm
+        content="是否删除？"
+        position="left"
+        type="warning"
+        :on-before-ok="() => handleRemove(record.id)"
+      >
+        <a-link status="danger">删除</a-link>
+      </a-popconfirm>
+    </template>
+  </a-table>
+</template>

new-ui/projects/admin/src/views/SysPermission/SysPermissionForm.vue

@@ -0,0 +1,63 @@
+<template>
+  <a-form ref="formRef" :model="formData" auto-label-width>
+    <a-form-item
+      field="name"
+      label="权限名称"
+      :rules="[{ required: true, message: '请输入权限名称' }]"
+    >
+      <a-input v-model="formData.name" placeholder="请输入权限名称" />
+    </a-form-item>
+    <a-form-item
+      field="pid"
+      label="上级权限"
+      :rules="[{ required: true, message: '请选择上级权限' }]"
+      extra="默认为顶级权限"
+    >
+      <a-tree-select
+        v-model="formData.pid"
+        :data="_options"
+        :field-names="{ key: 'id', title: 'name' }"
+        placeholder="请选择上级权限"
+      />
+    </a-form-item>
+    <a-form-item field="slug" label="权限标识" extra="规则：controller_method (注意大小写)">
+      <a-input v-model="formData.slug" placeholder="请输入权限标识" />
+    </a-form-item>
+    <a-form-item
+      field="sort"
+      label="排序"
+      :rules="[
+        { required: true, message: '请输入排序' },
+        { min: 0, message: '请输入大于0的正整数', type: 'number' },
+      ]"
+      extra="数字越小越靠前"
+    >
+      <a-input-number v-model="formData.sort" placeholder="请输入排序" :precision="0" />
+    </a-form-item>
+  </a-form>
+</template>
+
+<script lang="ts" setup>
+import { computed, unref } from "vue";
+import useSubmit from "@/composables/useSubmit";
+
+const props = defineProps({
+  record: Object,
+  options: Array,
+});
+
+const { formRef, formData, handleSubmit } = useSubmit({
+  name: "",
+  pid: "0",
+  slug: "",
+  sort: null,
+});
+
+const _options = computed(() => {
+  return [{ id: "0", name: "顶部权限", children: unref(props.options ?? []) }];
+});
+
+Object.assign(formData, props.record);
+
+defineExpose({ handleSubmit });
+</script>

new-ui/projects/admin/src/views/SysPermission/api.ts

@@ -0,0 +1,25 @@
+import http from "@/http/config";
+
+export const getList = (params) => {
+  return http({
+    url: "/api/admin/sysPermission/list",
+    method: "get",
+    params
+  })
+}
+
+export const save = (data) => {
+  return http({
+    url: "/api/admin/sysPermission/save",
+    method: "post",
+    data
+  })
+}
+
+export const remove = (data) => {
+  return http({
+    url: "/api/admin/sysPermission/remove",
+    method: "post",
+    data
+  })
+}