feat(system): set table copyable=false;maskClosable=false

src/components/BaseCrud/save/index.tsx

@@ -125,6 +125,7 @@ const Save = <T extends Record<string, any>>(props: Props<T>) => {
         id: `pages.data.option.${model}`,
         defaultMessage: '编辑',
       })}
+      maskClosable={false}
       visible={visible}
       onCancel={CurdModel.close}
       onOk={save}

src/components/BindUser/index.tsx

@@ -17,7 +17,7 @@ export const columns: ProColumns<UserItem>[] = [
   {
     title: '姓名',
     dataIndex: 'name',
-    copyable: true,
+    // copyable: true,
     ellipsis: true,
     align: 'center',
   },

src/pages/device/Instance/Detail/MetadataLog/Property/index.tsx

@@ -39,7 +39,7 @@ const PropertyLog = (props: Props) => {
           {
             dataIndex: 'formatValue',
             title: '数据',
-            copyable: true,
+            // copyable: true,
           },
         ]}
       />

src/pages/device/Product/Save/index.tsx

@@ -1,4 +1,4 @@
-import { Button, Drawer, message } from 'antd';
+import { message, Modal } from 'antd';
 import type { Field } from '@formily/core';
 import { createForm, onFieldValueChange } from '@formily/core';
 import { TreeSelect, Form, FormItem, FormLayout, Input, Radio, Select } from '@formily/antd';
@@ -142,11 +142,24 @@ const Save = (props: Props) => {
             title: 'ID',
             'x-component': 'Input',
             'x-decorator': 'FormItem',
+            'x-decorator-props': {
+              tooltip: <div>若不填写,系统将自动生成唯一ID</div>,
+            },
           },
           name: {
             title: '名称',
             'x-component': 'Input',
             'x-decorator': 'FormItem',
+            'x-validator': [
+              {
+                required: true,
+                message: '请输入名称',
+              },
+              {
+                max: 64,
+                message: '最多可输入64个字符',
+              },
+            ],
           },
           classifiedId: {
             title: '所属品类',
@@ -157,29 +170,29 @@ const Save = (props: Props) => {
             },
             'x-reactions': ['{{useAsyncDataSource("classifiedId")}}'],
           },
-          orgId: {
-            title: '所属机构',
-            'x-component': 'Select',
-            'x-decorator': 'FormItem',
-            'x-reactions': ['{{useAsyncDataSource("org")}}'],
-          },
-          messageProtocol: {
-            title: '消息协议',
-            'x-component': 'Select',
-            'x-decorator': 'FormItem',
-            'x-reactions': ['{{useAsyncDataSource("protocol")}}'],
-          },
-          transportProtocol: {
-            title: '传输协议',
-            'x-component': 'Select',
-            'x-decorator': 'FormItem',
-          },
-          storePolicy: {
-            title: '存储策略',
-            'x-component': 'Select',
-            'x-decorator': 'FormItem',
-            'x-reactions': ['{{useAsyncDataSource("storePolicy")}}'],
-          },
+          // orgId: {
+          //   title: '所属机构',
+          //   'x-component': 'Select',
+          //   'x-decorator': 'FormItem',
+          //   'x-reactions': ['{{useAsyncDataSource("org")}}'],
+          // },
+          // messageProtocol: {
+          //   title: '消息协议',
+          //   'x-component': 'Select',
+          //   'x-decorator': 'FormItem',
+          //   'x-reactions': ['{{useAsyncDataSource("protocol")}}'],
+          // },
+          // transportProtocol: {
+          //   title: '传输协议',
+          //   'x-component': 'Select',
+          //   'x-decorator': 'FormItem',
+          // },
+          // storePolicy: {
+          //   title: '存储策略',
+          //   'x-component': 'Select',
+          //   'x-decorator': 'FormItem',
+          //   'x-reactions': ['{{useAsyncDataSource("storePolicy")}}'],
+          // },
           deviceType: {
             title: '设备类型',
             'x-component': 'Radio.Group',
@@ -189,32 +202,32 @@ const Save = (props: Props) => {
               { label: '网关子设备', value: 'childrenDevice' },
               { label: '网关设备', value: 'gateway' },
             ],
+            'x-validator': [
+              {
+                required: true,
+                message: '请选择设备类型',
+              },
+            ],
           },
           describe: {
             title: '描述',
             'x-component': 'Input.TextArea',
             'x-decorator': 'FormItem',
+            'x-component-props': {
+              showCount: true,
+              maxLength: 200,
+            },
           },
         },
       },
     },
   };
   return (
-    <Drawer
-      visible={visible}
-      onClose={() => close()}
-      width="25vw"
-      title="新增产品"
-      extra={
-        <Button type="primary" onClick={handleSave}>
-          保存数据
-        </Button>
-      }
-    >
-      <Form form={form} size="small">
+    <Modal visible={visible} onCancel={() => close()} width="30vw" title="新增" onOk={handleSave}>
+      <Form form={form}>
         <SchemaField schema={schema} scope={{ useAsyncDataSource }} />
       </Form>
-    </Drawer>
+    </Modal>
   );
 };
 export default Save;

src/pages/device/components/Metadata/Base/Edit/index.tsx

@@ -42,6 +42,7 @@ import DB from '@/db';
 import _ from 'lodash';
 import { useParams } from 'umi';
 import { InstanceModel } from '@/pages/device/Instance';
+import FRuleEditor from '@/components/FRuleEditor';
 
 interface Props {
   type: 'product' | 'device';
@@ -96,6 +97,7 @@ const Edit = (props: Props) => {
       EnumParam,
       BooleanEnum,
       ConfigParam,
+      FRuleEditor,
     },
     scope: {
       async asyncOtherConfig(field: Field) {
@@ -356,6 +358,10 @@ const Edit = (props: Props) => {
             'x-component': 'Select',
             enum: PropertySource,
           },
+          rule: {
+            type: 'string',
+            'x-component': 'FRuleEditor',
+          },
           readOnly: {
             title: intl.formatMessage({
               id: 'pages.device.productDetail.metadata.whetherReadOnly',

src/pages/system/Department/save.tsx

@@ -109,6 +109,7 @@ const Save = <T extends object>(props: SaveModalProps<T>) => {
               defaultMessage: '新增',
             })
       }
+      maskClosable={false}
       visible={props.visible}
       onOk={saveData}
       onCancel={() => {

src/pages/system/Permission/index.tsx

@@ -126,7 +126,7 @@ const Permission: React.FC = observer(() => {
         defaultMessage: '标识',
       }),
       dataIndex: 'id',
-      copyable: true,
+      // copyable: true,
       ellipsis: true,
       align: 'center',
       // sorter: true,
@@ -138,7 +138,7 @@ const Permission: React.FC = observer(() => {
         defaultMessage: '名称',
       }),
       dataIndex: 'name',
-      copyable: true,
+      // copyable: true,
       ellipsis: true,
       align: 'center',
     },

src/pages/system/Role/Edit/UserManage/BindUser.tsx

@@ -29,7 +29,7 @@ const BindUser = (props: Props) => {
         defaultMessage: '名称',
       }),
       dataIndex: 'name',
-      copyable: true,
+      // copyable: true,
       ellipsis: true,
       tip: intl.formatMessage({
         id: 'pages.system.userName.tips',

src/pages/system/Role/Edit/UserManage/index.tsx

@@ -37,7 +37,7 @@ const UserManage = () => {
         defaultMessage: '名称',
       }),
       dataIndex: 'name',
-      copyable: true,
+      // copyable: true,
       ellipsis: true,
       tip: intl.formatMessage({
         id: 'pages.system.userName.tips',

src/pages/system/Role/index.tsx

@@ -30,7 +30,7 @@ const Role: React.FC = observer(() => {
         defaultMessage: '标识',
       }),
       dataIndex: 'id',
-      copyable: true,
+      // copyable: true,
       ellipsis: true,
       // sorter: true,
       // defaultSortOrder: 'ascend',
@@ -49,7 +49,7 @@ const Role: React.FC = observer(() => {
         defaultMessage: '名称',
       }),
       dataIndex: 'name',
-      copyable: true,
+      // copyable: true,
       ellipsis: true,
       // tip: intl.formatMessage({
       //   id: 'pages.system.userName.tips',

src/pages/system/User/index.tsx

@@ -36,7 +36,7 @@ const User = observer(() => {
         defaultMessage: '姓名',
       }),
       dataIndex: 'name',
-      copyable: true,
+      // copyable: true,
       ellipsis: true,
       align: 'center',
       // tip: intl.formatMessage({
@@ -63,7 +63,7 @@ const User = observer(() => {
         defaultMessage: '用户名',
       }),
       dataIndex: 'username',
-      copyable: true,
+      // copyable: true,
       ellipsis: true,
       align: 'center',
       // tip: intl.formatMessage({