fix(metadata): metadata rule editor

src/components/FRuleEditor/Advance/index.tsx

@@ -18,6 +18,7 @@ const Advance = (props: Props) => {
       width="70vw"
       title="设置属性规则"
       onCancel={() => onChange('simple')}
+      onOk={() => onChange('simple')}
     >
       <div className={styles.box}>
         <div className={styles.left}>

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

@@ -414,6 +414,24 @@ const Edit = observer((props: Props) => {
             'x-component': 'Select',
             enum: PropertySource,
           },
+          'virtualRule.script': {
+            type: 'string',
+            'x-component': 'FRuleEditor',
+            'x-visible': false,
+            'x-reactions': [
+              {
+                dependencies: ['..source', 'id'],
+                fulfill: {
+                  state: {
+                    visible: '{{$deps[0]==="rule"}}',
+                  },
+                  schema: {
+                    'x-component-props.property': '{{$deps[1]}}',
+                  },
+                },
+              },
+            ],
+          },
           virtualRule: {
             type: 'object',
             title: '规则配置',
@@ -428,24 +446,24 @@ const Edit = observer((props: Props) => {
               },
             },
             properties: {
-              script: {
-                type: 'string',
-                'x-component': 'FRuleEditor',
-                'x-visible': false,
-                'x-reactions': [
-                  {
-                    dependencies: ['.source', '..id'],
-                    fulfill: {
-                      state: {
-                        visible: '{{$deps[0]==="rule"}}',
-                      },
-                      schema: {
-                        'x-component-props.property': '{{$deps[1]}}',
-                      },
-                    },
-                  },
-                ],
-              },
+              // script: {
+              //   type: 'string',
+              //   'x-component': 'FRuleEditor',
+              //   'x-visible': false,
+              //   'x-reactions': [
+              //     {
+              //       dependencies: ['..source', '..id'],
+              //       fulfill: {
+              //         state: {
+              //           visible: '{{$deps[0]==="rule"}}',
+              //         },
+              //         schema: {
+              //           'x-component-props.property': '{{$deps[1]}}',
+              //         },
+              //       },
+              //     },
+              //   ],
+              // },
 
               windowType: {
                 type: 'string',

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

@@ -103,22 +103,6 @@ const Save = (props: Props) => {
             required: true,
             message: '请输入姓名',
           },
-          {
-            triggerType: 'onBlur',
-            validator: (value: string) => {
-              return new Promise((resolve) => {
-                service
-                  .validateField('username', value)
-                  .then((resp) => {
-                    console.log(resp);
-                    resolve('');
-                  })
-                  .catch(() => {
-                    return '验证失败!';
-                  });
-              });
-            },
-          },
         ],
         // required: true,
       },
@@ -142,6 +126,22 @@ const Save = (props: Props) => {
             required: true,
             message: '请输入用户名',
           },
+          {
+            triggerType: 'onBlur',
+            validator: (value: string) => {
+              return new Promise((resolve) => {
+                service
+                  .validateField('username', value)
+                  .then((resp) => {
+                    console.log(resp);
+                    resolve('');
+                  })
+                  .catch(() => {
+                    return '验证失败!';
+                  });
+              });
+            },
+          },
         ],
         name: 'username',
         required: true,