fix: Merge branch next-hub into next

src/pages/DataCollect/Collector/components/Point/Save/BatchUpdate.tsx

@@ -40,7 +40,7 @@ export default (props: Props) => {
       if (!(Number(value) % 1 === 0) || Number(value) <= 0) {
         return {
           type: 'error',
-          message: '请输入非0正整数',
+          message: '请输入正整数',
         };
       }
       return '';

src/pages/DataCollect/Collector/components/Point/Save/modbus.tsx

@@ -103,7 +103,7 @@ export default (props: Props) => {
       if (!(Number(value) % 1 === 0) || Number(value) < 0) {
         return {
           type: 'error',
-          message: '请输入0或正整数',
+          message: '请输入正整数',
         };
       }
       return '';
@@ -264,7 +264,7 @@ export default (props: Props) => {
               },
               {
                 min: 1,
-                message: '请输入非0正整数',
+                message: '请输入正整数',
               },
               {
                 checkLength: true,
@@ -485,7 +485,7 @@ export default (props: Props) => {
               },
               {
                 min: 1,
-                message: '请输入非0正整数',
+                message: '请输入正整数',
               },
               {
                 checkLength: true,

src/pages/DataCollect/Collector/components/Point/Save/opc-ua.tsx

@@ -89,7 +89,7 @@ export default (props: Props) => {
       if (!(Number(value) % 1 === 0) || Number(value) < 0) {
         return {
           type: 'error',
-          message: '请输入0或正整数',
+          message: '请输入正整数',
         };
       }
       return '';

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

@@ -136,7 +136,7 @@ const Save = (props: Props) => {
         'x-validator': [
           {
             format: 'integer',
-            message: '请输入非0正整数',
+            message: '请输入正整数',
           },
         ],
       },

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

@@ -797,16 +797,17 @@ const Edit = observer((props: Props) => {
                     },
                     'x-validator': [
                       {
-                        required: true,
-                        message: `请输入步长`,
-                      },
-                      {
-                        format: 'integer',
-                        message: '请输入正整数',
-                      },
-                      {
-                        min: 1,
-                        message: '请输入正整数',
+                        // triggerType: 'onBlur',
+                        validator: (value: any[]) => {
+                          return new Promise((resolve) => {
+                            const number = Number(value);
+                            if (number <= 0 || value.length > 64 || /[.]/.test(value)) {
+                              resolve('请输入非0正整数，最多可输入64个字符');
+                            } else {
+                              resolve('');
+                            }
+                          });
+                        },
                       },
                     ],
                     'x-reactions': [

src/pages/link/Channel/Modbus/savePoint.tsx

@@ -102,7 +102,7 @@ const SavePoint = (props: Props) => {
                     if (value !== 0 || /(^[1-9]\d*$)/.test(value)) {
                       return Promise.resolve();
                     }
-                    return Promise.reject(new Error('请输入非0正整数'));
+                    return Promise.reject(new Error('请输入正整数'));
                   },
                 }),
               ]}

src/pages/system/Menu/Detail/buttons.tsx

@@ -369,7 +369,12 @@ export default (props: ButtonsProps) => {
                 defaultMessage: '说明',
               })}
             >
-              <Input.TextArea disabled={disabled} placeholder={'请输入说明'} />
+              <Input.TextArea
+                disabled={disabled}
+                placeholder={'请输入说明'}
+                maxLength={200}
+                showCount={true}
+              />
             </Form.Item>
           </Form>
         </Modal>

src/pages/system/User/Save/index.tsx

@@ -331,9 +331,10 @@ const Save = (props: Props) => {
             'x-decorator': 'FormItem',
             'x-component': 'Select',
             'x-component-props': {
+              disabled: !rolePermission.view,
               mode: 'multiple',
               showArrow: true,
-              placeholder: '请选择角色',
+              placeholder: !rolePermission.view ? '暂无权限，请联系管理员' : '请选择角色',
               filterOption: (input: string, option: any) =>
                 option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0,
             },
@@ -373,9 +374,10 @@ const Save = (props: Props) => {
             'x-decorator': 'FormItem',
             'x-component': 'TreeSelect',
             'x-component-props': {
+              disabled: !deptPermission.view,
               multiple: true,
               showArrow: true,
-              placeholder: '请选择组织',
+              placeholder: !deptPermission.view ? '暂无权限，请联系管理员' : '请选择组织',
               showCheckedStrategy: ATreeSelect.SHOW_ALL,
               filterOption: (input: string, option: any) =>
                 option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0,