bm-admin-ui 1.0.46-alpha → 1.0.47-alpha

package/es/components/editor/index.d.ts

@@ -191,8 +191,9 @@ declare const BmEditor: import("bm-admin-ui/es/utils/with-install").SFCWithInsta
             };
         };
         emits: string[];
-        setup(props: any, { emit }: {
+        setup(props: any, { emit, expose }: {
             emit: any;
+            expose: any;
         }): {
             uploadDisabled: import("vue").ComputedRef<boolean>;
             updateUploadProgress(file: any, progress: any): void;

package/es/components/editor/index.js

@@ -11640,7 +11640,7 @@ const _sfc_main$1 = {
     "updateDisabledStatus",
     "updateIsUploadingStatus"
   ],
-  setup(props, { emit }) {
+  setup(props, { emit, expose }) {
     let acceptList = [
       ".xlsx",
       ".XLSX",
@@ -11980,6 +11980,7 @@ const _sfc_main$1 = {
         immediate: true
       }
     );
+    expose({ state, methods });
     return {
       ...toRefs(state),
       icons,

package/es/components/editor/src/editor.vue.d.ts

@@ -191,8 +191,9 @@ declare const _default: import("vue").DefineComponent<{
             };
         };
         emits: string[];
-        setup(props: any, { emit }: {
+        setup(props: any, { emit, expose }: {
             emit: any;
+            expose: any;
         }): {
             uploadDisabled: import("vue").ComputedRef<boolean>;
             updateUploadProgress(file: any, progress: any): void;

package/es/components/float-table/index.d.ts

@@ -42,9 +42,9 @@ declare const BmFloatTable: import("bm-admin-ui/es/utils/with-install").SFCWithI
         gridOptions: import("vue").ComputedRef<any>;
         gridEvents: import("vue").ComputedRef<any>;
         pager: import("vue").ComputedRef<any>;
-        simpleImage: import("vue").Ref<(string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        simpleImage: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
-        }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        }> | null | undefined) | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | null | undefined)[]>;
         floatRefsId: import("vue").Ref<{}>;

package/es/components/float-table/src/float-table.vue.d.ts

@@ -42,9 +42,9 @@ declare const _default: {
         gridOptions: import("vue").ComputedRef<any>;
         gridEvents: import("vue").ComputedRef<any>;
         pager: import("vue").ComputedRef<any>;
-        simpleImage: import("vue").Ref<(string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        simpleImage: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
-        }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        }> | null | undefined) | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | null | undefined)[]>;
         floatRefsId: import("vue").Ref<{}>;

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

@@ -1633,6 +1633,8 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
       index++;
     }
     function handleDelete(targetKey) {
+      if (panes.length === 1)
+        return;
       panes.splice(
         panes.findIndex((pane) => pane.key === targetKey),
         1
@@ -2235,7 +2237,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   props: [
     "value",
     "extraConfig",
-    "rule",
+    "dataFiltering",
     "disabled",
     "formCreateInject"
   ],
@@ -2257,7 +2259,7 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     }, 300);
     const postData = computed(() => ({
       keyword: keyword.value,
-      filterByUser: props.rule.config.dataFiltering
+      filterByUser: props.dataFiltering
     }));
     function initOptions() {
       props.extraConfig.fetch(postData.value).then((data) => {
@@ -2265,10 +2267,10 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
       });
     }
     function handleChange(val, option) {
-      value.value = val;
       emits("change", {
         [fieldNames.value]: option.value,
-        [fieldNames.label]: option.label
+        [fieldNames.label]: option.label,
+        ...option
       });
     }
     function handleSearch(value2) {
@@ -2299,6 +2301,7 @@ var ShopWidget = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__file", "shop-widg
 var shop = {
     name: 'shop',
     rule(data, extraConfig) {
+        var _a;
         const shopExtraConfig = extraConfig.shop;
         return {
             type: 'ShopWidget',
@@ -2309,7 +2312,7 @@ var shop = {
                 required: data.effect.required && '请选择店铺',
             },
             props: {
-                rule: data,
+                dataFiltering: (_a = data.config) === null || _a === void 0 ? void 0 : _a.dataFiltering,
                 extraConfig: shopExtraConfig,
                 value: data.value,
             },
@@ -2330,6 +2333,7 @@ var shop = {
         };
     },
     rowRule(data, extraConfig) {
+        var _a;
         const shopExtraConfig = extraConfig.shop;
         return {
             type: 'ShopWidget',
@@ -2340,7 +2344,7 @@ var shop = {
                 required: data.effect.required && '请选择店铺',
             },
             props: {
-                rule: data,
+                dataFiltering: (_a = data.config) === null || _a === void 0 ? void 0 : _a.dataFiltering,
                 extraConfig: shopExtraConfig,
                 value: data.value,
             },
@@ -2372,8 +2376,9 @@ var shop = {
             minWidth: '138px',
             slots: {
                 default({ row }) {
+                    var _a;
                     return h(ShopWidget, {
-                        rule: data,
+                        dataFiltering: (_a = data.config) === null || _a === void 0 ? void 0 : _a.dataFiltering,
                         extraConfig: extraConfig.shop,
                         value: row[field],
                         disabled: data.disabled,
@@ -2400,13 +2405,22 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
           item.isLeaf = props.format === 1;
         });
         options.value = result;
+        return options.value;
+      }).then((options2) => {
+        if (props.value.length) {
+          if (props.multiple) {
+            props.value.forEach((item) => loadValueOptions(item, options2));
+          } else {
+            loadValueOptions(props.value, options2);
+          }
+        }
       });
     }
-    function loadData(selectedOptions) {
+    async function loadData(selectedOptions) {
       const optionLength = selectedOptions.length;
       const targetOption = selectedOptions[optionLength - 1];
       targetOption.loading = true;
-      props.config.fetch({
+      return await props.config.fetch({
         level: optionLength + 1,
         relationCode: targetOption.value
       }).then((result) => {
@@ -2450,6 +2464,23 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         return pre;
       }, []);
     }
+    async function loadValueOptions(value, options2) {
+      const selectedOptions = [];
+      for (const option of value) {
+        let cur;
+        if (selectedOptions.length) {
+          cur = selectedOptions[selectedOptions.length - 1].children.find(
+            (item) => item.value === option.value
+          );
+        } else {
+          cur = options2.find((item) => item.value === option.value);
+        }
+        if (!cur.isLeaf) {
+          selectedOptions.push(cur);
+          await loadData(selectedOptions);
+        }
+      }
+    }
     initOptions();
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(Cascader), {
@@ -2458,6 +2489,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
         multiple: __props.multiple,
         options: options.value,
         "load-data": loadData,
+        "change-on-select": "",
         "get-popup-container": unref(getContainer),
         onChange: handleChange
       }, null, 8, ["value", "multiple", "options", "get-popup-container"]);

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

@@ -3490,12 +3490,6 @@ const formDesignerProps = {
             return [];
         },
     },
-    presetRules: {
-        type: Array,
-        default() {
-            return [];
-        },
-    },
     flowCondition: {
         type: Object,
         default() {
@@ -3795,8 +3789,7 @@ const __default__ = {
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...__default__,
   props: formDesignerProps,
-  emits: ["initPresetRule"],
-  setup(__props, { expose, emit: emits }) {
+  setup(__props, { expose }) {
     const props = __props;
     FC.component("TableHeadCount", TableHeadCount);
     FC.component("TableColumn", TableColumn);
@@ -4066,19 +4059,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function edit(formRules) {
       widgetFormRules.splice(0);
       formRules.forEach((item) => {
-        const rule = makeRule(ruleList[item.name]);
-        delete item.name;
-        if (item?.config?.childRules?.length) {
-          rule.config.childRules = item.config.childRules.map((childItem) => {
-            const childRule = makeRule(ruleList[childItem.name]);
-            delete childItem.name;
-            return childRule;
-          });
-        }
-        merge(rule, item);
-        widgetFormRules.push(rule);
+        widgetFormRules.push(recursiveMakeRule(item));
       });
     }
+    function recursiveMakeRule(item) {
+      const rule = makeRule(ruleList[item.name]);
+      delete item.name;
+      if (item?.config?.childRules?.length) {
+        rule.config.childRules = item.config.childRules.map((childItem) => {
+          const childRule = recursiveMakeRule(childItem);
+          delete childItem.name;
+          return childRule;
+        });
+      }
+      merge(rule, item);
+      return rule;
+    }
     function getRule(name) {
       return makeRule(ruleList[name]);
     }
@@ -4130,17 +4126,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         requiredRule.props.disabled = !!flowCondition[activeRule.value.field];
       }
     }
-    watch(
-      () => props.presetRules,
-      (presetRules) => {
-        widgetFormRules.push(...presetRules);
-        emits("initPresetRule", getFormRule());
-      }
-    );
     watch(
       () => props.formRules,
       (formRules) => {
         formRules && edit(formRules);
+      },
+      {
+        immediate: true
       }
     );
     watch(activeProps, (activeProps2) => {

package/es/components/staffs-selector/index.d.ts

@@ -910,9 +910,9 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
         searchVal: import("vue").Ref<string>;
         selectAll: import("vue").Ref<boolean>;
         indeterminate: import("vue").Ref<boolean>;
-        emptyPic: import("vue").Ref<(string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        emptyPic: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
-        }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        }> | null | undefined) | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | null | undefined)[]>;
         isFulfill: import("vue").Ref<boolean>;

package/es/components/staffs-selector/src/multipleCmp.vue.d.ts

@@ -28,9 +28,9 @@ declare const _default: import("vue").DefineComponent<{
     searchVal: import("vue").Ref<string>;
     selectAll: import("vue").Ref<boolean>;
     indeterminate: import("vue").Ref<boolean>;
-    emptyPic: import("vue").Ref<(string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    emptyPic: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
-    }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    }> | null | undefined) | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null | undefined)[]>;
     isFulfill: import("vue").Ref<boolean>;

package/es/components/staffs-selector/src/staffs-selector.vue.d.ts

@@ -910,9 +910,9 @@ declare const _default: import("vue").DefineComponent<{
         searchVal: import("vue").Ref<string>;
         selectAll: import("vue").Ref<boolean>;
         indeterminate: import("vue").Ref<boolean>;
-        emptyPic: import("vue").Ref<(string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        emptyPic: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
-        }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        }> | null | undefined) | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | null | undefined)[]>;
         isFulfill: import("vue").Ref<boolean>;

package/es/components/upload/index.d.ts

@@ -71,8 +71,9 @@ declare const BmUpload: import("bm-admin-ui/es/utils/with-install").SFCWithInsta
         };
     };
     emits: string[];
-    setup(props: any, { emit }: {
+    setup(props: any, { emit, expose }: {
         emit: any;
+        expose: any;
     }): {
         uploadDisabled: import("vue").ComputedRef<boolean>;
         updateUploadProgress(file: any, progress: any): void;

package/es/components/upload/index.js

@@ -225,7 +225,7 @@ const _sfc_main = {
     "updateDisabledStatus",
     "updateIsUploadingStatus"
   ],
-  setup(props, { emit }) {
+  setup(props, { emit, expose }) {
     let acceptList = [
       ".xlsx",
       ".XLSX",
@@ -565,6 +565,7 @@ const _sfc_main = {
         immediate: true
       }
     );
+    expose({ state, methods });
     return {
       ...toRefs(state),
       icons,

package/es/components/upload/src/upload.vue.d.ts

@@ -71,8 +71,9 @@ declare const _default: {
         };
     };
     emits: string[];
-    setup(props: any, { emit }: {
+    setup(props: any, { emit, expose }: {
         emit: any;
+        expose: any;
     }): {
         uploadDisabled: import("vue").ComputedRef<boolean>;
         updateUploadProgress(file: any, progress: any): void;

package/lib/components/editor/index.d.ts

@@ -191,8 +191,9 @@ declare const BmEditor: import("bm-admin-ui/es/utils/with-install").SFCWithInsta
             };
         };
         emits: string[];
-        setup(props: any, { emit }: {
+        setup(props: any, { emit, expose }: {
             emit: any;
+            expose: any;
         }): {
             uploadDisabled: import("vue").ComputedRef<boolean>;
             updateUploadProgress(file: any, progress: any): void;

package/lib/components/editor/index.js

@@ -11644,7 +11644,7 @@ const _sfc_main$1 = {
     "updateDisabledStatus",
     "updateIsUploadingStatus"
   ],
-  setup(props, { emit }) {
+  setup(props, { emit, expose }) {
     let acceptList = [
       ".xlsx",
       ".XLSX",
@@ -11984,6 +11984,7 @@ const _sfc_main$1 = {
         immediate: true
       }
     );
+    expose({ state, methods });
     return {
       ...vue.toRefs(state),
       icons,

package/lib/components/editor/src/editor.vue.d.ts

@@ -191,8 +191,9 @@ declare const _default: import("vue").DefineComponent<{
             };
         };
         emits: string[];
-        setup(props: any, { emit }: {
+        setup(props: any, { emit, expose }: {
             emit: any;
+            expose: any;
         }): {
             uploadDisabled: import("vue").ComputedRef<boolean>;
             updateUploadProgress(file: any, progress: any): void;

package/lib/components/float-table/index.d.ts

@@ -42,9 +42,9 @@ declare const BmFloatTable: import("bm-admin-ui/es/utils/with-install").SFCWithI
         gridOptions: import("vue").ComputedRef<any>;
         gridEvents: import("vue").ComputedRef<any>;
         pager: import("vue").ComputedRef<any>;
-        simpleImage: import("vue").Ref<(string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        simpleImage: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
-        }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        }> | null | undefined) | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | null | undefined)[]>;
         floatRefsId: import("vue").Ref<{}>;

package/lib/components/float-table/src/float-table.vue.d.ts

@@ -42,9 +42,9 @@ declare const _default: {
         gridOptions: import("vue").ComputedRef<any>;
         gridEvents: import("vue").ComputedRef<any>;
         pager: import("vue").ComputedRef<any>;
-        simpleImage: import("vue").Ref<(string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        simpleImage: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
-        }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        }> | null | undefined) | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | null | undefined)[]>;
         floatRefsId: import("vue").Ref<{}>;

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

@@ -1643,6 +1643,8 @@ const _sfc_main$6 = /* @__PURE__ */ vue.defineComponent({
       index++;
     }
     function handleDelete(targetKey) {
+      if (panes.length === 1)
+        return;
       panes.splice(
         panes.findIndex((pane) => pane.key === targetKey),
         1
@@ -2245,7 +2247,7 @@ const _sfc_main$4 = /* @__PURE__ */ vue.defineComponent({
   props: [
     "value",
     "extraConfig",
-    "rule",
+    "dataFiltering",
     "disabled",
     "formCreateInject"
   ],
@@ -2267,7 +2269,7 @@ const _sfc_main$4 = /* @__PURE__ */ vue.defineComponent({
     }, 300);
     const postData = vue.computed(() => ({
       keyword: keyword.value,
-      filterByUser: props.rule.config.dataFiltering
+      filterByUser: props.dataFiltering
     }));
     function initOptions() {
       props.extraConfig.fetch(postData.value).then((data) => {
@@ -2275,10 +2277,10 @@ const _sfc_main$4 = /* @__PURE__ */ vue.defineComponent({
       });
     }
     function handleChange(val, option) {
-      value.value = val;
       emits("change", {
         [fieldNames.value]: option.value,
-        [fieldNames.label]: option.label
+        [fieldNames.label]: option.label,
+        ...option
       });
     }
     function handleSearch(value2) {
@@ -2309,6 +2311,7 @@ var ShopWidget = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__file", "shop-widg
 var shop = {
     name: 'shop',
     rule(data, extraConfig) {
+        var _a;
         const shopExtraConfig = extraConfig.shop;
         return {
             type: 'ShopWidget',
@@ -2319,7 +2322,7 @@ var shop = {
                 required: data.effect.required && '请选择店铺',
             },
             props: {
-                rule: data,
+                dataFiltering: (_a = data.config) === null || _a === void 0 ? void 0 : _a.dataFiltering,
                 extraConfig: shopExtraConfig,
                 value: data.value,
             },
@@ -2340,6 +2343,7 @@ var shop = {
         };
     },
     rowRule(data, extraConfig) {
+        var _a;
         const shopExtraConfig = extraConfig.shop;
         return {
             type: 'ShopWidget',
@@ -2350,7 +2354,7 @@ var shop = {
                 required: data.effect.required && '请选择店铺',
             },
             props: {
-                rule: data,
+                dataFiltering: (_a = data.config) === null || _a === void 0 ? void 0 : _a.dataFiltering,
                 extraConfig: shopExtraConfig,
                 value: data.value,
             },
@@ -2382,8 +2386,9 @@ var shop = {
             minWidth: '138px',
             slots: {
                 default({ row }) {
+                    var _a;
                     return vue.h(ShopWidget, {
-                        rule: data,
+                        dataFiltering: (_a = data.config) === null || _a === void 0 ? void 0 : _a.dataFiltering,
                         extraConfig: extraConfig.shop,
                         value: row[field],
                         disabled: data.disabled,
@@ -2410,13 +2415,22 @@ const _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({
           item.isLeaf = props.format === 1;
         });
         options.value = result;
+        return options.value;
+      }).then((options2) => {
+        if (props.value.length) {
+          if (props.multiple) {
+            props.value.forEach((item) => loadValueOptions(item, options2));
+          } else {
+            loadValueOptions(props.value, options2);
+          }
+        }
       });
     }
-    function loadData(selectedOptions) {
+    async function loadData(selectedOptions) {
       const optionLength = selectedOptions.length;
       const targetOption = selectedOptions[optionLength - 1];
       targetOption.loading = true;
-      props.config.fetch({
+      return await props.config.fetch({
         level: optionLength + 1,
         relationCode: targetOption.value
       }).then((result) => {
@@ -2460,6 +2474,23 @@ const _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({
         return pre;
       }, []);
     }
+    async function loadValueOptions(value, options2) {
+      const selectedOptions = [];
+      for (const option of value) {
+        let cur;
+        if (selectedOptions.length) {
+          cur = selectedOptions[selectedOptions.length - 1].children.find(
+            (item) => item.value === option.value
+          );
+        } else {
+          cur = options2.find((item) => item.value === option.value);
+        }
+        if (!cur.isLeaf) {
+          selectedOptions.push(cur);
+          await loadData(selectedOptions);
+        }
+      }
+    }
     initOptions();
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Cascader), {
@@ -2468,6 +2499,7 @@ const _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({
         multiple: __props.multiple,
         options: options.value,
         "load-data": loadData,
+        "change-on-select": "",
         "get-popup-container": vue.unref(getContainer),
         onChange: handleChange
       }, null, 8, ["value", "multiple", "options", "get-popup-container"]);

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

@@ -3500,12 +3500,6 @@ const formDesignerProps = {
             return [];
         },
     },
-    presetRules: {
-        type: Array,
-        default() {
-            return [];
-        },
-    },
     flowCondition: {
         type: Object,
         default() {
@@ -3805,8 +3799,7 @@ const __default__ = {
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   ...__default__,
   props: formDesignerProps,
-  emits: ["initPresetRule"],
-  setup(__props, { expose, emit: emits }) {
+  setup(__props, { expose }) {
     const props = __props;
     FC__default["default"].component("TableHeadCount", TableHeadCount);
     FC__default["default"].component("TableColumn", TableColumn);
@@ -4076,19 +4069,22 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     function edit(formRules) {
       widgetFormRules.splice(0);
       formRules.forEach((item) => {
-        const rule = makeRule(ruleList[item.name]);
-        delete item.name;
-        if (item?.config?.childRules?.length) {
-          rule.config.childRules = item.config.childRules.map((childItem) => {
-            const childRule = makeRule(ruleList[childItem.name]);
-            delete childItem.name;
-            return childRule;
-          });
-        }
-        lodashEs.merge(rule, item);
-        widgetFormRules.push(rule);
+        widgetFormRules.push(recursiveMakeRule(item));
       });
     }
+    function recursiveMakeRule(item) {
+      const rule = makeRule(ruleList[item.name]);
+      delete item.name;
+      if (item?.config?.childRules?.length) {
+        rule.config.childRules = item.config.childRules.map((childItem) => {
+          const childRule = recursiveMakeRule(childItem);
+          delete childItem.name;
+          return childRule;
+        });
+      }
+      lodashEs.merge(rule, item);
+      return rule;
+    }
     function getRule(name) {
       return makeRule(ruleList[name]);
     }
@@ -4140,17 +4136,13 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         requiredRule.props.disabled = !!flowCondition[activeRule.value.field];
       }
     }
-    vue.watch(
-      () => props.presetRules,
-      (presetRules) => {
-        widgetFormRules.push(...presetRules);
-        emits("initPresetRule", getFormRule());
-      }
-    );
     vue.watch(
       () => props.formRules,
       (formRules) => {
         formRules && edit(formRules);
+      },
+      {
+        immediate: true
       }
     );
     vue.watch(activeProps, (activeProps2) => {

package/lib/components/staffs-selector/index.d.ts

@@ -910,9 +910,9 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
         searchVal: import("vue").Ref<string>;
         selectAll: import("vue").Ref<boolean>;
         indeterminate: import("vue").Ref<boolean>;
-        emptyPic: import("vue").Ref<(string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        emptyPic: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
-        }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        }> | null | undefined) | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | null | undefined)[]>;
         isFulfill: import("vue").Ref<boolean>;

package/lib/components/staffs-selector/src/multipleCmp.vue.d.ts

@@ -28,9 +28,9 @@ declare const _default: import("vue").DefineComponent<{
     searchVal: import("vue").Ref<string>;
     selectAll: import("vue").Ref<boolean>;
     indeterminate: import("vue").Ref<boolean>;
-    emptyPic: import("vue").Ref<(string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    emptyPic: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
-    }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    }> | null | undefined) | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null | undefined)[]>;
     isFulfill: import("vue").Ref<boolean>;

package/lib/components/staffs-selector/src/staffs-selector.vue.d.ts

@@ -910,9 +910,9 @@ declare const _default: import("vue").DefineComponent<{
         searchVal: import("vue").Ref<string>;
         selectAll: import("vue").Ref<boolean>;
         indeterminate: import("vue").Ref<boolean>;
-        emptyPic: import("vue").Ref<(string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        emptyPic: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
-        }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        }> | null | undefined) | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | null | undefined)[]>;
         isFulfill: import("vue").Ref<boolean>;

package/lib/components/upload/index.d.ts

@@ -71,8 +71,9 @@ declare const BmUpload: import("bm-admin-ui/es/utils/with-install").SFCWithInsta
         };
     };
     emits: string[];
-    setup(props: any, { emit }: {
+    setup(props: any, { emit, expose }: {
         emit: any;
+        expose: any;
     }): {
         uploadDisabled: import("vue").ComputedRef<boolean>;
         updateUploadProgress(file: any, progress: any): void;

package/lib/components/upload/index.js

@@ -229,7 +229,7 @@ const _sfc_main = {
     "updateDisabledStatus",
     "updateIsUploadingStatus"
   ],
-  setup(props, { emit }) {
+  setup(props, { emit, expose }) {
     let acceptList = [
       ".xlsx",
       ".XLSX",
@@ -569,6 +569,7 @@ const _sfc_main = {
         immediate: true
       }
     );
+    expose({ state, methods });
     return {
       ...vue.toRefs(state),
       icons,

package/lib/components/upload/src/upload.vue.d.ts

@@ -71,8 +71,9 @@ declare const _default: {
         };
     };
     emits: string[];
-    setup(props: any, { emit }: {
+    setup(props: any, { emit, expose }: {
         emit: any;
+        expose: any;
     }): {
         uploadDisabled: import("vue").ComputedRef<boolean>;
         updateUploadProgress(file: any, progress: any): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bm-admin-ui",
-  "version": "1.0.46-alpha",
+  "version": "1.0.47-alpha",
   "private": false,
   "description": "An Admin Component Library for Bm",
   "license": "UNLICENSED",

package/types/components/editor/index.d.ts

@@ -191,8 +191,9 @@ declare const BmEditor: import("bm-admin-ui/es/utils/with-install").SFCWithInsta
             };
         };
         emits: string[];
-        setup(props: any, { emit }: {
+        setup(props: any, { emit, expose }: {
             emit: any;
+            expose: any;
         }): {
             uploadDisabled: import("vue").ComputedRef<boolean>;
             updateUploadProgress(file: any, progress: any): void;

package/types/components/editor/src/editor.vue.d.ts

@@ -191,8 +191,9 @@ declare const _default: import("vue").DefineComponent<{
             };
         };
         emits: string[];
-        setup(props: any, { emit }: {
+        setup(props: any, { emit, expose }: {
             emit: any;
+            expose: any;
         }): {
             uploadDisabled: import("vue").ComputedRef<boolean>;
             updateUploadProgress(file: any, progress: any): void;

package/types/components/float-table/index.d.ts

@@ -42,9 +42,9 @@ declare const BmFloatTable: import("bm-admin-ui/es/utils/with-install").SFCWithI
         gridOptions: import("vue").ComputedRef<any>;
         gridEvents: import("vue").ComputedRef<any>;
         pager: import("vue").ComputedRef<any>;
-        simpleImage: import("vue").Ref<(string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        simpleImage: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
-        }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        }> | null | undefined) | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | null | undefined)[]>;
         floatRefsId: import("vue").Ref<{}>;

package/types/components/float-table/src/float-table.vue.d.ts

@@ -42,9 +42,9 @@ declare const _default: {
         gridOptions: import("vue").ComputedRef<any>;
         gridEvents: import("vue").ComputedRef<any>;
         pager: import("vue").ComputedRef<any>;
-        simpleImage: import("vue").Ref<(string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        simpleImage: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
-        }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        }> | null | undefined) | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | null | undefined)[]>;
         floatRefsId: import("vue").Ref<{}>;

package/types/components/staffs-selector/index.d.ts

@@ -910,9 +910,9 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
         searchVal: import("vue").Ref<string>;
         selectAll: import("vue").Ref<boolean>;
         indeterminate: import("vue").Ref<boolean>;
-        emptyPic: import("vue").Ref<(string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        emptyPic: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
-        }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        }> | null | undefined) | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | null | undefined)[]>;
         isFulfill: import("vue").Ref<boolean>;

package/types/components/staffs-selector/src/multipleCmp.vue.d.ts

@@ -28,9 +28,9 @@ declare const _default: import("vue").DefineComponent<{
     searchVal: import("vue").Ref<string>;
     selectAll: import("vue").Ref<boolean>;
     indeterminate: import("vue").Ref<boolean>;
-    emptyPic: import("vue").Ref<(string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    emptyPic: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
-    }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+    }> | null | undefined) | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }> | null | undefined)[]>;
     isFulfill: import("vue").Ref<boolean>;

package/types/components/staffs-selector/src/staffs-selector.vue.d.ts

@@ -910,9 +910,9 @@ declare const _default: import("vue").DefineComponent<{
         searchVal: import("vue").Ref<string>;
         selectAll: import("vue").Ref<boolean>;
         indeterminate: import("vue").Ref<boolean>;
-        emptyPic: import("vue").Ref<(string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        emptyPic: import("vue").Ref<JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
-        }> | null | undefined) | JSX.Element | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        }> | null | undefined) | (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | null | undefined)[]>;
         isFulfill: import("vue").Ref<boolean>;

package/types/components/upload/index.d.ts

@@ -71,8 +71,9 @@ declare const BmUpload: import("bm-admin-ui/es/utils/with-install").SFCWithInsta
         };
     };
     emits: string[];
-    setup(props: any, { emit }: {
+    setup(props: any, { emit, expose }: {
         emit: any;
+        expose: any;
     }): {
         uploadDisabled: import("vue").ComputedRef<boolean>;
         updateUploadProgress(file: any, progress: any): void;

package/types/components/upload/src/upload.vue.d.ts

@@ -71,8 +71,9 @@ declare const _default: {
         };
     };
     emits: string[];
-    setup(props: any, { emit }: {
+    setup(props: any, { emit, expose }: {
         emit: any;
+        expose: any;
     }): {
         uploadDisabled: import("vue").ComputedRef<boolean>;
         updateUploadProgress(file: any, progress: any): void;