fix: bug修复

src/components/SearchComponent/index.tsx

@@ -237,7 +237,7 @@ const SearchComponent = <T extends Record<string, any>>(props: Props<T>) => {
                   f.setFieldState(typeFiled.query('.termType'), async (state) => {
                     state.value = 'eq';
                     state.dataSource = termType;
-                    if (_field?.dataIndex === 'state') {
+                    if (_field?.dataIndex === 'state' || _field?.dataIndex === 'status') {
                       state.dataSource = [
                         { label: '=', value: 'eq' },
                         { label: '!=', value: 'not' },

src/pages/DataCollect/Channel/Save/index.tsx

@@ -69,7 +69,7 @@ export default (props: Props) => {
         ];
         const arr = resp.result
           .filter((item: any) => item.id === 'modbus-tcp' || item.id === 'opc-ua')
-          .map((it: any) => (it.id === 'opc-ua' ? 'OPC_UA' : 'MODBUS_TCP'));
+          .map((it: any) => (it?.id === 'opc-ua' ? 'OPC_UA' : 'MODBUS_TCP'));
         const providers = list.filter((item: any) => arr.includes(item.value));
         setProviderList(providers);
         if (arr.includes('OPC_UA')) {

src/pages/Log/Access/index.tsx

@@ -10,6 +10,7 @@ import { useIntl } from '@@/plugin-locale/localeExports';
 import SearchComponent from '@/components/SearchComponent';
 import Detail from '@/pages/Log/Access/Detail';
 import { useDomFullHeight } from '@/hooks';
+import { Ellipsis } from '@/components';
 
 const service = new BaseService('logger/access');
 
@@ -96,9 +97,16 @@ const Access = () => {
         defaultMessage: '请求用户',
       }),
       dataIndex: 'context.username',
-      width: 100,
+      width: 200,
       render: (text, record: any) =>
-        record?.context?.username ? <Tag color="geekblue">{record?.context?.username}</Tag> : '',
+        record?.context?.username ? (
+          <Tag color="geekblue">
+            {/* {record?.context?.username} */}
+            <Ellipsis title={record?.context?.username} style={{ maxWidth: 170 }} />
+          </Tag>
+        ) : (
+          ''
+        ),
     },
     {
       title: intl.formatMessage({

src/pages/device/Instance/Detail/Tags/index.tsx

@@ -24,6 +24,7 @@ const Tags = () => {
   useEffect(() => {
     if (tag) {
       setTags([...tag] || []);
+      console.log(tag);
     }
   }, [tag]);
 
@@ -59,7 +60,13 @@ const Tags = () => {
           <Descriptions.Item span={1} label={`${item.name}（${item.key})`} key={item.key}>
             <Tooltip title={item.value || ''} placement="topLeft">
               <div className="ellipsis" style={{ maxWidth: 300 }}>
-                {item.value || ''}
+                {/* {item.value || ''} */}
+                {item.type === 'enum'
+                  ? `${
+                      item?.dataType?.elements?.find((it: any) => it.value === item.value)?.text ||
+                      ''
+                    }`
+                  : `${item.value || ''}`}
               </div>
             </Tooltip>
           </Descriptions.Item>

src/pages/iot-card/CardManagement/ImportModal.tsx

@@ -17,6 +17,7 @@ const ImportModal = (props: ImportModalType) => {
   const [configId, setConfigId] = useState('');
   const [total, setTotal] = useState(0);
   const [loading, setLoading] = useState(false);
+  const [form] = Form.useForm();
 
   const { data: platformList, run: platformRun } = useRequest(service.queryPlatformNoPage, {
     manual: true,
@@ -62,9 +63,26 @@ const ImportModal = (props: ImportModalType) => {
   }, []);
 
   return (
-    <Modal title={'导入'} visible={true} onOk={props.onCancel} onCancel={props.onCancel}>
-      <Form layout={'vertical'}>
-        <Form.Item label={'平台对接'}>
+    <Modal
+      title={'导入'}
+      visible={true}
+      onOk={async () => {
+        // props.onCancel()
+        const res = await form.validateFields();
+        if (res) {
+          props.onCancel();
+          // console.log(res)
+        }
+      }}
+      onCancel={props.onCancel}
+    >
+      <Form layout={'vertical'} form={form}>
+        <Form.Item
+          label={'平台对接'}
+          name={'platform'}
+          required
+          rules={[{ required: true, message: '请选择平台对接' }]}
+        >
           <Select
             showSearch
             placeholder={'请选择平台对接'}

src/pages/notice/Template/Detail/index.tsx

@@ -165,6 +165,7 @@ const Detail = observer(() => {
           });
           onFieldValueChange('type', async (field, f) => {
             const value = field.value;
+
             setTypeItem(value);
             if (!value) return;
             f.setFieldState('provider', (state1) => {
@@ -173,6 +174,12 @@ const Detail = observer(() => {
               }
               state1.dataSource = typeList[value];
             });
+            if (field.modified) {
+              // console.log('value------',value)
+              f.setFieldState('configId', (state2) => {
+                state2.value = undefined;
+              });
+            }
           });
           onFieldValueChange('provider', async (field, form1) => {
             const value = field.value;
@@ -1359,7 +1366,7 @@ const Detail = observer(() => {
                     'x-validator': [
                       {
                         required: true,
-                        message: '请输入签名',
+                        message: '请选择签名',
                       },
                     ],
                     'x-component': 'Select',
@@ -1368,7 +1375,7 @@ const Detail = observer(() => {
                       tooltip: '用于短信内容签名信息显示',
                     },
                     'x-component-props': {
-                      placeholder: '请输入签名',
+                      placeholder: '请选择签名',
                     },
                     'x-reactions': {
                       dependencies: ['configId'],

src/pages/system/Apply/index.tsx

@@ -181,7 +181,7 @@ const Apply = () => {
         ) : null,
         isApiService(record.integrationModes) ? (
           <PermissionButton
-            key={'api'}
+            key={'viewApi'}
             type={'link'}
             style={{ padding: 0 }}
             isPermission={permission.update || permission.add}

src/pages/system/Department/Assets/deivce/bind.tsx

@@ -374,7 +374,7 @@ const Bind = observer((props: Props) => {
             if (resp.status === 200) {
               newData = [...resp.result.data];
               const assetsResp = await service.getBindingAssets(
-                'product',
+                'device',
                 resp.result.data.map((item: any) => item.id),
               );
               if (assetsResp.status === 200) {

src/pages/system/Platforms/Api/basePage.tsx

@@ -5,6 +5,7 @@ import { service } from '../index';
 import { ApiModel } from '@/pages/system/Platforms/Api/base';
 import { onlyMessage } from '@/utils/util';
 import PermissionButton from '@/components/PermissionButton';
+import _ from 'lodash';
 
 interface TableProps {
   data: any;
@@ -123,12 +124,9 @@ export default (props: TableProps) => {
     grantCache.current = addGrant;
 
     setLoading(true);
-    // console.log('addGrant----',addGrant)
-    // console.log('addOperations----',addOperations)
     if (props.isOpenGranted === false) {
-      // console.log(props.grantKeys)
-      // console.log(addGrant,'add')
-      // console.log(removeGrant,'del')
+      console.log('del-------', removeGrant);
+      console.log('add-------', addGrant);
       const resp2 = removeGrant.length ? await service.apiOperationsRemove(removeGrant) : {};
       const resp = await service.apiOperationsAdd(addGrant);
       if (resp.status === 200 || resp2.status === 200) {
@@ -194,6 +192,7 @@ export default (props: TableProps) => {
             ? {
                 selectedRowKeys: selectKeys,
                 onSelect: (record, selected) => {
+                  console.log('selected----', selected);
                   if (selected) {
                     const newArr = [...selectKeys, record.operationId];
                     setSelectKeys(newArr);
@@ -202,6 +201,7 @@ export default (props: TableProps) => {
                   }
                 },
                 onSelectAll: (selected, selectedRows) => {
+                  // console.log('selectedRows',selected,selectedRows)
                   if (selected) {
                     // const items = selectedRows.filter((item) => !!item).map((item) => item.operationId).concat(props.grantKeys)
                     // console.log(items)
@@ -212,7 +212,13 @@ export default (props: TableProps) => {
                         .concat(GrantKeys),
                     );
                   } else {
-                    setSelectKeys([]);
+                    // setSelectKeys([]);
+                    // console.log(dataSource,GrantKeys)
+                    const diffList = _.difference(
+                      GrantKeys,
+                      dataSource.map((item) => item.operationId),
+                    );
+                    setSelectKeys(diffList);
                   }
                 },
               }
@@ -227,7 +233,7 @@ export default (props: TableProps) => {
             onClick={save}
             key={'update'}
             type={'primary'}
-            style={{ padding: 0, width: 50 }}
+            style={{ padding: 0, width: 80 }}
             loading={loading}
           >
             保存