Merge branch 'ft' into 'main_dev'

feat: 设备列表新增客户不能跳转和隐藏按钮 See merge request yunteng/thingskit-front!551

Merge branch 'ft' into 'main_dev'
feat: 设备列表新增客户不能跳转和隐藏按钮 See merge request yunteng/thingskit-front!551
xp.Huang
2 parents 1d60a05b 4c79e9e4
Showing 9 changed files with 65 additions and 38 deletions
src/views/device/list/config/data.ts
src/views/device/list/config/detail.config.ts
src/views/device/list/config/device.data.ts
src/views/device/list/cpns/modal/DeviceModal.vue
src/views/device/list/cpns/step/DeviceStep1.vue
src/views/device/list/cpns/tabs/Detail.vue
src/views/device/list/hook/useAuthDeviceDetail.ts
src/views/device/list/index.vue
src/views/device/profiles/step/topic.tsx
--- a/src/views/device/list/config/data.ts
View file @aefa8a5
+++ b/src/views/device/list/config/data.ts
View file @aefa8a5
@@ -19,31 +19,35 @@ export const step1Schemas: FormSchema[] = [
     component: 'Input',
   },
   {
-    field: 'name',
-    label: '设备名称',
-    required: true,
-    component: 'Input',
-    colProps: { span: 14 },
-    componentProps: {
-      placeholder: '设备名称',
-      maxLength: 36,
-    },
-  },
-  {
     field: 'alias',
     label: '别名 ',
     component: 'Input',
-    labelWidth: 60,
-    colProps: { span: 10 },
     componentProps: {
       maxLength: 255,
     },
   },
   {
-    field: 'sn',
-    label: 'SN码',
+    field: 'name',
+    label: '设备名称/SN码',
     component: 'Input',
-    required: true,
+    dynamicRules: () => {
+      return [
+        {
+          required: true,
+          validator: (_, value) => {
+            // 支持英文字母、数字、下划线（_）、中划线（-）、点号（.）、半角冒号（:）和特殊字符@，长度限制为4~32个字符
+            const reg = /^[A-Za-z0-9_\( \)\-\@\:\.]+$/;
+            const strLength = String(value).length as number;
+            if (!reg.test(value) || strLength > 32 || strLength < 4) {
+              return Promise.reject(
+                '请输入支持英文字母、数字、下划线（_）、中划线（-）、点号（.）、半角冒号（:）和特殊字符@，长度限制为4~32个字符'
+              );
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
     slot: 'snCode',
   },
   {
--- a/src/views/device/list/config/detail.config.ts
View file @aefa8a5
+++ b/src/views/device/list/config/detail.config.ts
View file @aefa8a5
@@ -10,6 +10,7 @@ import { Button } from 'ant-design-vue';
 import { TypeEnum } from './data';
 import { PageEnum } from '/@/enums/pageEnum';
 import { useGo } from '/@/hooks/web/usePage';
+import { useAuthDeviceDetail } from '../hook/useAuthDeviceDetail';
 // 设备详情的描述
 export const descSchema = (emit: EmitType): DescItem[] => {
@@ -34,12 +35,14 @@ export const descSchema = (emit: EmitType): DescItem[] => {
       label: '产品',
       render(val) {
         const go = useGo();
+        const { isCustomer } = useAuthDeviceDetail();
         return h(
           Button,
           {
             type: 'link',
             style: { padding: 0 },
-            onClick: () => go(PageEnum.DEVICE_PROFILE + '?name=' + String(val)),
+            onClick: () =>
+              !isCustomer ? go(PageEnum.DEVICE_PROFILE + '?name=' + String(val)) : '',
           },
           { default: () => val }
         );
--- a/src/views/device/list/config/device.data.ts
View file @aefa8a5
+++ b/src/views/device/list/config/device.data.ts
View file @aefa8a5
@@ -5,6 +5,7 @@ import { DeviceTypeEnum, DeviceState, DeviceRecord } from '/@/api/device/model/d
 import { deviceProfile } from '/@/api/device/deviceManager';
 import { h } from 'vue';
 import { Tag } from 'ant-design-vue';
+import { handeleCopy } from '../../profiles/step/topic';
 // 表格列数据
 export const columns: BasicColumn[] = [
@@ -24,9 +25,19 @@ export const columns: BasicColumn[] = [
     dataIndex: 'name',
     title: '设备名称/设备SN',
     width: 200,
-    align: 'left',
     slots: { customRender: 'name', title: 'deviceTitle' },
-    ellipsis: true,
+    customRender: ({ record }) => {
+      return h(
+        'span',
+        {
+          style: { cursor: 'pointer', color: '#377dff' },
+          onClick: () => {
+            handeleCopy(record.name || record.alias);
+          },
+        },
+        record.name || record.alias
+      );
+    },
   },
   {
     title: '设备类型',
--- a/src/views/device/list/cpns/modal/DeviceModal.vue
View file @aefa8a5
+++ b/src/views/device/list/cpns/modal/DeviceModal.vue
View file @aefa8a5
@@ -140,8 +140,8 @@
             confirmLoading: true,
           });
           if (unref(isUpdate)) {
-            console.log(currentDeviceData);
             const editData = {
+              sn: 'XXXX',
               ...unref(stepState),
               customerId: currentDeviceData.customerId,
               deviceInfo: {
@@ -152,6 +152,7 @@
             await createOrEditDevice(editData);
           } else {
             const createData = {
+              sn: 'XXXX',
               ...unref(stepState),
               deviceInfo: {
                 avatar: DeviceStep1Ref.value?.devicePic,
--- a/src/views/device/list/cpns/step/DeviceStep1.vue
View file @aefa8a5
+++ b/src/views/device/list/cpns/step/DeviceStep1.vue
View file @aefa8a5
@@ -363,7 +363,7 @@
       const generateSN = async () => {
         const data = await generateSNCode();
         setFieldsValue({
-          sn: data,
+          name: data,
         });
       };
--- a/src/views/device/list/cpns/tabs/Detail.vue
View file @aefa8a5
+++ b/src/views/device/list/cpns/tabs/Detail.vue
View file @aefa8a5
@@ -49,7 +49,7 @@
       </div>
       <Description @register="register" class="mt-4" :data="deviceDetail" />
     </div>
-    <div class="mt-4">
+    <div class="mt-4" v-if="!isCustomer">
       <a-button type="primary" class="mr-4" @click="copyTbDeviceId">复制设备ID</a-button>
       <a-button type="primary" class="mr-4" @click="copyDeviceToken">复制访问令牌</a-button>
       <a-button type="primary" class="mr-4" @click="manageDeviceToken">管理设备凭证</a-button>
@@ -83,6 +83,7 @@
   import { Description, useDescription } from '/@/components/Description';
   import { QuestionCircleOutlined } from '@ant-design/icons-vue';
   import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
+  import { useAuthDeviceDetail } from '../../hook/useAuthDeviceDetail';
   import wz from '/@/assets/images/wz.png';
   import { useAsyncQueue } from '../../../localtion/useAsyncQueue';
@@ -116,6 +117,7 @@
       const mapWrapRef = ref<HTMLDivElement>();
       const { executeFlag, setTask } = useAsyncQueue();
+      const { isCustomer } = useAuthDeviceDetail();
       const { toPromise } = useAsyncScript({ src: BAI_DU_MAP_URL });
       async function initMap(longitude: number, latitude: number, address: string) {
@@ -209,6 +211,7 @@
         copyTopic,
         remoteConnectiondGateway,
         locationImage,
+        isCustomer,
       };
     },
   });
--- a/src/views/device/list/hook/useAuthDeviceDetail.ts 0 → 100644
View file @aefa8a5
+++ b/src/views/device/list/hook/useAuthDeviceDetail.ts 0 → 100644
View file @aefa8a5
+import { getAuthCache } from '/@/utils/auth';
+import { RoleEnum } from '/@/enums/roleEnum';
+import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+
+//客户
+export const useAuthDeviceDetail = () => {
+  const userInfo: any = getAuthCache(USER_INFO_KEY);
+
+  const role: string = userInfo?.roles[0];
+
+  const isCustomer = role === RoleEnum.CUSTOMER_USER;
+  return {
+    isCustomer,
+  };
+};
--- a/src/views/device/list/index.vue
View file @aefa8a5
+++ b/src/views/device/list/index.vue
View file @aefa8a5
@@ -62,21 +62,9 @@
             </Popover>
           </div>
         </template>
-        <template #name="{ record }">
-          <div>
-            <Tooltip :title="record.alias || record.name" placement="topRight">
-              {{ record.alias || record.name.slice(0, 13) }}
-            </Tooltip>
-          </div>
-          <Tooltip title="设备SN码" placement="topRight">
-            <a-button type="link" @click="copySN(record.sn)" style="padding: 0">
-              {{ record.sn }}
-            </a-button>
-          </Tooltip>
-        </template>
         <template #deviceProfile="{ record }">
           <Tag.CheckableTag
-            @click="goDeviceProfile(record.deviceProfile.name)"
+            @click="!isCustomer ? goDeviceProfile(record.deviceProfile.name) : null"
             style="white-space: normal; height: auto; cursor: pointer"
           >
             <span style="color: #377dff">{{ record.deviceProfile.name }}</span>
@@ -201,7 +189,7 @@
   } from '/@/api/device/model/deviceModel';
   import { BasicTable, useTable, TableAction, TableImg } from '/@/components/Table';
   import { columns, searchFormSchema } from './config/device.data';
-  import { Tag, Tooltip, Popover, Popconfirm, Button } from 'ant-design-vue';
+  import { Tag, Popover, Popconfirm, Button } from 'ant-design-vue';
   import {
     deleteDevice,
     devicePage,
@@ -231,6 +219,7 @@
   import { useRoute, useRouter } from 'vue-router';
   import { useBatchOperation } from '/@/utils/useBatchOperation';
   import { useSyncConfirm } from '/@/hooks/component/useSyncConfirm';
+  import { useAuthDeviceDetail } from './hook/useAuthDeviceDetail';
   export default defineComponent({
     name: 'DeviceManagement',
@@ -244,7 +233,6 @@
       DeviceDetailDrawer,
       CustomerModal,
       TableImg,
-      Tooltip,
       QuestionCircleOutlined,
       Popover,
       Authority,
@@ -253,6 +241,7 @@
       Button,
     },
     setup(_) {
+      const { isCustomer } = useAuthDeviceDetail();
       const { createMessage } = useMessage();
       const go = useGo();
       const ROUTER = useRouter();
@@ -515,6 +504,7 @@
         handleBatchImport,
         handleImportFinally,
         handlePublicDevice,
+        isCustomer,
       };
     },
   });
--- a/src/views/device/profiles/step/topic.tsx
View file @aefa8a5
+++ b/src/views/device/profiles/step/topic.tsx
View file @aefa8a5
@@ -4,7 +4,7 @@ import { useCopyToClipboard } from '/@/hooks/web/useCopyToClipboard';
 import { useMessage } from '/@/hooks/web/useMessage';
 const { createMessage } = useMessage();
-const handeleCopy = (e) => {
+export const handeleCopy = (e) => {
   const { isSuccessRef } = useCopyToClipboard(JSON.parse(JSON.stringify(unref(e), null, 2)));
   unref(isSuccessRef);
   createMessage.success('复制成功！');