bm-admin-ui 1.0.70-alpha → 1.0.72-alpha

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

@@ -78,7 +78,7 @@ declare const BmButton: import("bm-admin-ui/es/utils/with-install").SFCWithInsta
                 onMousedown: {
                     type: import("vue").PropType<(event: MouseEvent) => void>;
                 };
-            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "disabled" | "loading" | "htmlType" | "ghost" | "block" | "danger">;
+            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "htmlType" | "loading" | "disabled" | "ghost" | "block" | "danger">;
             $attrs: {
                 [x: string]: unknown;
             };

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

@@ -80,7 +80,7 @@ declare const _default: import("vue").DefineComponent<{
                 onMousedown: {
                     type: import("vue").PropType<(event: MouseEvent) => void>;
                 };
-            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "disabled" | "loading" | "htmlType" | "ghost" | "block" | "danger">;
+            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "htmlType" | "loading" | "disabled" | "ghost" | "block" | "danger">;
             $attrs: {
                 [x: string]: unknown;
             };

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

@@ -294,8 +294,8 @@ declare const BmEditor: import("bm-admin-ui/es/utils/with-install").SFCWithInsta
     onReady?: ((...args: any[]) => any) | undefined;
     onGetCount?: ((...args: any[]) => any) | undefined;
 }, {
-    value: string;
     disabled: boolean;
+    value: string;
     options: {
         [key: string]: any;
     };

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

@@ -294,8 +294,8 @@ declare const _default: import("vue").DefineComponent<{
     onReady?: ((...args: any[]) => any) | undefined;
     onGetCount?: ((...args: any[]) => any) | undefined;
 }, {
-    value: string;
     disabled: boolean;
+    value: string;
     options: {
         [key: string]: any;
     };

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

@@ -291,8 +291,8 @@ function handleRadioRule(rule) {
         rule.component = RadioWidget;
         rule.inject = true;
         rule.on = {
-            change({ self }, value) {
-                self.value = value;
+            change({ self, api }, value) {
+                api.form[self.field] = value;
             },
         };
     }
@@ -690,7 +690,7 @@ var picture = {
             on: {
                 update(inject, list) {
                     const rule = inject.self;
-                    rule.value = list;
+                    inject.api.form[rule.field] = list;
                     nextTick(() => {
                         inject.api.validateField(rule.field);
                     });
@@ -738,7 +738,7 @@ var picture = {
             on: {
                 update(inject, list) {
                     const rule = inject.self;
-                    rule.value = list;
+                    inject.api.form[rule.field] = list;
                     nextTick(() => {
                         inject.api.validateField(rule.field);
                     });
@@ -786,7 +786,7 @@ var file = {
             on: {
                 update(inject, list) {
                     const rule = inject.self;
-                    rule.value = list;
+                    inject.api.form[rule.field] = list;
                     nextTick(() => {
                         inject.api.validateField(rule.field);
                     });
@@ -827,7 +827,7 @@ var file = {
             on: {
                 update(inject, list) {
                     const rule = inject.self;
-                    rule.value = list;
+                    inject.api.form[rule.field] = list;
                     nextTick(() => {
                         inject.api.validateField(rule.field);
                     });
@@ -944,8 +944,8 @@ var people = {
             on: {
                 change(inject, list) {
                     const rule = inject.self;
-                    rule.value = list;
                     rule.props.defaultSelected = list;
+                    inject.api.form[rule.field] = list;
                     inject.api.validateField(rule.field, () => {
                         if (list.length) {
                             inject.api.clearValidateState(rule.field);
@@ -984,8 +984,8 @@ var people = {
             on: {
                 change(inject, list) {
                     const rule = inject.self;
-                    rule.value = list;
                     rule.props.defaultSelected = list;
+                    inject.api.form[rule.field] = list;
                     inject.api.validateField(rule.field, () => {
                         if (list.length) {
                             inject.api.clearValidateState(rule.field);
@@ -19385,11 +19385,6 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         })
       );
       if (childRules.length) {
-        if (props.disabled?.includes?.("editTable")) {
-          childRules.forEach((rule) => {
-            rule.disabled = true;
-          });
-        }
         return {
           title: {
             title: "\u660E\u7EC6\u5217\u8868"
@@ -19451,6 +19446,14 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     function handleError(e) {
       message.error(e?.message);
     }
+    function handleColumnDisabled(tableRule) {
+      if (props.disabled?.includes?.("editTable")) {
+        tableRule?.config?.childRules?.forEach((rule) => {
+          rule.disabled = true;
+        });
+      }
+      return tableRule;
+    }
     props.value && initValue(props.value);
     props.extraConfig.materialTemp.getDict().then((data) => {
       measrueDicts.value = data;
@@ -19716,7 +19719,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
                       }, 1024),
                       pane.tableRule ? (openBlock(), createBlock(TableWidget, {
                         key: 0,
-                        rule: pane.tableRule,
+                        rule: handleColumnDisabled(pane.tableRule),
                         disabled: __props.disabled?.includes?.("editTable"),
                         "extra-config": __props.extraConfig,
                         "form-data": unref(formData),
@@ -19771,7 +19774,7 @@ var materialTemp = {
                     inject: true,
                     on: {
                         change(inject, value) {
-                            inject.self.value = value;
+                            inject.api.form[inject.self.field] = value;
                         },
                     },
                     validate: [
@@ -19997,8 +20000,8 @@ var product = {
             inject: true,
             on: {
                 change(inject, value) {
-                    inject.self.value = value;
                     inject.self.props.defalutValue = value;
+                    inject.api.form[inject.self.field] = value;
                     nextTick(() => {
                         inject.api.validateField(inject.self.field);
                     });
@@ -20024,8 +20027,8 @@ var product = {
             inject: true,
             on: {
                 change(inject, value) {
-                    inject.self.value = value;
                     inject.self.props.defalutValue = value;
+                    inject.api.form[inject.self.field] = value;
                     nextTick(() => {
                         inject.api.validateField(inject.self.field);
                     });
@@ -20159,7 +20162,7 @@ var shop = {
             on: {
                 change(inject, value) {
                     const rule = inject.self;
-                    rule.value = value;
+                    inject.api.form[inject.self.field] = value;
                     nextTick(() => {
                         setTimeout(() => {
                             inject.api.validateField(rule.field);
@@ -20189,7 +20192,7 @@ var shop = {
             on: {
                 change(inject, value) {
                     const rule = inject.self;
-                    rule.value = value;
+                    inject.api.form[inject.self.field] = value;
                     nextTick(() => {
                         setTimeout(() => {
                             inject.api.validateField(rule.field);
@@ -20325,9 +20328,9 @@ var materialType = {
             on: {
                 change(inject, list) {
                     const rule = inject.self;
-                    rule.value = list;
                     rule.props.value = list;
-                    inject.api.emit('value-change', inject.api.bind());
+                    inject.api.form[rule.field] = list;
+                    inject.api.emit('update:modelValue', inject.api.form);
                     nextTick(() => {
                         setTimeout(() => {
                             inject.api.validateField(rule.field);
@@ -20365,7 +20368,7 @@ var materialType = {
                     const rule = inject.self;
                     rule.value = list;
                     rule.props.value = list;
-                    inject.api.emit('value-change', inject.api.bind());
+                    inject.api.emit('update:modelValue', inject.api.form);
                     nextTick(() => {
                         setTimeout(() => {
                             inject.api.validateField(rule.field);
@@ -20471,8 +20474,8 @@ var department = {
             on: {
                 change(inject, list) {
                     const rule = inject.self;
-                    rule.value = list;
                     rule.props.defaultSelected = list;
+                    inject.api.form[rule.field] = list;
                     inject.api.validateField(rule.field, () => {
                         if (list.length) {
                             inject.api.clearValidateState(rule.field);
@@ -20514,8 +20517,8 @@ var department = {
             on: {
                 change(inject, list) {
                     const rule = inject.self;
-                    rule.value = list;
                     rule.props.defaultSelected = list;
+                    inject.api.form[rule.field] = list;
                     inject.api.validateField(rule.field, () => {
                         if (list.length) {
                             inject.api.clearValidateState(rule.field);
@@ -20589,8 +20592,7 @@ var table = {
             on: {
                 change(inject, value) {
                     const rule = inject.self;
-                    rule.value = value;
-                    inject.api.emit('value-change', inject.api.bind());
+                    inject.api.form[rule.field] = value;
                 },
             },
             validate: [
@@ -20615,8 +20617,8 @@ var table = {
             inject: true,
             on: {
                 change(inject, value) {
-                    inject.self.value = value;
-                    inject.api.emit('value-change', inject.api.bind());
+                    const rule = inject.self;
+                    inject.api.form[rule.field] = value;
                 },
             },
             validate: [
@@ -20961,8 +20963,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           "model-value": __props.value,
           option: unref(option),
           rule: rule.value,
-          "onUpdate:modelValue": handleValue,
-          onValueChange: handleValue
+          "onUpdate:modelValue": handleValue
         }, null, 8, ["api", "model-value", "option", "rule"])
       ], 64);
     };

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, nextTick, Fragment, isRef, renderList, renderSlot, 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, 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';
@@ -3229,6 +3229,9 @@ var shop = {
     name: name$1,
     label: label$1,
     rule() {
+        console.log('---------------');
+        console.log(`第${i + 1}次添加店铺控件`);
+        console.log('---------------');
         return {
             type: 'Select',
             field: uniqueId(),
@@ -3316,8 +3319,8 @@ var shop = {
         };
     },
 };
-function resetIndex() {
-    i = 0;
+function setShopIndex(index) {
+    i = index;
 }
 
 const label = '素材类型';
@@ -4125,7 +4128,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function edit(formRules) {
       widgetFormRules.splice(0);
       formRules.forEach((item) => {
-        widgetFormRules.push(recursiveMakeRule(item));
+        widgetFormRules.push(recursiveMakeRule(cloneDeep(item)));
       });
     }
     function recursiveMakeRule(item) {
@@ -4290,12 +4293,31 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function productLinkShop(rule) {
       return rule.config.config.name === "product" && rule.config.dataFiltering;
     }
+    function getShopIndex(formRules, initIndex) {
+      function shopIndex(rule, initIndex2) {
+        if (rule.name === "shop") {
+          initIndex2 = Math.max(initIndex2, rule.title.title.replace("\u5E97\u94FA", ""));
+        }
+        if (rule.config?.childRules?.length) {
+          rule.config.childRules.forEach((cRule) => {
+            initIndex2 = shopIndex(cRule, initIndex2);
+          });
+        }
+        return initIndex2;
+      }
+      formRules.forEach((rule) => {
+        initIndex = shopIndex(rule, initIndex);
+      });
+      return initIndex;
+    }
     watch(
       () => props.formRules,
       (formRules) => {
         if (formRules?.length) {
+          setShopIndex(0);
           edit(formRules);
           setShopLinkProductCount();
+          setShopIndex(getShopIndex(formRules, 0));
         }
       },
       {
@@ -4311,9 +4333,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         deep: true
       }
     );
-    onBeforeUnmount(() => {
-      resetIndex();
-    });
     expose({
       getFormRule,
       getRule,

package/es/components/search-filter/index.d.ts

@@ -217,9 +217,9 @@ declare const BmSearchFilter: import("bm-admin-ui/es/utils/with-install").SFCWit
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
     onExpand?: ((...args: any[]) => any) | undefined;
 }, {
+    loading: boolean;
     labelCol: Record<string, any>;
     value: Record<string, any>;
-    loading: boolean;
     showExpandBtn: boolean;
     showSearchIcon: boolean;
     expandPlacement: "left" | "right";

package/es/components/search-filter/src/search-filter.vue.d.ts

@@ -217,9 +217,9 @@ declare const _default: import("vue").DefineComponent<{
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
     onExpand?: ((...args: any[]) => any) | undefined;
 }, {
+    loading: boolean;
     labelCol: Record<string, any>;
     value: Record<string, any>;
-    loading: boolean;
     showExpandBtn: boolean;
     showSearchIcon: boolean;
     expandPlacement: "left" | "right";

package/es/components/select-all/index.d.ts

@@ -210,7 +210,7 @@ declare const BmSelectAll: import("bm-admin-ui/es/utils/with-install").SFCWithIn
                     type: BooleanConstructor;
                     default: any;
                 };
-            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "bordered" | "choiceTransitionName" | "open" | "disabled" | "virtual" | "dropdownMatchSelectWidth" | "autofocus" | "loading" | "showSearch" | "defaultOpen" | "allowClear" | "showArrow" | "autoClearSearchValue" | "filterOption" | "defaultActiveFirstOption" | "labelInValue">;
+            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "loading" | "disabled" | "bordered" | "choiceTransitionName" | "open" | "virtual" | "dropdownMatchSelectWidth" | "autofocus" | "showSearch" | "defaultOpen" | "allowClear" | "showArrow" | "autoClearSearchValue" | "filterOption" | "defaultActiveFirstOption" | "labelInValue">;
             $attrs: {
                 [x: string]: unknown;
             };

package/es/components/select-all/src/selectAll.vue.d.ts

@@ -210,7 +210,7 @@ declare const _default: import("vue").DefineComponent<{
                     type: BooleanConstructor;
                     default: any;
                 };
-            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "bordered" | "choiceTransitionName" | "open" | "disabled" | "virtual" | "dropdownMatchSelectWidth" | "autofocus" | "loading" | "showSearch" | "defaultOpen" | "allowClear" | "showArrow" | "autoClearSearchValue" | "filterOption" | "defaultActiveFirstOption" | "labelInValue">;
+            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "loading" | "disabled" | "bordered" | "choiceTransitionName" | "open" | "virtual" | "dropdownMatchSelectWidth" | "autofocus" | "showSearch" | "defaultOpen" | "allowClear" | "showArrow" | "autoClearSearchValue" | "filterOption" | "defaultActiveFirstOption" | "labelInValue">;
             $attrs: {
                 [x: string]: unknown;
             };

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

@@ -1127,9 +1127,9 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
     "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
     "onUpdate:select"?: ((...args: any[]) => any) | undefined;
 }, {
+    title: string;
     mode: string;
     showCount: boolean;
-    title: string;
     visible: boolean;
     unitStr: string;
     limit: number;

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

@@ -1127,9 +1127,9 @@ declare const _default: import("vue").DefineComponent<{
     "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
     "onUpdate:select"?: ((...args: any[]) => any) | undefined;
 }, {
+    title: string;
     mode: string;
     showCount: boolean;
-    title: string;
     visible: boolean;
     unitStr: string;
     limit: number;

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

@@ -78,7 +78,7 @@ declare const BmButton: import("bm-admin-ui/es/utils/with-install").SFCWithInsta
                 onMousedown: {
                     type: import("vue").PropType<(event: MouseEvent) => void>;
                 };
-            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "disabled" | "loading" | "htmlType" | "ghost" | "block" | "danger">;
+            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "htmlType" | "loading" | "disabled" | "ghost" | "block" | "danger">;
             $attrs: {
                 [x: string]: unknown;
             };

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

@@ -80,7 +80,7 @@ declare const _default: import("vue").DefineComponent<{
                 onMousedown: {
                     type: import("vue").PropType<(event: MouseEvent) => void>;
                 };
-            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "disabled" | "loading" | "htmlType" | "ghost" | "block" | "danger">;
+            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "htmlType" | "loading" | "disabled" | "ghost" | "block" | "danger">;
             $attrs: {
                 [x: string]: unknown;
             };

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

@@ -294,8 +294,8 @@ declare const BmEditor: import("bm-admin-ui/es/utils/with-install").SFCWithInsta
     onReady?: ((...args: any[]) => any) | undefined;
     onGetCount?: ((...args: any[]) => any) | undefined;
 }, {
-    value: string;
     disabled: boolean;
+    value: string;
     options: {
         [key: string]: any;
     };

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

@@ -294,8 +294,8 @@ declare const _default: import("vue").DefineComponent<{
     onReady?: ((...args: any[]) => any) | undefined;
     onGetCount?: ((...args: any[]) => any) | undefined;
 }, {
-    value: string;
     disabled: boolean;
+    value: string;
     options: {
         [key: string]: any;
     };