Merge branch 'fix/DEFECT-1638' into 'main_dev'

fix: 修改租户配置筛选无效 tcp网关子设备命令类型选择

See merge request yunteng/thingskit-front!918

@@ -174,8 +174,7 @@
   const handleFilterOption = async (inputValue: string, option: Recordable) => {
   const handleFilterOption = async (inputValue: string, option: Recordable) => {
     const { filterOption, fetchSearch } = props;
     const { filterOption, fetchSearch } = props;
     if (filterOption && isFunction(filterOption)) {
     if (filterOption && isFunction(filterOption)) {
-      filterOption?.(inputValue, option);
-      return;
+      return filterOption?.(inputValue, option);
     }
     }
 
 
     if (fetchSearch) {
     if (fetchSearch) {
@@ -189,8 +188,9 @@
     @dropdownVisibleChange="handleFetch"
     @dropdownVisibleChange="handleFetch"
     v-bind="attrs"
     v-bind="attrs"
     @change="handleChange"
     @change="handleChange"
+    @filterOption="handleFilterOption"
     :options="getOptions"
     :options="getOptions"
-    :filterOption="handleFilterOption"
+    optionFilterProp="label"
     :showSearch="true"
     :showSearch="true"
     v-model:value="state"
     v-model:value="state"
     @popup-scroll="debounceHandlePopupScroll"
     @popup-scroll="debounceHandlePopupScroll"

@@ -117,7 +117,7 @@
   };
   };
 
 
   const handleCheckCard = (item: ProfileRecord) => {
   const handleCheckCard = (item: ProfileRecord) => {
-    if (item.default) return;
+    if (item.default || item.name == 'default') return;
     item.checked = !item.checked;
     item.checked = !item.checked;
   };
   };
 
 

@@ -31,7 +31,6 @@ export const searchFormSchema: FormSchema[] = [
     field: 'textSearch',
     field: 'textSearch',
     label: '名称',
     label: '名称',
     component: 'Input',
     component: 'Input',
-
     colProps: { span: 8 },
     colProps: { span: 8 },
     componentProps: {
     componentProps: {
       placeholder: '请输入名称',
       placeholder: '请输入名称',

@@ -30,11 +30,6 @@
               icon: 'ant-design:eye-outlined',
               icon: 'ant-design:eye-outlined',
               onClick: handleView.bind(null, record),
               onClick: handleView.bind(null, record),
             },
             },
-            // {
-            //   label: '详情',
-            //   icon: 'ant-design:field-time-outlined',
-            //   onClick: handleDetail.bind(null, record),
-            // },
             {
             {
               label: '编辑',
               label: '编辑',
               icon: 'clarity:note-edit-line',
               icon: 'clarity:note-edit-line',
@@ -103,9 +98,6 @@
   import { useRouter } from 'vue-router';
   import { useRouter } from 'vue-router';
   import { ref } from 'vue';
   import { ref } from 'vue';
   import { isObject } from '/@/utils/is';
   import { isObject } from '/@/utils/is';
-  // import { ChainDetailDrawer } from './chainDetail/index';
-  // import { useDrawer } from '/@/components/Drawer';
-
   const [registerModal, { openModal }] = useModal();
   const [registerModal, { openModal }] = useModal();
   const { createMessage } = useMessage();
   const { createMessage } = useMessage();
   const { hasPermission } = usePermission();
   const { hasPermission } = usePermission();

@@ -153,6 +153,7 @@
               title: '是否确认删除操作?',
               title: '是否确认删除操作?',
               onConfirm: handleDelete.bind(null),
               onConfirm: handleDelete.bind(null),
             },
             },
+            disabled: !!getRecord.state,
           },
           },
         ]"
         ]"
       />
       />

@@ -293,12 +293,13 @@ export const commonDataSourceSchemas = (): FormSchema[] => {
                   (item) => item.itemValue == CommandTypeEnum.ATTRIBUTE.toString()
                   (item) => item.itemValue == CommandTypeEnum.ATTRIBUTE.toString()
                 );
                 );
               }
               }
-
               // TCP网关子 --> 不能要服务命令类型
               // TCP网关子 --> 不能要服务命令类型
               if (deviceType == 'SENSOR' && transportType == 'TCP') {
               if (deviceType == 'SENSOR' && transportType == 'TCP') {
-                return record.filter(
-                  (item) => item.itemValue == CommandTypeEnum.ATTRIBUTE.toString()
-                );
+                return codeType == 'MODBUS_RTU'
+                  ? record.filter((item) => item.itemValue == CommandTypeEnum.ATTRIBUTE.toString())
+                  : codeType == 'CUSTOM'
+                  ? record.filter((item) => item.itemValue == CommandTypeEnum.CUSTOM.toString())
+                  : [];
               }
               }
 
 
               if (codeType == TaskTypeEnum.MODBUS_RTU) {
               if (codeType == TaskTypeEnum.MODBUS_RTU) {