refactor(plugin-field-sequence): change rule configuration to standard modal

packages/plugins/@nocobase/plugin-field-sequence/src/client/sequence.tsx

@@ -7,24 +7,23 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { ArrayTable, FormButtonGroup, FormDrawer, FormLayout, Submit } from '@formily/antd-v5';
+import { ArrayTable } from '@formily/antd-v5';
-import { onFieldValueChange } from '@formily/core';
+import { createForm, onFieldValueChange } from '@formily/core';
-import { ISchema, SchemaOptionsContext, useForm, useFormEffects } from '@formily/react';
+import { SchemaOptionsContext, useForm, useFormEffects } from '@formily/react';
 import {
   CollectionFieldInterface,
   Cron,
   SchemaComponent,
-  SchemaComponentOptions,
   css,
   interfacesProperties,
+  useActionContext,
   useCompile,
   useToken,
 } from '@nocobase/client';
-import { error } from '@nocobase/utils/client';
+import React, { createContext, useContext, useMemo } from 'react';
-import { Button, Select } from 'antd';
-import React, { useContext } from 'react';
 import { useTranslation } from 'react-i18next';
 import { NAMESPACE, lang } from './locale';
+import { Select } from 'antd';
 
 function RuleTypeSelect(props) {
   const compile = useCompile();
@@ -285,63 +284,109 @@ const RuleTypes = {
   },
 };
 
-export function RuleConfigForm() {
+const ParentFormContext = createContext({} as any);
-  const { t } = useTranslation();
+ParentFormContext.displayName = 'ParentFormContext';
-  const compile = useCompile();
+
-  const schemaOptions = useContext(SchemaOptionsContext);
+function useRuleUpdateAction() {
-  const { values, setValuesIn } = useForm();
+  const parentForm = useContext(ParentFormContext);
   const index = ArrayTable.useIndex();
-  const { type, options } = values.patterns[index];
+  const { type, options } = parentForm.values.patterns[index];
+  const form = useForm();
+  const { setVisible } = useActionContext();
+
+  return {
+    run() {
+      parentForm.setValuesIn(`patterns.${index}`, { type, options: { ...form.values } });
+      setVisible(false);
+    },
+  };
+}
+
+function useRuleCancelAction() {
+  const form = useForm();
+  const { setVisible } = useActionContext();
+
+  return {
+    run() {
+      form.reset();
+      setVisible(false);
+    },
+  };
+}
+
+export function RuleConfigForm() {
+  const parentForm = useForm();
+  const index = ArrayTable.useIndex();
+  const { type, options } = parentForm.values.patterns[index];
   const ruleType = RuleTypes[type];
-  const { token } = useToken();
+  const form = useMemo(
+    () =>
+      createForm({
+        initialValues: options,
+        values: options,
+      }),
+    [options],
+  );
+
   return ruleType?.fieldset ? (
-    <Button
+    <ParentFormContext.Provider value={parentForm}>
-      type="link"
+      <SchemaComponent
-      onClick={() => {
+        scope={{
-        // fix https://nocobase.height.app/T-2868
+          useRuleCancelAction,
-        FormDrawer({ title: compile(ruleType.title), zIndex: token.zIndexPopupBase + 1000 }, () => {
+          useRuleUpdateAction,
-          return (
+        }}
-            <FormLayout layout="vertical">
+        schema={{
-              <SchemaComponentOptions scope={schemaOptions.scope} components={schemaOptions.components}>
+          name: 'action',
-                <SchemaComponent
+          type: 'void',
-                  schema={{
+          'x-component': 'Action.Link',
-                    type: 'object',
+          'x-component-props': {
-                    'x-component': 'fieldset',
+            openMode: 'modal',
-                    properties: ruleType.fieldset,
+            openSize: 'small',
-                  }}
+          },
-                />
+          title: `{{t("Configure", { ns: "${NAMESPACE}" })}}`,
-              </SchemaComponentOptions>
+          properties: {
-              <FormDrawer.Footer>
+            container: {
-                <FormButtonGroup
+              type: 'void',
-                  className={css`
+              title: `{{t("Configure", { ns: "${NAMESPACE}" })}}`,
-                    justify-content: flex-end;
+              'x-decorator': 'FormV2',
-                  `}
+              'x-decorator-props': {
-                >
+                form,
-                  <Submit
+              },
-                    onSubmit={(values) => {
+              'x-component': 'Action.Container',
-                      return values;
+              'x-component-props': {
-                    }}
+                delay: 0,
-                  >
+              },
-                    {t('Submit')}
+              properties: {
-                  </Submit>
+                ...ruleType.fieldset,
-                </FormButtonGroup>
+                actions: {
-              </FormDrawer.Footer>
+                  type: 'void',
-            </FormLayout>
+                  'x-component': 'ActionBar',
-          );
+                  properties: {
-        })
+                    cancel: {
-          .open({
+                      type: 'void',
-            initialValues: options,
+                      'x-component': 'Action',
-          })
+                      title: `{{t("Cancel", { ns: "${NAMESPACE}" })}}`,
-          .then((values) => {
+                      'x-component-props': {
-            setValuesIn(`patterns.${index}`, { type, options: { ...values } });
+                        useAction: '{{useRuleCancelAction}}',
-          })
+                      },
-          .catch((err) => {
+                    },
-            error(err);
+                    submit: {
-          });
+                      type: 'void',
-      }}
+                      'x-component': 'Action',
-    >
+                      title: `{{t("Submit", { ns: "${NAMESPACE}" })}}`,
-      {t('Configure')}
+                      'x-component-props': {
-    </Button>
+                        type: 'primary',
+                        useAction: '{{useRuleUpdateAction}}',
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        }}
+      />
+    </ParentFormContext.Provider>
   ) : null;
 }
 
@@ -464,15 +509,17 @@ export class SequenceFieldInterface extends CollectionFieldInterface {
     },
     inputable: {
       type: 'boolean',
-      title: `{{t("Inputable", { ns: "${NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
       'x-component': 'Checkbox',
+      'x-content': `{{t("Inputable", { ns: "${NAMESPACE}" })}}`,
+      description: `{{t("Allow users to input values manually.", { ns: "${NAMESPACE}" })}}`,
     },
     match: {
       type: 'boolean',
-      title: `{{t("Match rules", { ns: "${NAMESPACE}" })}}`,
       'x-decorator': 'FormItem',
       'x-component': 'Checkbox',
+      'x-content': `{{t("Match rules", { ns: "${NAMESPACE}" })}}`,
+      description: `{{t("Input value must match the rules set above. Otherwise an invalid error will show when submit.", { ns: "${NAMESPACE}" })}}`,
       'x-reactions': {
         dependencies: ['inputable'],
         fulfill: {

packages/plugins/@nocobase/plugin-field-sequence/src/locale/zh-CN.json

@@ -4,6 +4,8 @@
   "Sequence rules": "编号规则",
   "Add rule": "添加规则",
   "Inputable": "可输入",
+  "Allow users to input values manually.": "允许用户手动输入值。",
+  "Input value must match the rules set above.": "输入的值必须与上方设置的规则匹配。",
   "Match rules": "输入必须匹配规则",
   "Type": "类型",
   "Autoincrement": "自增数字",
@@ -29,7 +31,7 @@
   "Length": "长度",
   "Will generate random characters with specified length.": "将生成指定长度的随机字符。",
   "Character sets": "字符集",
-  "Select character sets to generate random characters.": "选择用于生成随机字符的字符集。",
+  "Select character sets to generate random characters. Otherwise an invalid error will show when submit.": "选择用于生成随机字符的字符集。否则提交时将提示错误。",
   "Number": "数字",
   "Lowercase letters": "小写字母",
   "Uppercase letters": "大写字母",