bm-admin-ui 1.0.63-alpha → 1.0.65-alpha

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

@@ -2078,6 +2078,9 @@ var table = {
                             api.validate();
                         });
                     },
+                    childRuleDelete({ api }, rule) {
+                        api.emit('tableChildRuleDelete', rule);
+                    },
                 },
             },
             {
@@ -2983,7 +2986,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     const shopRules = computed(
       () => props.widgetFormRules.reduce((pre, cur) => {
         const name = cur.config.config.name;
-        if (name === "row" || name === "table") {
+        if (name === "row") {
           cur.config.childRules.forEach((rule) => {
             getShop(rule, pre);
           });
@@ -3521,6 +3524,10 @@ const formDesignerProps = {
             return {};
         },
     },
+    showDragTip: {
+        type: Boolean,
+        default: false,
+    },
 };
 
 const _hoisted_1$3 = {
@@ -3648,7 +3655,7 @@ const _hoisted_2$1 = { class: "bm-table-column-btn-wrap" };
 const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   __name: "table-column",
   props: ["formCreateInject"],
-  emits: ["change"],
+  emits: ["change", "childRuleDelete"],
   setup(__props, { emit: emits }) {
     const props = __props;
     const handleClass = "bm-table-column__drag-icon";
@@ -3674,6 +3681,10 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     function getPopupContainer() {
       return document.body;
     }
+    function handleDelete(element, index) {
+      childRules.value.splice(index, 1);
+      emits("childRuleDelete", element);
+    }
     watch(
       childRules,
       (val) => {
@@ -3714,7 +3725,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                 }, null, 8, ["onClick"]),
                 createVNode(_component_Delete, {
                   class: "bm-table-column__icon is-del",
-                  onClick: ($event) => unref(childRules).splice(index, 1)
+                  onClick: ($event) => handleDelete(element, index)
                 }, null, 8, ["onClick"])
               ]),
               _: 2
@@ -3814,7 +3825,8 @@ const __default__ = {
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...__default__,
   props: formDesignerProps,
-  setup(__props, { expose }) {
+  emits: ["update:showDragTip"],
+  setup(__props, { expose, emit: emits }) {
     const props = __props;
     FC.component("TableHeadCount", TableHeadCount);
     FC.component("TableColumn", TableColumn);
@@ -3845,7 +3857,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       people: "\u9664\u201C\u5FC5\u586B\u3001\u9009\u9879\u201D\u5185\u5BB9\u8BBE\u7F6E\u4E0D\u53EF\u4FEE\u6539\uFF0C\u5176\u4ED6\u4FE1\u606F\u53EF\u4FEE\u6539",
       department: "\u9664\u201C\u5FC5\u586B\u3001\u9009\u9879\u201D\u5185\u5BB9\u8BBE\u7F6E\u4E0D\u53EF\u4FEE\u6539\uFF0C\u5176\u4ED6\u4FE1\u606F\u53EF\u4FEE\u6539"
     };
-    const showDragTip = ref(true);
     const tabData = createTab();
     const activeKey = ref("controlLibrary");
     const widgetFormRules = reactive([]);
@@ -3861,7 +3872,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       () => activeParentRule.value?.config?.childRules || widgetFormRules
     );
     function hideShowDragTip() {
-      showDragTip.value = false;
+      emits("update:showDragTip", false);
     }
     function handleTabChange(key) {
       activeKey.value = key;
@@ -4011,6 +4022,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           resetActiveRule();
         }
       }
+      if (productLinkShop(targetRule)) {
+        setShopLinkProductCount();
+      }
     }
     function makePropRule(rule, parentRule) {
       return rule.config.config.props(rule, parentRule, widgetFormRules);
@@ -4022,10 +4036,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         cacheProps[rule.field] = makePropRule(rule, parentRule);
       }
       flowConditionEffect(props.flowCondition);
+      setMainShopPropDisabled(rule.field);
     }
     function propChange(field, value) {
       setRulePropValue(field, value, activeRule.value);
       processShopProps(field, value);
+      if (activeRule.value.config.config.name === "product" && field === "config.dataFiltering") {
+        setShopLinkProductCount();
+      }
     }
     function processShopProps(field, value) {
       if (activeRule.value?.config?.config.name === "shop") {
@@ -4219,10 +4237,65 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function getPopupContainer() {
       return document.body;
     }
+    function getMainShop() {
+      return widgetFormRules.find(
+        (rule) => rule?.config?.config?.name === "shop" && rule?.config?.isMain
+      );
+    }
+    function setMainShopPropDisabled(field) {
+      const propsRules = cacheProps[field];
+      const mainShopPropRule = propsRules.find(
+        (rule) => rule.field === "config.isMain"
+      );
+      const mainShopRule = getMainShop();
+      if (mainShopPropRule) {
+        if (!mainShopPropRule.props) {
+          mainShopPropRule.props = {};
+        }
+        mainShopPropRule.props.disabled = !!mainShopRule && !mainShopPropRule.value;
+      }
+    }
+    function setShopLinkProductCount() {
+      widgetFormRules.forEach((rule) => filterShopRule(rule));
+    }
+    function filterShopRule(rule) {
+      if (rule.config.config.name === "shop") {
+        rule.config.linkProductCount = calculateLinkProductCount(rule.field);
+      }
+      if (rule.config.config.name === "row" && rule.config.childRules?.length) {
+        rule.config.childRules.forEach((cRule) => filterShopRule(cRule));
+      }
+    }
+    function calculateLinkProductCount(shopField) {
+      return widgetFormRules.reduce((count, rule) => {
+        return count += recursiveCalculateLinkProductCount(shopField, rule);
+      }, 0);
+    }
+    function recursiveCalculateLinkProductCount(shopField, rule, count = 0) {
+      if (rule.config.config.name === "product" && rule.config.dataFiltering === shopField) {
+        count++;
+      }
+      if (rule.config.childRules?.length) {
+        rule.config.childRules.forEach(
+          (cRule) => recursiveCalculateLinkProductCount(shopField, cRule, count)
+        );
+      }
+      return count;
+    }
+    function handleTableChildRuleDelete(rule) {
+      if (productLinkShop(rule))
+        setShopLinkProductCount();
+    }
+    function productLinkShop(rule) {
+      return rule.config.config.name === "product" && rule.config.dataFiltering;
+    }
     watch(
       () => props.formRules,
       (formRules) => {
-        formRules && edit(formRules);
+        if (formRules?.length) {
+          edit(formRules);
+          setShopLinkProductCount();
+        }
       },
       {
         immediate: true
@@ -4351,7 +4424,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   ]),
                   _: 1
                 }, 8, ["list"]),
-                showDragTip.value && !_ctx.formRules?.length ? (openBlock(), createBlock(NoDataTip, {
+                _ctx.showDragTip ? (openBlock(), createBlock(NoDataTip, {
                   key: 0,
                   class: "bm-no-data-tip"
                 })) : createCommentVNode("v-if", true)
@@ -4405,7 +4478,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   rule: unref(activeProps),
                   onChange: propChange,
                   onSetActive: handlePropsSetActive,
-                  onAddChildRule: handleAddChildRule
+                  onAddChildRule: handleAddChildRule,
+                  onTableChildRuleDelete: handleTableChildRuleDelete
                 }, null, 8, ["api", "option", "rule"])
               ])
             ]),

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

@@ -917,7 +917,6 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
         }> | null | undefined)[]>;
         isFulfill: import("vue").Ref<boolean>;
         changeTreeCheck: (checkedKeys: any) => void;
-        departmentSelect: import("vue").Ref<never[]>;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:selected" | "fetchList")[], "update:selected" | "fetchList", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         limit: {
             type: NumberConstructor;

package/es/components/staffs-selector/index.js

@@ -156,16 +156,14 @@ const _sfc_main$3 = defineComponent({
       },
       { deep: true }
     );
-    const departmentSelect = ref([]);
     function changeTreeCheck(checkedKeys) {
-      departmentSelect.value = checkedKeys;
       let flatMap = selectState.dataMap;
       let curlistKeys = selectState.curlistKeys;
       let hadselected = new Set(selectState.multipDepartment);
       let curselect = new Set(checkedKeys);
       for (let key of hadselected) {
         if (curlistKeys.has(String(key)) && (!curselect.has(String(key)) || curselect.has(String(key)) && curselect.has(flatMap.get(String(key))["parent"]))) {
-          hadselected.delete(key);
+          hadselected.delete(String(key));
         }
       }
       for (let key of curselect) {
@@ -183,7 +181,6 @@ const _sfc_main$3 = defineComponent({
     }
     return {
       changeTreeCheck,
-      departmentSelect,
       ...toRefs(state),
       ...toRefs(selectState),
       list,
@@ -256,7 +253,7 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
                   disabled: _ctx.isFulfill
                 }, {
                   default: withCtx(() => [
-                    createTextVNode(toDisplayString(item.title), 1)
+                    createTextVNode(toDisplayString(item?.fullTitle || item.title), 1)
                   ]),
                   _: 2
                 }, 1032, ["checked", "onUpdate:checked", "disabled"])
@@ -264,7 +261,7 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
             }), 128))
           ], 64)) : _ctx.isTree ? (openBlock(), createBlock(_component_ATree, {
             key: 1,
-            "checked-keys": _ctx.departmentSelect,
+            "checked-keys": _ctx.multipDepartment,
             checkable: "",
             "tree-data": _ctx.list,
             onCheck: _ctx.changeTreeCheck
@@ -368,7 +365,7 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
                 value: item.key
               }, {
                 default: withCtx(() => [
-                  createTextVNode(toDisplayString(item.title), 1)
+                  createTextVNode(toDisplayString(item.fullTitle || item.title), 1)
                 ]),
                 _: 2
               }, 1032, ["value"]);
@@ -564,7 +561,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   class: "__selector-modal-option-check"
                 }, {
                   default: withCtx(() => [
-                    createTextVNode(toDisplayString(item.title), 1)
+                    createTextVNode(toDisplayString(item.fullTitle || item.title), 1)
                   ]),
                   _: 2
                 }, 1032, ["checked", "onUpdate:checked"])
@@ -603,7 +600,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   class: "__selector-modal-option-check"
                 }, {
                   default: withCtx(() => [
-                    createTextVNode(toDisplayString(item.title), 1)
+                    createTextVNode(toDisplayString(item.fullTitle || item.title), 1)
                   ]),
                   _: 2
                 }, 1032, ["checked", "onUpdate:checked"])
@@ -621,7 +618,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   class: "__selector-modal-option-check"
                 }, {
                   default: withCtx(() => [
-                    createTextVNode(toDisplayString(item.title), 1)
+                    createTextVNode(toDisplayString(item.fullTitle || item.title), 1)
                   ]),
                   _: 2
                 }, 1032, ["checked", "onUpdate:checked"])
@@ -861,11 +858,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             let arr = props.select;
             selected.value = arr.length ? arr.map((item) => String(item?.key)) : [];
             if (props.mode === MODE.MULTIPLE) {
-              let multipleChecked = {};
-              arr.forEach(
-                (item) => multipleChecked[String(item?.key)] = true
-              );
-              selectState.multipleChecked = multipleChecked;
+              if (props.immediateFetch) {
+                const multipDepartment = [];
+                arr.forEach((item) => multipDepartment.push(String(item?.key)));
+                selectState.multipDepartment = multipDepartment;
+              } else {
+                let multipleChecked = {};
+                arr.forEach(
+                  (item) => multipleChecked[String(item?.key)] = true
+                );
+                selectState.multipleChecked = multipleChecked;
+              }
             } else if (props.mode === MODE.VARIED) {
               let department = [];
               let shop = {};
@@ -896,7 +899,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           selectState.groupChecked = {};
           selectState.activeKey = 0;
         }
-        if (val && props.immediateFetch) {
+        if (val && props.mode === MODE.MULTIPLE && props.immediateFetch) {
           fetch({});
         }
       },

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

@@ -35,7 +35,6 @@ declare const _default: import("vue").DefineComponent<{
     }> | null | undefined)[]>;
     isFulfill: import("vue").Ref<boolean>;
     changeTreeCheck: (checkedKeys: any) => void;
-    departmentSelect: import("vue").Ref<never[]>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:selected" | "fetchList")[], "update:selected" | "fetchList", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     limit: {
         type: NumberConstructor;

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

@@ -917,7 +917,6 @@ declare const _default: import("vue").DefineComponent<{
         }> | null | undefined)[]>;
         isFulfill: import("vue").Ref<boolean>;
         changeTreeCheck: (checkedKeys: any) => void;
-        departmentSelect: import("vue").Ref<never[]>;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:selected" | "fetchList")[], "update:selected" | "fetchList", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         limit: {
             type: NumberConstructor;

package/lib/components/flow-designer/index.d.ts

@@ -1,7 +1,48 @@
-declare const BmFlowDesigner: import("bm-admin-ui/es/utils/with-install").SFCWithInstall<import("vue").DefineComponent<{}, {
-    container: import("vue").Ref<any>;
+declare const BmFlowDesigner: import("bm-admin-ui/es/utils/with-install").SFCWithInstall<import("vue").DefineComponent<{
+    lineLength: {
+        type: NumberConstructor;
+        default: number;
+    };
+}, {
+    props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
+        lineLength: {
+            type: NumberConstructor;
+            default: number;
+        };
+    }>> & {
+        onNodeCallback?: ((...args: any[]) => any) | undefined;
+        onLoadFinish?: ((...args: any[]) => any) | undefined;
+    }>>;
+    emit: (event: "nodeCallback" | "loadFinish", ...args: any[]) => void;
+    container: import("vue").Ref<null>;
     lf: any;
-    init: () => void;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
+    graphModel: any;
+    eventCenter: any;
+    getFlowRawData: () => {
+        json: any;
+        xml: any;
+    };
+    loadFlowData: (json: any) => void;
+    state: {
+        startId: string;
+        endId: string;
+    };
+    flowMethods: any;
+    initFlowInstance: () => void;
+    initFlowEvent: () => void;
+    focusOnZoom: (y?: any) => void;
+    initFlowNodes: () => void;
+    changePriority: (id: any, priority: any) => void;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("nodeCallback" | "loadFinish")[], "nodeCallback" | "loadFinish", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    lineLength: {
+        type: NumberConstructor;
+        default: number;
+    };
+}>> & {
+    onNodeCallback?: ((...args: any[]) => any) | undefined;
+    onLoadFinish?: ((...args: any[]) => any) | undefined;
+}, {
+    lineLength: number;
+}>>;
 export { BmFlowDesigner };
 export default BmFlowDesigner;