Ver código fonte

fix(bug): fix bug

lind 3 anos atrás
pai
commit
90088fe1ed

+ 3 - 3
src/components/SearchComponent/index.tsx

@@ -397,7 +397,7 @@ const SearchComponent = <T extends Record<string, any>>(props: Props<T>) => {
     if (initParam && initParam[0].terms && initParam[0].terms.length > 1) {
       handleExpand();
     }
-  }, []);
+  }, [initParam]);
   const simpleSchema: ISchema = {
     type: 'object',
     properties: {
@@ -491,10 +491,10 @@ const SearchComponent = <T extends Record<string, any>>(props: Props<T>) => {
   };
 
   useEffect(() => {
-    if (defaultParam || initParam) {
+    if (defaultParam) {
       handleSearch();
     }
-  }, [defaultParam, initParam]);
+  }, []);
 
   const handleSaveLog = async () => {
     const value = await form.submit<SearchTermsUI>();

+ 1 - 1
src/locales/zh-CN/pages.ts

@@ -208,7 +208,7 @@ export default {
   'pages.device.productDetail.metadata.eventLevel': '事件级别',
   'pages.device.productDetail.metadata.level': '级别',
   'pages.device.productDetail.metadata.whetherAsync': '是否异步',
-  'pages.device.productDetail.metadata.whetherReadOnly': '是否只读',
+  'pages.device.productDetail.metadata.whetherReadOnly': '读写类型',
   'pages.device.productDetail.metadata.true': '是',
   'pages.device.productDetail.metadata.false': '否',
   'pages.device.productDetail.metadata.dataType': '数据类型',

+ 3 - 3
src/pages/device/components/Metadata/Base/columns.ts

@@ -44,7 +44,7 @@ const FunctionColumns: ProColumns<MetadataItem>[] = BaseColumns.concat([
     render: (text) => (text ? '是' : '否'),
   },
   {
-    title: '是否只读',
+    title: '读写类型',
     dataIndex: 'expands.readOnly',
     render: (text) => (text ? '是' : '否'),
   },
@@ -57,7 +57,7 @@ const PropertyColumns: ProColumns<MetadataItem>[] = BaseColumns.concat([
     render: (text: any) => text?.type,
   },
   {
-    title: '是否只读',
+    title: '读写类型',
     dataIndex: 'expands.readOnly',
     render: (text) => (text === 'true' || text === true ? '是' : '否'),
   },
@@ -70,7 +70,7 @@ const TagColumns: ProColumns<MetadataItem>[] = BaseColumns.concat([
     render: (text: any) => text?.type,
   },
   {
-    title: '是否只读',
+    title: '读写类型',
     dataIndex: 'expands.readOnly',
     render: (text) => (text === 'true' || text === true ? '是' : '否'),
   },

+ 5 - 5
src/pages/link/Type/index.tsx

@@ -1,6 +1,6 @@
 import { useRef, useState } from 'react';
 import type { ActionType, ProColumns } from '@jetlinks/pro-table';
-import { Badge, Button, message, Popconfirm, Tooltip } from 'antd';
+import { Badge, message, Popconfirm, Tooltip } from 'antd';
 import {
   CloseCircleOutlined,
   DeleteOutlined,
@@ -13,7 +13,7 @@ import { PageContainer } from '@ant-design/pro-layout';
 import type { NetworkItem } from '@/pages/link/Type/typings';
 import { useIntl } from '@@/plugin-locale/localeExports';
 import SearchComponent from '@/components/SearchComponent';
-import { getButtonPermission, getMenuPathByParams, MENUS_CODE } from '@/utils/menu';
+import { getMenuPathByParams, MENUS_CODE } from '@/utils/menu';
 import { history } from 'umi';
 import Service from '@/pages/link/service';
 import { Store } from 'jetlinks-store';
@@ -244,8 +244,8 @@ const Network = () => {
         columns={columns}
         search={false}
         headerTitle={
-          <Button
-            disabled={getButtonPermission('link/Type', ['add'])}
+          <PermissionButton
+            isPermission={networkPermission.add}
             onClick={() => {
               pageJump();
             }}
@@ -257,7 +257,7 @@ const Network = () => {
               id: 'pages.data.option.add',
               defaultMessage: '新增',
             })}
-          </Button>
+          </PermissionButton>
         }
         request={async (params) =>
           service.query({ ...params, sorts: [{ name: 'createTime', order: 'desc' }] })

+ 4 - 2
src/pages/notice/Template/Detail/index.tsx

@@ -111,8 +111,10 @@ const Detail = observer(() => {
           onFieldValueChange('provider', (field, form1) => {
             const value = field.value;
             setProvider(value);
-            // form1.setValuesIn('configId', null);
-            // form1.setValuesIn('template', null);
+            if (field.modified) {
+              form1.setValuesIn('configId', null);
+              form1.setValuesIn('template', null);
+            }
             // 设置绑定配置的数据
             form1.setFieldState('configId', async (state1) => {
               state1.dataSource = await getConfig(value);

+ 2 - 0
src/pages/system/Role/index.tsx

@@ -197,6 +197,8 @@ const Role: React.FC = observer(() => {
       CurdModel.add();
     }
     const subscription = Store.subscribe(SystemConst.BASE_UPDATE_DATA, (data) => {
+      debugger;
+      console.log('订阅数据');
       if ((window as any).onTabSaveSuccess) {
         (window as any).onTabSaveSuccess(data);
         setTimeout(() => window.close(), 300);