Merge branch 'main' into sqy_dev

@@ -49,10 +49,10 @@
 <script lang="ts">
 <script lang="ts">
   import { defineComponent, ref, computed, unref, getCurrentInstance, reactive } from 'vue';
   import { defineComponent, ref, computed, unref, getCurrentInstance, reactive } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicModal, useModalInner } from '/@/components/Modal';
-  import DeviceProfileStep1 from '/@/views/device/profile/step/DeviceProfileStep1.vue';
-  import DeviceProfileStep2 from '/@/views/device/profile/step/DeviceProfileStep2.vue';
-  import DeviceProfileStep3 from '/@/views/device/profile/step/DeviceProfileStep3.vue';
-  import DeviceProfileStep4 from '/@/views/device/profile/step/DeviceProfileStep4.vue';
+  import DeviceProfileStep1 from '/@/views/device/profiles/step/DeviceProfileStep1.vue';
+  import DeviceProfileStep2 from '/@/views/device/profiles/step/DeviceProfileStep2.vue';
+  import DeviceProfileStep3 from '/@/views/device/profiles/step/DeviceProfileStep3.vue';
+  import DeviceProfileStep4 from '/@/views/device/profiles/step/DeviceProfileStep4.vue';
   import { Steps } from 'ant-design-vue';
   import { Steps } from 'ant-design-vue';
   import { deviceConfigAddOrEdit, deviceConfigGetDetail } from '/@/api/device/deviceConfigApi';
   import { deviceConfigAddOrEdit, deviceConfigGetDetail } from '/@/api/device/deviceConfigApi';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';

 <template>
 <template>
   <div>
   <div>
     <BasicTable
     <BasicTable
-      class="devide-profile"
+      class="devide-profiles"
       @selection-change="useSelectionChange"
       @selection-change="useSelectionChange"
       @register="registerTable"
       @register="registerTable"
       :rowSelection="{ type: 'checkbox' }"
       :rowSelection="{ type: 'checkbox' }"
@@ -57,7 +57,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { deviceConfigGetQuery, deviceConfigDelete } from '/@/api/device/deviceConfigApi';
   import { deviceConfigGetQuery, deviceConfigDelete } from '/@/api/device/deviceConfigApi';
   import { useModal } from '/@/components/Modal';
   import { useModal } from '/@/components/Modal';
-  import DeviceProfileModal from '/@/views/device/profile/DeviceProfileModal.vue';
+  import DeviceProfileModal from '/@/views/device/profiles/DeviceProfileModal.vue';
   import { ImpExcel, ExcelData } from '/@/components/Excel';
   import { ImpExcel, ExcelData } from '/@/components/Excel';
   // import { jsonToSheetXlsx, ExportModalResult } from '/@/components/Excel';
   // import { jsonToSheetXlsx, ExportModalResult } from '/@/components/Excel';
 
 
@@ -246,10 +246,10 @@
 </script>
 </script>
 
 
 <style lang="css">
 <style lang="css">
-  .devide-profile .rowcolor {
+  .devide-profiles .rowcolor {
     color: red;
     color: red;
   }
   }
-  .devide-profile .rowcolor2 {
+  .devide-profiles .rowcolor2 {
     background: #a2c3e6;
     background: #a2c3e6;
   }
   }
 </style>
 </style>

@@ -20,13 +20,13 @@
               label: '编辑',
               label: '编辑',
               icon: 'clarity:note-edit-line',
               icon: 'clarity:note-edit-line',
               onClick: handleEdit.bind(null, record),
               onClick: handleEdit.bind(null, record),
-              ifShow: isTenant,
+              ifShow: isTenant || isCustomer,
             },
             },
             {
             {
               label: '删除',
               label: '删除',
               icon: 'ant-design:delete-outlined',
               icon: 'ant-design:delete-outlined',
               color: 'error',
               color: 'error',
-              ifShow: isTenant,
+              ifShow: isTenant || isCustomer,
               popConfirm: {
               popConfirm: {
                 title: '是否确认删除',
                 title: '是否确认删除',
                 confirm: handleDeleteOrBatchDelete.bind(null, record),
                 confirm: handleDeleteOrBatchDelete.bind(null, record),

 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { transformTime } from '/@/hooks/web/useDateToLocaleString';
 import { transformTime } from '/@/hooks/web/useDateToLocaleString';
+import { h } from 'vue';
 
 
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
   {
   {
@@ -58,13 +59,23 @@ export const formSchema: FormSchema[] = [
     field: 'isolatedTbRuleEngine',
     field: 'isolatedTbRuleEngine',
     label: '',
     label: '',
     component: 'Checkbox',
     component: 'Checkbox',
-    renderComponentContent: '隔离板芯容器的加工',
+    renderComponentContent: () => {
+      return h('span', {}, [
+        h('span', {}, '隔离板芯容器的加工'),
+        h('span', { style: { color: 'grey' } }, '（每个独立租户需要单独的微服务）'),
+      ]);
+    },
   },
   },
   {
   {
     field: 'isolatedTbCore',
     field: 'isolatedTbCore',
     label: '',
     label: '',
     component: 'Checkbox',
     component: 'Checkbox',
-    renderComponentContent: '在独立的ThinngsBoard规则引擎中处理',
+    renderComponentContent: () => {
+      return h('span', {}, [
+        h('span', {}, '在独立的ThinngsBoard规则引擎中处理'),
+        h('span', { style: { color: 'grey' } }, '（每个独立租户需要单独的微服务）'),
+      ]);
+    },
   },
   },
   {
   {
     field: 'description',
     field: 'description',