Merge branch 'ft' into 'main_dev'

feat: 系统管理下的角色管理 配置状态新增权限控制

See merge request yunteng/thingskit-front!829

@@ -97,10 +97,13 @@
                 ...operationString,
                 ...operationString,
                 ...operationBoolean,
                 ...operationBoolean,
               ].find((item) => item.value === curr.value.logic)?.symbol;
               ].find((item) => item.value === curr.value.logic)?.symbol;
+              const findAttribute = item.attribute.find(
+                (findItem) => findItem.identifier === curr.value.key
+              );
               const value = {
               const value = {
                 ['触发属性']: findName,
                 ['触发属性']: findName,
                 ['触发条件']: `${findLogin}${curr.value.logicValue}`,
                 ['触发条件']: `${findLogin}${curr.value.logicValue}`,
-                ['触发值']: curr.value.realValue,
+                ['触发值']: `${curr.value.realValue}${findAttribute.detail?.dataType?.specs?.unit?.key}`,
               };
               };
               const data = {
               const data = {
                 [item.name]: value,
                 [item.name]: value,
@@ -142,6 +145,7 @@
         const attribute = attributes.map((item) => ({
         const attribute = attributes.map((item) => ({
           identifier: item.identifier,
           identifier: item.identifier,
           name: item.name,
           name: item.name,
+          detail: item.detail,
         }));
         }));
         return {
         return {
           name,
           name,

@@ -17,16 +17,26 @@
         </Authority>
         </Authority>
       </template>
       </template>
       <template #config="{ record }">
       <template #config="{ record }">
-        <a-button type="link" class="ml-2" @click="showData(record)"> 查看配置 </a-button>
+        <Authority value="api:yt:message:get">
+          <a-button type="link" class="ml-2" @click="showData(record)"> 查看配置 </a-button>
+        </Authority>
       </template>
       </template>
       <template #status="{ record }">
       <template #status="{ record }">
-        <Switch
-          :checked="record.status === 1"
-          :loading="record.pendingStatus"
-          checkedChildren="启用"
-          unCheckedChildren="禁用"
-          @change="(checked:boolean)=>statusChange(checked,record)"
-        />
+        <Authority value="api:yt:message:status">
+          <Switch
+            :checked="record.status === 1"
+            :loading="record.pendingStatus"
+            checkedChildren="启用"
+            unCheckedChildren="禁用"
+            @change="(checked:boolean)=>statusChange(checked,record)"
+          />
+        </Authority>
+        <Tag
+          v-if="!hasPermission('api:yt:message:status')"
+          :color="record.status ? 'green' : 'red'"
+        >
+          {{ record.status ? '启用' : '禁用' }}
+        </Tag>
       </template>
       </template>
       <template #action="{ record }">
       <template #action="{ record }">
         <TableAction
         <TableAction
@@ -62,18 +72,20 @@
   import { useDrawer } from '/@/components/Drawer';
   import { useDrawer } from '/@/components/Drawer';
   import ConfigDrawer from './ConfigDrawer.vue';
   import ConfigDrawer from './ConfigDrawer.vue';
   import { columns, searchFormSchema } from './config.data';
   import { columns, searchFormSchema } from './config.data';
-  import { Modal, Popconfirm } from 'ant-design-vue';
+  import { Modal, Popconfirm, Tag } from 'ant-design-vue';
   import { JsonPreview } from '/@/components/CodeEditor';
   import { JsonPreview } from '/@/components/CodeEditor';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { Switch } from 'ant-design-vue';
   import { Switch } from 'ant-design-vue';
   import { setMessageConfigStatus } from '/@/api/message/config';
   import { setMessageConfigStatus } from '/@/api/message/config';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
+  import { usePermission } from '/@/hooks/web/usePermission';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'MessageConfigManagement',
     name: 'MessageConfigManagement',
-    components: { BasicTable, ConfigDrawer, TableAction, Switch, Authority, Popconfirm },
+    components: { BasicTable, ConfigDrawer, TableAction, Switch, Authority, Popconfirm, Tag },
     setup() {
     setup() {
+      const { hasPermission } = usePermission();
       const [registerDrawer, { openDrawer }] = useDrawer();
       const [registerDrawer, { openDrawer }] = useDrawer();
       function handleSuccess() {
       function handleSuccess() {
         reload();
         reload();
@@ -168,6 +180,7 @@
         handleDeleteOrBatchDelete,
         handleDeleteOrBatchDelete,
         hasBatchDelete,
         hasBatchDelete,
         statusChange,
         statusChange,
+        hasPermission,
       };
       };
     },
     },
   });
   });

@@ -22,13 +22,21 @@
         </a-button>
         </a-button>
       </template>
       </template>
       <template #status="{ record }">
       <template #status="{ record }">
-        <Switch
-          :checked="record.status === 1"
-          :loading="record.pendingStatus"
-          checkedChildren="启用"
-          unCheckedChildren="禁用"
-          @change="(checked:boolean)=>statusChange(checked,record)"
-        />
+        <Authority value="api:yt:template:status">
+          <Switch
+            :checked="record.status === 1"
+            :loading="record.pendingStatus"
+            checkedChildren="启用"
+            unCheckedChildren="禁用"
+            @change="(checked:boolean)=>statusChange(checked,record)"
+          />
+        </Authority>
+        <Tag
+          v-if="!hasPermission('api:yt:template:status')"
+          :color="record.status ? 'green' : 'red'"
+        >
+          {{ record.status ? '启用' : '禁用' }}
+        </Tag>
       </template>
       </template>
       <template #action="{ record }">
       <template #action="{ record }">
         <TableAction
         <TableAction
@@ -80,9 +88,10 @@
   import SendEmail from '/@/views/message/template/SendEmail.vue';
   import SendEmail from '/@/views/message/template/SendEmail.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
-  import { Switch, Popconfirm } from 'ant-design-vue';
+  import { Switch, Popconfirm, Tag } from 'ant-design-vue';
   import { setMessageTemplateStatus } from '/@/api/message/template';
   import { setMessageTemplateStatus } from '/@/api/message/template';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
+  import { usePermission } from '/@/hooks/web/usePermission';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'MessageTemplateManagement',
     name: 'MessageTemplateManagement',
@@ -95,8 +104,10 @@
       Switch,
       Switch,
       Authority,
       Authority,
       Popconfirm,
       Popconfirm,
+      Tag,
     },
     },
     setup() {
     setup() {
+      const { hasPermission } = usePermission();
       const [registerModal, { openModal: openModal }] = useModal();
       const [registerModal, { openModal: openModal }] = useModal();
       const [registerMailModal, { openModal: openMailModal }] = useModal();
       const [registerMailModal, { openModal: openMailModal }] = useModal();
       const go = useGo();
       const go = useGo();
@@ -218,6 +229,7 @@
         handleDeleteOrBatchDelete,
         handleDeleteOrBatchDelete,
         statusChange,
         statusChange,
         hasBatchDelete,
         hasBatchDelete,
+        hasPermission,
       };
       };
     },
     },
   });
   });

@@ -9,6 +9,7 @@ export enum PermissionReportConfigEnum {
   PERMISSION_GET = 'api:yt:report:get',
   PERMISSION_GET = 'api:yt:report:get',
   PERMISSION_DELETE = 'api:yt:report_form:config:delete',
   PERMISSION_DELETE = 'api:yt:report_form:config:delete',
   PERMISSION_UPDATE = 'api:yt:report_form:config:update',
   PERMISSION_UPDATE = 'api:yt:report_form:config:update',
+  PERMISSION_STATUS = 'api:yt:report_form:config:status',
 }
 }
 
 
 //业务文字描述配置枚举
 //业务文字描述配置枚举

@@ -74,14 +74,22 @@
         />
         />
       </template>
       </template>
       <template #configStatus="{ record }">
       <template #configStatus="{ record }">
-        <Switch
-          :disabled="disabledSwitch"
-          :checked="record.status === 1"
-          :loading="record.pendingStatus"
-          :checkedChildren="BusinessReportConfigTextEnum.BUSINESS_ENABLE_TEXT"
-          :unCheckedChildren="BusinessReportConfigTextEnum.BUSINESS_DISABLE_TEXT"
-          @change="(checked: boolean) => statusChange(checked, record)"
-        />
+        <Authority :value="PermissionReportConfigEnum.PERMISSION_STATUS">
+          <Switch
+            :disabled="disabledSwitch"
+            :checked="record.status === 1"
+            :loading="record.pendingStatus"
+            :checkedChildren="BusinessReportConfigTextEnum.BUSINESS_ENABLE_TEXT"
+            :unCheckedChildren="BusinessReportConfigTextEnum.BUSINESS_DISABLE_TEXT"
+            @change="(checked: boolean) => statusChange(checked, record)"
+          />
+        </Authority>
+        <Tag
+          v-if="!hasPermission(PermissionReportConfigEnum.PERMISSION_STATUS)"
+          :color="record.status ? 'green' : 'red'"
+        >
+          {{ record.status ? '启用' : '禁用' }}
+        </Tag>
       </template>
       </template>
     </BasicTable>
     </BasicTable>
     <ReportConfigDrawer @register="registerDrawer" @success="handleSuccess" />
     <ReportConfigDrawer @register="registerDrawer" @success="handleSuccess" />
@@ -101,7 +109,7 @@
   import { defaultTableAttribtes } from './config';
   import { defaultTableAttribtes } from './config';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
-  import { Popconfirm, Switch } from 'ant-design-vue';
+  import { Popconfirm, Switch, Tag } from 'ant-design-vue';
   import { useModal } from '/@/components/Modal';
   import { useModal } from '/@/components/Modal';
   import { useGo } from '/@/hooks/web/usePage';
   import { useGo } from '/@/hooks/web/usePage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -111,6 +119,9 @@
     BusinessReportConfigTextEnum,
     BusinessReportConfigTextEnum,
     BusinessReportConfigStatusEnum,
     BusinessReportConfigStatusEnum,
   } from './enum';
   } from './enum';
+  import { usePermission } from '/@/hooks/web/usePermission';
+
+  const { hasPermission } = usePermission();
 
 
   const disabledSwitch = ref(false);
   const disabledSwitch = ref(false);
 
 

@@ -21,13 +21,18 @@
         </Authority>
         </Authority>
       </template>
       </template>
       <template #status="{ record }">
       <template #status="{ record }">
-        <Switch
-          :checked="record.status === 1"
-          :loading="record.pendingStatus"
-          checkedChildren="启用"
-          unCheckedChildren="禁用"
-          @change="(checked:boolean)=>statusChange(checked,record)"
-        />
+        <Authority value="api:yt:role:status">
+          <Switch
+            :checked="record.status === 1"
+            :loading="record.pendingStatus"
+            checkedChildren="启用"
+            unCheckedChildren="禁用"
+            @change="(checked:boolean)=>statusChange(checked,record)"
+          />
+        </Authority>
+        <Tag v-if="!hasPermission('api:yt:role:status')" :color="record.status ? 'green' : 'red'">
+          {{ record.status ? '启用' : '禁用' }}
+        </Tag>
       </template>
       </template>
       <template #action="{ record }">
       <template #action="{ record }">
         <TableAction
         <TableAction
@@ -67,12 +72,14 @@
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { Switch, Popconfirm } from 'ant-design-vue';
+  import { Switch, Popconfirm, Tag } from 'ant-design-vue';
+  import { usePermission } from '/@/hooks/web/usePermission';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'RoleManagement',
     name: 'RoleManagement',
-    components: { BasicTable, RoleDrawer, TableAction, Authority, Switch, Popconfirm },
+    components: { BasicTable, RoleDrawer, TableAction, Authority, Switch, Popconfirm, Tag },
     setup() {
     setup() {
+      const { hasPermission } = usePermission();
       const [registerDrawer, { openDrawer }] = useDrawer();
       const [registerDrawer, { openDrawer }] = useDrawer();
       function handleSuccess() {
       function handleSuccess() {
         reload();
         reload();
@@ -157,6 +164,7 @@
         hasBatchDelete,
         hasBatchDelete,
         handleDeleteOrBatchDelete,
         handleDeleteOrBatchDelete,
         statusChange,
         statusChange,
+        hasPermission,
       };
       };
     },
     },
   });
   });