bm-admin-ui 1.0.37-alpha → 1.0.38-alpha

package/es/components/flow-designer/src/bm-nodes/BmConditionNode.vue.d.ts

@@ -63,7 +63,7 @@ declare const _default: import("vue").DefineComponent<{
             }> & Omit<Readonly<import("vue").ExtractPropTypes<{
                 prefixCls: StringConstructor;
                 color: {
-                    type: import("vue").PropType<import("ant-design-vue/lib/_util/type").LiteralUnion<"default" | "success" | "error" | "warning" | "blue" | "cyan" | "gold" | "green" | "lime" | "magenta" | "orange" | "pink" | "purple" | "red" | "yellow" | "processing" | "geekblue" | "volcano", string>>;
+                    type: import("vue").PropType<import("ant-design-vue/lib/_util/type").LiteralUnion<"success" | "error" | "warning" | "default" | "blue" | "cyan" | "gold" | "green" | "lime" | "magenta" | "orange" | "pink" | "purple" | "red" | "yellow" | "processing" | "geekblue" | "volcano", string>>;
                 };
                 closable: {
                     type: BooleanConstructor;
@@ -96,7 +96,7 @@ declare const _default: import("vue").DefineComponent<{
             $options: import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{
                 prefixCls: StringConstructor;
                 color: {
-                    type: import("vue").PropType<import("ant-design-vue/lib/_util/type").LiteralUnion<"default" | "success" | "error" | "warning" | "blue" | "cyan" | "gold" | "green" | "lime" | "magenta" | "orange" | "pink" | "purple" | "red" | "yellow" | "processing" | "geekblue" | "volcano", string>>;
+                    type: import("vue").PropType<import("ant-design-vue/lib/_util/type").LiteralUnion<"success" | "error" | "warning" | "default" | "blue" | "cyan" | "gold" | "green" | "lime" | "magenta" | "orange" | "pink" | "purple" | "red" | "yellow" | "processing" | "geekblue" | "volcano", string>>;
                 };
                 closable: {
                     type: BooleanConstructor;
@@ -138,7 +138,7 @@ declare const _default: import("vue").DefineComponent<{
         } & Readonly<import("vue").ExtractPropTypes<{
             prefixCls: StringConstructor;
             color: {
-                type: import("vue").PropType<import("ant-design-vue/lib/_util/type").LiteralUnion<"default" | "success" | "error" | "warning" | "blue" | "cyan" | "gold" | "green" | "lime" | "magenta" | "orange" | "pink" | "purple" | "red" | "yellow" | "processing" | "geekblue" | "volcano", string>>;
+                type: import("vue").PropType<import("ant-design-vue/lib/_util/type").LiteralUnion<"success" | "error" | "warning" | "default" | "blue" | "cyan" | "gold" | "green" | "lime" | "magenta" | "orange" | "pink" | "purple" | "red" | "yellow" | "processing" | "geekblue" | "volcano", string>>;
             };
             closable: {
                 type: BooleanConstructor;
@@ -161,7 +161,7 @@ declare const _default: import("vue").DefineComponent<{
     } & import("vue").ComponentOptionsBase<Readonly<import("vue").ExtractPropTypes<{
         prefixCls: StringConstructor;
         color: {
-            type: import("vue").PropType<import("ant-design-vue/lib/_util/type").LiteralUnion<"default" | "success" | "error" | "warning" | "blue" | "cyan" | "gold" | "green" | "lime" | "magenta" | "orange" | "pink" | "purple" | "red" | "yellow" | "processing" | "geekblue" | "volcano", string>>;
+            type: import("vue").PropType<import("ant-design-vue/lib/_util/type").LiteralUnion<"success" | "error" | "warning" | "default" | "blue" | "cyan" | "gold" | "green" | "lime" | "magenta" | "orange" | "pink" | "purple" | "red" | "yellow" | "processing" | "geekblue" | "volcano", string>>;
         };
         closable: {
             type: BooleanConstructor;

package/es/components/form-create/index.js

@@ -18,7 +18,10 @@ const fieldRatioMap = {
     12: 12,
     18: 18,
     24: 24,
-};
+};
+function getContainer() {
+    return document.body;
+}
 
 var input = {
     name: 'input',
@@ -66,7 +69,7 @@ var input = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            width: data.config.fieldRatio,
+            minWidth: data.config.fieldRatio,
             slots: {
                 default({ row }) {
                     return h(Input, {
@@ -131,7 +134,7 @@ var textarea = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            width: data.config.fieldRatio,
+            minWidth: data.config.fieldRatio,
             slots: {
                 default({ row }) {
                     return h(Input, {
@@ -200,7 +203,7 @@ var numInput = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            width: data.config.fieldRatio,
+            minWidth: data.config.fieldRatio,
             slots: {
                 default({ row }) {
                     return h(InputNumber, {
@@ -265,13 +268,14 @@ var radio = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            width: data.config.fieldRatio,
+            minWidth: data.config.fieldRatio,
             slots: {
                 default({ row }) {
                     return h(Select, {
                         value: row[field],
                         placeholder: data.props.placeholder,
                         options: data.options,
+                        getPopupContainer: getContainer,
                         'onUpdate:value': (value) => {
                             row[field] = value;
                         },
@@ -326,7 +330,7 @@ var checkbox = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            width: data.config.fieldRatio,
+            minWidth: data.config.fieldRatio,
             slots: {
                 default({ row }) {
                     return h(Select, {
@@ -334,6 +338,7 @@ var checkbox = {
                         placeholder: data.props.placeholder,
                         options: data.options,
                         mode: 'multiple',
+                        getPopupContainer: getContainer,
                         'onUpdate:value': (value) => {
                             row[field] = value;
                         },
@@ -407,7 +412,7 @@ var date = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            width: data.config.fieldRatio,
+            minWidth: data.config.fieldRatio,
             slots: {
                 default({ row }) {
                     return h(DatePicker, {
@@ -423,6 +428,7 @@ var date = {
                         style: {
                             width: '100%',
                         },
+                        getCalendarContainer: getContainer,
                     });
                 },
             },
@@ -442,7 +448,7 @@ var dateRange = {
             type: 'datePicker',
             field: data.field,
             title: data.title.title,
-            props: Object.assign({ range: true, separator: '~', format, valueFormat: format, placeholder: data.props.placeholder }, extraProps),
+            props: Object.assign({ range: true, separator: '~', format, valueFormat: format, placeholder: data.props.placeholder, getCalendarContainer: getContainer }, extraProps),
             effect: {
                 required: data.effect.required && '请选择',
             },
@@ -487,7 +493,7 @@ var dateRange = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            width: data.config.fieldRatio,
+            minWidth: data.config.fieldRatio,
             slots: {
                 default({ row }) {
                     return h(RangePicker, {
@@ -503,6 +509,7 @@ var dateRange = {
                         style: {
                             width: '100%',
                         },
+                        getCalendarContainer: getContainer,
                     });
                 },
             },
@@ -879,7 +886,7 @@ var people = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            width: data.config.fieldRatio,
+            minWidth: data.config.fieldRatio,
             slots: {
                 default({ row }) {
                     return h(StaffSelector, Object.assign({ title: '添加员工', mode: data.props.limit ? 'radio' : 'multiple', placeholder: data.props.placeholder, onChange: (value) => {
@@ -1278,7 +1285,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
           field,
           title: "\u5546\u54C1\u7F16\u7801",
           headerClassName: rule.effect.required ? "is-required" : "",
-          width: "138px",
+          minWidth: "138px",
           slots: {
             default({ row }) {
               return h(Input, {
@@ -1301,7 +1308,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
           columns2.push({
             field: childField,
             title: item.label,
-            width: "138px",
+            minWidth: "138px",
             slots: {
               default({ row }) {
                 if (item.value === "\u5546\u54C1\u56FE\u7247" && row[childField]) {
@@ -2157,9 +2164,10 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
         "filter-option": false,
         "not-found-content": null,
         options: options.value,
+        "get-popup-container": unref(getContainer),
         onChange: handleChange,
         onSearch: handleSearch
-      }, null, 8, ["value", "options"]);
+      }, null, 8, ["value", "options", "get-popup-container"]);
     };
   }
 });
@@ -2236,7 +2244,7 @@ var shop = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            width: '138px',
+            minWidth: '138px',
             slots: {
                 default({ row }) {
                     return h(ShopWidget, {
@@ -2295,8 +2303,9 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         multiple: __props.multiple,
         options: options.value,
         "load-data": loadData,
+        "get-popup-container": unref(getContainer),
         "onUpdate:value": handleChange
-      }, null, 8, ["value", "multiple", "options"]);
+      }, null, 8, ["value", "multiple", "options", "get-popup-container"]);
     };
   }
 });
@@ -2437,7 +2446,7 @@ var materialType = {
             field,
             title: '素材类型',
             headerClassName: data.effect.required ? 'is-required' : '',
-            width: '138px',
+            minWidth: '138px',
             slots: {
                 default({ row }) {
                     return h(materialTypeInTable, {
@@ -2574,7 +2583,7 @@ var department = {
             field,
             title: data.title.title,
             headerClassName: data.effect.required ? 'is-required' : '',
-            width: data.config.fieldRatio,
+            minWidth: data.config.fieldRatio,
             slots: {
                 default({ row }) {
                     return h(StaffSelector, Object.assign({ title: '添加部门', mode: data.props.limit ? 'radio' : 'multiple', placeholder: data.props.placeholder, immediateFetch: true, unitStr: '个', onChange: (value) => {
@@ -2759,7 +2768,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   props: ["info"],
   setup(__props) {
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock(Fragment, null, [
+      return openBlock(), createElementBlock("div", null, [
         !__props.info?.status ? (openBlock(), createElementBlock("div", _hoisted_1, "\u5BA1\u6279\u72B6\u6001")) : (openBlock(), createBlock(ApprovalStatus, {
           key: 1,
           class: "bm-form-basic-info__approval-status",
@@ -2768,7 +2777,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         _hoisted_2,
         _hoisted_3,
         _hoisted_4
-      ], 64);
+      ]);
     };
   }
 });
@@ -2776,7 +2785,7 @@ var FormBasicInfo = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__file", "formBa
 
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "form-create",
-  props: ["fdRule", "extraConfig", "value"],
+  props: ["fdRule", "extraConfig", "value", "info"],
   emits: ["update:value"],
   setup(__props, { expose, emit: emits }) {
     const props = __props;
@@ -2818,7 +2827,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             item.value = props.value[item.field];
           });
         }
-        rule2.value = props.value[rule2.field];
+        rule2.value = props.value[rule2.field] || rule2.value;
       });
       return ruleData;
     }
@@ -2831,7 +2840,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       const _component_formCreate = resolveComponent("formCreate", true);
       return openBlock(), createElementBlock(Fragment, null, [
-        createVNode(FormBasicInfo),
+        createVNode(FormBasicInfo, {
+          class: "bm-fc-form-basic-info",
+          info: __props.info
+        }, null, 8, ["info"]),
         createVNode(_component_formCreate, {
           api: fApi.value,
           "onUpdate:api": _cache[0] || (_cache[0] = ($event) => fApi.value = $event),

package/es/components/form-designer/index.js

@@ -1,5 +1,5 @@
 import { withInstall } from 'bm-admin-ui/es/utils/with-install';
-import { defineComponent, openBlock, createElementBlock, normalizeStyle, toDisplayString, computed, resolveComponent, normalizeClass, unref, createBlock, createCommentVNode, withCtx, createVNode, createTextVNode, withModifiers, ref, watch, createElementVNode, Fragment, isRef, renderList, renderSlot, nextTick, createStaticVNode, reactive, onBeforeUnmount, resolveDynamicComponent } from 'vue';
+import { defineComponent, openBlock, createElementBlock, normalizeStyle, toDisplayString, computed, resolveComponent, normalizeClass, unref, createBlock, createCommentVNode, withCtx, createVNode, createTextVNode, withModifiers, ref, watch, createElementVNode, nextTick, Fragment, isRef, renderList, renderSlot, createStaticVNode, reactive, onBeforeUnmount, resolveDynamicComponent } from 'vue';
 import uniqueId from 'bm-admin-ui/es/utils/uniqueId';
 import Draggable from 'vuedraggable';
 import { Tooltip, FormItemRest, Input, Button, RadioGroup, Radio, DatePicker, Checkbox, Tabs, TabPane, Row, Col, Dropdown, Menu, CheckboxGroup, MenuItem, Divider, Switch, Select, Layout, LayoutSider, LayoutContent, message } from 'ant-design-vue';
@@ -466,7 +466,7 @@ var input = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             props: {
@@ -499,6 +499,7 @@ var input = {
                 field: fieldsMap$g['props.placeholder'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder,
             },
@@ -508,6 +509,7 @@ var input = {
                 field: fieldsMap$g['value'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 200,
                 },
                 value: rule.value,
             },
@@ -567,7 +569,7 @@ var textarea = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             props: {
@@ -601,6 +603,7 @@ var textarea = {
                 field: fieldsMap$f['props.placeholder'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder,
             },
@@ -610,6 +613,7 @@ var textarea = {
                 field: fieldsMap$f['value'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 5000,
                 },
                 value: rule.value,
             },
@@ -670,7 +674,7 @@ var numInput = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             props: {
@@ -705,6 +709,7 @@ var numInput = {
                 field: fieldsMap$e['props.placeholder'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder,
             },
@@ -778,6 +783,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
     const visible = ref(false);
     const text = ref("");
     const repeatOption = ref([]);
+    const maxlength = 500;
     function edit() {
       visible.value = true;
       text.value = makeText(props.options);
@@ -799,6 +805,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
     function handleOk() {
       const options = text.value.split("\n").reduce((pre, cur) => {
         if (cur) {
+          cur = cur.substring(0, maxlength - 1);
           pre.push({ value: cur, label: cur });
         }
         return pre;
@@ -863,6 +870,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
                           "bm-handle-options__input",
                           repeatOption.value.length && repeatOption.value.includes(element.value) ? "is-error" : ""
                         ]),
+                        maxlength,
                         onBlur: ($event) => handleBlur(element)
                       }, null, 8, ["value", "onUpdate:value", "class", "onBlur"])
                     ]),
@@ -959,7 +967,7 @@ var radio = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             options: [
@@ -1005,6 +1013,7 @@ var radio = {
                 field: fieldsMap$d['props.placeholder'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder,
             },
@@ -1097,7 +1106,7 @@ var checkbox = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             options: [
@@ -1143,6 +1152,7 @@ var checkbox = {
                 field: fieldsMap$c['props.placeholder'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder,
             },
@@ -1304,7 +1314,7 @@ var date = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             props: {
@@ -1367,6 +1377,7 @@ var date = {
                 field: fieldsMap$b['props.placeholder'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder,
             },
@@ -1448,7 +1459,7 @@ var dateRange = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             props: {
@@ -1513,6 +1524,7 @@ var dateRange = {
                 field: fieldsMap$a['props.placeholder.0'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder[0],
             },
@@ -1522,6 +1534,7 @@ var dateRange = {
                 field: fieldsMap$a['props.placeholder.1'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder[1],
             },
@@ -1595,10 +1608,23 @@ var instruction = {
                 title: label$9,
                 field: fieldsMap$9.value,
                 value: rule.value,
+                inject: true,
                 prefix: {
                     type: 'TextColor',
+                    on: {
+                        change({ api, self }, color) {
+                            api.emit('change', 'style.color', color, self, api, true);
+                        },
+                    },
                     props: {
-                        rule,
+                        color: rule.style.color,
+                    },
+                },
+                on: {
+                    change({ api, self }, list) {
+                        nextTick(() => {
+                            api.refresh();
+                        });
                     },
                 },
             },
@@ -1641,7 +1667,7 @@ var picture = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             props: {
@@ -1990,7 +2016,15 @@ var table = {
                 effect: {
                     required: true,
                 },
+                inject: true,
                 value: rule.config.childRules,
+                on: {
+                    change({ api, self }, list) {
+                        nextTick(() => {
+                            api.validate();
+                        });
+                    },
+                },
             },
             {
                 type: 'checkbox',
@@ -2053,7 +2087,7 @@ var file = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             config: {
@@ -2124,7 +2158,7 @@ var people = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             props: {
@@ -2157,6 +2191,7 @@ var people = {
                 field: fieldsMap$5['props.placeholder'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder,
             },
@@ -2245,7 +2280,7 @@ var department = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             props: {
@@ -2278,6 +2313,7 @@ var department = {
                 field: fieldsMap$4['props.placeholder'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder,
             },
@@ -3539,7 +3575,8 @@ const _hoisted_2$1 = { class: "bm-table-column-btn-wrap" };
 const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   __name: "table-column",
   props: ["formCreateInject"],
-  setup(__props) {
+  emits: ["change"],
+  setup(__props, { emit: emits }) {
     const props = __props;
     const handleClass = "bm-table-column__drag-icon";
     const btnCom = ref();
@@ -3564,6 +3601,11 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     function getPopupContainer() {
       return document.body;
     }
+    watch(childRules, (val) => {
+      emits("change", val);
+    }, {
+      deep: true
+    });
     return (_ctx, _cache) => {
       const _component_Delete = resolveComponent("Delete");
       const _component_ARow = resolveComponent("ARow");
@@ -3644,12 +3686,17 @@ var TableColumn = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__file", "table-co
 
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   __name: "text-color",
-  props: ["rule"],
-  setup(__props) {
+  props: ["color"],
+  emits: ["change"],
+  setup(__props, { emit: emits }) {
     const props = __props;
+    const color = ref(props.color);
+    function getColor(curColor) {
+      return curColor === Colors.Black ? Colors.Blue : Colors.Black;
+    }
     function handleClick() {
-      const rule = props.rule;
-      rule.style.color = rule.style.color === Colors.Black ? Colors.Blue : Colors.Black;
+      color.value = getColor(color.value);
+      emits("change", color.value);
     }
     return (_ctx, _cache) => {
       const _component_ColorPanel = resolveComponent("ColorPanel");
@@ -3661,16 +3708,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
           width: "1em",
           height: "1em",
           fontSize: "20px",
-          color: __props.rule.style.color,
+          color: getColor(color.value),
           cursor: "pointer"
         }),
         onClick: withModifiers(handleClick, ["prevent", "stop"])
-      }, {
-        default: withCtx(() => [
-          createTextVNode("change")
-        ]),
-        _: 1
-      }, 8, ["style", "onClick"]);
+      }, null, 8, ["style", "onClick"]);
     };
   }
 });
@@ -3960,6 +4002,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return rule.config.config.parse(rule);
     }
     function edit(formRules) {
+      widgetFormRules.splice(0);
       formRules.forEach((item) => {
         const rule = makeRule(ruleList[item.name]);
         delete item.name;
@@ -3977,22 +4020,70 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function getRule(name) {
       return makeRule(ruleList[name]);
     }
+    function validate() {
+      let pass = true;
+      for (const rule of widgetFormRules) {
+        const config = rule.config.config || {};
+        const childRules = rule.config.childRules || [];
+        if (!rule?.title?.title && config.name !== "instruction") {
+          pass = false;
+        }
+        if (config.name === "table" && !childRules.length) {
+          pass = false;
+        }
+        if (!pass && rule.field !== activeRule.value.field) {
+          setActiveRule(rule);
+        }
+        if (pass && childRules.length) {
+          for (const childRule of childRules) {
+            if (!childRule?.title?.title) {
+              pass = false;
+              if (childRule.field !== activeRule.value.field) {
+                setActiveRule(childRule, rule);
+              }
+              break;
+            }
+          }
+        }
+        if (!pass) {
+          nextTick(() => {
+            fApi.value.validate();
+          });
+          break;
+        }
+      }
+      return pass;
+    }
+    function flowConditionEffect(activeProps2, flowCondition) {
+      const requiredRule = activeProps2?.find((rule) => rule.field === "effect.required");
+      if (requiredRule) {
+        if (!requiredRule.props) {
+          requiredRule.props = {};
+        }
+        requiredRule.props.disabled = !!flowCondition[activeRule.value.field];
+      }
+    }
     watch(() => props.presetRules, (presetRules) => {
       widgetFormRules.push(...presetRules);
-    }, {
-      immediate: true
     });
     watch(() => props.formRules, (formRules) => {
       edit(formRules);
+    });
+    watch(activeProps, (activeProps2) => {
+      flowConditionEffect(activeProps2, props.flowCondition);
+    });
+    watch(() => props.flowCondition, (flowCondition) => {
+      flowConditionEffect(activeProps.value, flowCondition);
     }, {
-      immediate: true
+      deep: true
     });
     onBeforeUnmount(() => {
       resetIndex();
     });
     expose({
       getFormRule,
-      getRule
+      getRule,
+      validate
     });
     return (_ctx, _cache) => {
       const _component_ACol = resolveComponent("ACol");
@@ -4035,7 +4126,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     move: moveMenuItem,
                     "force-fallback": true,
                     "scroll-sensitivity": 100,
-                    delay: 50,
                     onStart: handleMenuItemDragStart,
                     onEnd: handleMenuItemDragEnd
                   }, {