Merge branch 'local_dev_ft' into 'main'

feat:菜单管理新增权限标识 See merge request huang/yun-teng-iot-front!453

Merge branch 'local_dev_ft' into 'main'
feat:菜单管理新增权限标识 See merge request huang/yun-teng-iot-front!453
xp.Huang
2 parents b95d661a 869d1ea1
Showing 5 changed files with 66 additions and 49 deletions
src/views/rule/linkedge/SceneLinkAgeDrawer.vue
src/views/system/dict/index.vue
src/views/system/dict/item/ItemIndex.vue
src/views/system/dict/item/dict.item.data.ts
src/views/system/menu/menu.data.ts
--- a/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @3f0216b
+++ b/src/views/rule/linkedge/SceneLinkAgeDrawer.vue
View file @3f0216b
@@ -18,9 +18,7 @@
         <!-- <Divider orientation="left">触发器</Divider> -->
         <Divider orientation="left">
           <a-tooltip>
-            <template #title
-              >场景联动触发的首要条件，"触发器"之间的关系为或，“执行条件”与“触发器”之间的关系为且。</template
-            >
+            <template #title>触发器不可为空，消息只要满足触发条件中任意一个即可触发。</template>
             触发器
             <QuestionCircleOutlined :style="{ fontSize: '14px', marginLeft: '5px' }" />
           </a-tooltip>
@@ -39,7 +37,7 @@
           <!-- 按钮 -->
           <a-button type="primary" class="mt-4" @click="addTrigger" v-if="isView">
             <PlusOutlined />
-            新增触发器<span style="visibility: hidden">发</span>
+            触发器（OR）<span style="visibility: hidden">发</span>
           </a-button>
           <!-- 按钮 -->
         </div>
@@ -48,10 +46,7 @@
         <!-- 执行条件-begin -->
         <Divider orientation="left">
           <a-tooltip>
-            <template #title
-              >场景联动触发的次要条件，"执行条件"之间的关系为或，
-              “执行条件”与“触发器”之间的关系为且。</template
-            >
+            <template #title>执行条件可为空，消息需要满足所有执行条件才会被处理。</template>
             执行条件
             <QuestionCircleOutlined :style="{ fontSize: '14px', marginLeft: '5px' }" />
           </a-tooltip>
@@ -70,7 +65,7 @@
           <!-- 按钮 -->
           <a-button type="primary" class="mt-4" @click="addCondition" v-if="isView">
             <PlusOutlined />
-            新增执行条件
+            执行条件（AND）
           </a-button>
           <!-- 按钮 -->
         </div>
--- a/src/views/system/dict/index.vue
View file @3f0216b
+++ b/src/views/system/dict/index.vue
View file @3f0216b
@@ -117,7 +117,7 @@
       function handleItem(record: Recordable) {
         openItemDrawer(true, {
-          id: record.id,
+          data: record,
         });
       }
--- a/src/views/system/dict/item/ItemIndex.vue
View file @3f0216b
+++ b/src/views/system/dict/item/ItemIndex.vue
View file @3f0216b
@@ -31,6 +31,16 @@
               ]"
             />
           </template>
+          <template #status="{ record }">
+            <Switch
+              :disabled="disabled"
+              :checked="record.status === 1"
+              :loading="record.pendingStatus"
+              checkedChildren="启用"
+              unCheckedChildren="禁用"
+              @change="(checked:boolean)=>statusChange(checked,record)"
+            />
+          </template>
         </BasicTable>
         <ItemDrawer @register="registerDrawer" @success="handleSuccess" />
       </div>
@@ -38,30 +48,40 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent } from 'vue';
-
+  import { defineComponent, ref } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { sysDictItemPage, deleteDictItem } from '/@/api/system/dict';
-
+  import { Switch } from 'ant-design-vue';
   import { BasicDrawer, useDrawer, useDrawerInner } from '/@/components/Drawer';
   import ItemDrawer from '/@/views/system/dict/item/ItemDrawer.vue';
-
   import { columns, searchFormSchema } from './dict.item.data';
   import { useMessage } from '/@/hooks/web/useMessage';
   import Authority from '/@/components/Authority/src/Authority.vue';
+  import { setDictItemStatus } from '/@/api/system/dict';
   export default defineComponent({
     name: 'ItemIndex',
-    components: { BasicDrawer, BasicTable, ItemDrawer, TableAction, Authority },
+    components: { BasicDrawer, BasicTable, ItemDrawer, TableAction, Authority, Switch },
     setup() {
       let dictId;
+      const disabled = ref(false);
       const { createMessage } = useMessage();
       const [registerDrawer, { openDrawer }] = useDrawer();
       const [register] = useDrawerInner((data) => {
-        dictId = data.id;
+        dictId = data.data.id;
+        if (
+          data.data.dictCode === 'enabled_platform_admin_auth' ||
+          data.data.dictCode === 'disabled_tenant_auth' ||
+          data.data.dictCode === 'enabled_sysadmin_auth'
+        ) {
+          disabled.value = true;
+        } else {
+          disabled.value = false;
+        }
+
         reload();
       });
-      const [registerTable, { reload }] = useTable({
+      const [registerTable, { reload, setSelectedRowKeys, setProps }] = useTable({
         title: '字典值列表',
         api: sysDictItemPage,
         columns,
@@ -117,7 +137,27 @@
       function handleSuccess() {
         reload();
       }
-
+      const statusChange = async (checked, record) => {
+        setProps({
+          loading: true,
+        });
+        setSelectedRowKeys([]);
+        const newStatus = checked ? 1 : 0;
+        const { createMessage } = useMessage();
+        try {
+          await setDictItemStatus(record.id, newStatus);
+          if (newStatus) {
+            createMessage.success(`启用成功`);
+          } else {
+            createMessage.success('禁用成功');
+          }
+        } finally {
+          setProps({
+            loading: false,
+          });
+          reload();
+        }
+      };
       return {
         register,
         registerTable,
@@ -126,6 +166,8 @@
         handleEdit,
         handleDelete,
         handleSuccess,
+        statusChange,
+        disabled,
       };
     },
   });
--- a/src/views/system/dict/item/dict.item.data.ts
View file @3f0216b
+++ b/src/views/system/dict/item/dict.item.data.ts
View file @3f0216b
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
-import { h } from 'vue';
-import { Switch } from 'ant-design-vue';
-import { setDictItemStatus } from '/@/api/system/dict';
-import { useMessage } from '/@/hooks/web/useMessage';
+
 export const columns: BasicColumn[] = [
   {
     title: '文本值',
@@ -24,30 +21,7 @@ export const columns: BasicColumn[] = [
     title: '状态',
     dataIndex: 'status',
     width: 100,
-    customRender: ({ record }) => {
-      if (!Reflect.has(record, 'pendingStatus')) {
-        record.pendingStatus = false;
-      }
-      return h(Switch, {
-        checked: record.status === 1,
-        checkedChildren: '已启用',
-        unCheckedChildren: '已禁用',
-        loading: record.pendingStatus,
-        onChange(checked: boolean) {
-          record.pendingStatus = true;
-          const newStatus = checked ? 1 : 0;
-          const { createMessage } = useMessage();
-          setDictItemStatus(record.id, newStatus)
-            .then(() => {
-              record.status = newStatus;
-              createMessage.success(`修改成功`);
-            })
-            .finally(() => {
-              record.pendingStatus = false;
-            });
-        },
-      });
-    },
+    slots: { customRender: 'status' },
   },
   {
     title: '排序',
--- a/src/views/system/menu/menu.data.ts
View file @3f0216b
+++ b/src/views/system/menu/menu.data.ts
View file @3f0216b
@@ -129,9 +129,6 @@ export const formSchema: FormSchema[] = [
         { label: t('routes.common.system.menuEditPagesMenu'), value: '1' }, //菜单
         { label: t('routes.common.system.menuEditPagesButton'), value: '2' }, //按钮
       ],
-      onChange: (e) => {
-        console.log('--------11111---------------', e);
-      },
     },
     colProps: { lg: 24, md: 24 },
   },
@@ -187,6 +184,15 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
+    field: 'permission',
+    label: '权限标识', //路由地址
+    component: 'Input',
+    required: true,
+    componentProps: {
+      maxLength: 255,
+    },
+  },
+  {
     field: 'component',
     label: t('routes.common.system.menuEditPagesComponentsPath'), //组件路径
     component: 'Input',