bm-admin-ui 1.1.0-alpha → 1.1.2-alpha

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

@@ -196,18 +196,15 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
 }
 var BmHtmlNode = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render], ["__file", "BmHtmlNode.vue"]]);
 
-const _hoisted_1 = { class: "bm-condition-node" };
+const _hoisted_1 = ["onClick"];
 const _hoisted_2 = { class: "bm-condition-node-box" };
 const _hoisted_3 = { class: "condition-header" };
 const _hoisted_4 = { key: 0 };
 const _hoisted_5 = { class: "condition-desc" };
 const _hoisted_6 = { class: "desc" };
 const _hoisted_7 = { key: 0 };
-const __default__ = {
-  name: "BmConditionNode"
-};
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
-  ...__default__,
+  __name: "BmConditionNode",
   props: {
     isCustom: {
       type: Boolean,
@@ -225,6 +222,12 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       type: String,
       default: " "
     },
+    nodeClick: {
+      type: Function,
+      default: () => {
+        console.info("\u70B9\u51FB\u8282\u70B9\u56DE\u8C03");
+      }
+    },
     copyCallback: {
       type: Function,
       default: () => {
@@ -239,8 +242,17 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     }
   },
   setup(__props) {
+    const props = __props;
+    function callback() {
+      if (props.isCustom) {
+        props.nodeClick();
+      }
+    }
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1, [
+      return openBlock(), createElementBlock("div", {
+        class: "bm-condition-node",
+        onClick: withModifiers(callback, ["stop"])
+      }, [
         createElementVNode("div", _hoisted_2, [
           createElementVNode("div", _hoisted_3, [
             createElementVNode("span", {
@@ -259,9 +271,12 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
             }, [
               createCommentVNode(' <CopyOutlined\r\n            @click.stop="\r\n              () => {\r\n                copyCallback()\r\n              }\r\n            " />&nbsp;\u6682\u65F6\u5173\u95ED\u590D\u5236\u8282\u70B9 '),
               createVNode(unref(CloseOutlined), {
-                onClick: _cache[0] || (_cache[0] = () => {
-                  __props.deleteCallback();
-                })
+                onClick: _cache[0] || (_cache[0] = withModifiers(
+                  () => {
+                    __props.deleteCallback();
+                  },
+                  ["stop"]
+                ))
               })
             ], 2)
           ]),
@@ -272,7 +287,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
             ])) : createCommentVNode("v-if", true)
           ])
         ])
-      ]);
+      ], 8, _hoisted_1);
     };
   }
 });

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

@@ -15,6 +15,10 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    nodeClick: {
+        type: FunctionConstructor;
+        default: () => void;
+    };
     copyCallback: {
         type: FunctionConstructor;
         default: () => void;
@@ -41,6 +45,10 @@ declare const _default: import("vue").DefineComponent<{
             type: StringConstructor;
             default: string;
         };
+        nodeClick: {
+            type: FunctionConstructor;
+            default: () => void;
+        };
         copyCallback: {
             type: FunctionConstructor;
             default: () => void;
@@ -50,6 +58,7 @@ declare const _default: import("vue").DefineComponent<{
             default: () => void;
         };
     }>> & {}>>;
+    callback: () => void;
     readonly CloseOutlined: import("@ant-design/icons-vue/lib/icons/CloseOutlined").CloseOutlinedIconType;
     readonly RightOutlined: import("@ant-design/icons-vue/lib/icons/RightOutlined").RightOutlinedIconType;
     readonly Tag: {
@@ -227,6 +236,10 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    nodeClick: {
+        type: FunctionConstructor;
+        default: () => void;
+    };
     copyCallback: {
         type: FunctionConstructor;
         default: () => void;
@@ -240,6 +253,7 @@ declare const _default: import("vue").DefineComponent<{
     desc: string;
     isCustom: boolean;
     priority: number;
+    nodeClick: Function;
     copyCallback: Function;
     deleteCallback: Function;
 }>;

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

@@ -5,7 +5,7 @@ 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';
 import { HolderOutlined, EditOutlined, PlusOutlined, QuestionCircleOutlined, InfoCircleFilled, ExclamationCircleFilled } from '@ant-design/icons-vue';
 import { BmUpload } from 'bm-admin-ui/es/components';
-import { cloneDeep } from 'lodash-es';
+import { isObject, cloneDeep } from 'lodash-es';
 import FC from '@form-create/ant-design-vue';
 
 var WidgetType;
@@ -3564,6 +3564,10 @@ const formDesignerProps = {
         type: Function,
         default: (targetRule, parentRule) => true,
     },
+    resetCmpRatio: {
+        type: Function,
+        default: (ruleName, parentRuleName) => 0,
+    },
 };
 
 const _hoisted_1$3 = {
@@ -3634,6 +3638,18 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
 });
 var CheckboxSwitch = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__file", "checkbox-switch.vue"]]);
 
+function checkRuleConfigObj(obj) {
+    if (!isObject(obj))
+        return false;
+    const parses = ['icon', 'label', 'name', 'parse', 'props', 'rule'];
+    for (const parse of parses) {
+        if (!obj[parse]) {
+            console.error(`控件配置对象缺少【${parse}】字段,请补充完整`);
+            return false;
+        }
+    }
+    return true;
+}
 const widgetsTableAccept = {
     [input.name]: input,
     [textarea.name]: textarea,
@@ -3665,8 +3681,20 @@ const widgetNamesRowAccept = [
     shop.name,
     materialType.name,
 ];
+const tableWidgetsProxy = new Proxy(widgetsTableAccept, {
+    get(target, prop) {
+        return target[String(prop)];
+    },
+    set(target, prop, value) {
+        if (!checkRuleConfigObj(value)) {
+            return false;
+        }
+        target[String(prop)] = value;
+        return true;
+    },
+});
 function pushTableWidgets(key, config) {
-    widgetsTableAccept[key] = config;
+    tableWidgetsProxy[key] = config;
 }
 function pushRowWidgets(key) {
     widgetNamesRowAccept.push(key);
@@ -3691,8 +3719,20 @@ const rules = {
     [shop.name]: shop,
     [materialType.name]: materialType,
 };
+const rulesProxy = new Proxy(rules, {
+    get(target, prop) {
+        return target[String(prop)];
+    },
+    set(target, prop, value) {
+        if (!checkRuleConfigObj(value)) {
+            return false;
+        }
+        target[String(prop)] = value;
+        return true;
+    },
+});
 function pushRuleWidgets(key, config) {
-    rules[key] = config;
+    rulesProxy[key] = config;
 }
 
 const _hoisted_1$1 = {
@@ -4173,10 +4213,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!parentRuleType) {
         rule.config.fieldRatio = "100%";
       } else if (parentRuleType === WidgetType.RowWidget) {
-        const ruleName = rule.config.config.name;
-        rule.config.fieldRatio = ruleName === "table" || ruleName === "product" ? 24 : 12;
+        const customRadio = props.resetCmpRatio(
+          rule.config.config.name,
+          parentRuleType
+        );
+        if (customRadio) {
+          rule.config.fieldRatio = customRadio;
+          return;
+        }
+        rule.config.fieldRatio = ["table", "product"].includes(
+          rule.config.config.name
+        ) ? 24 : 12;
       } else if (parentRuleType === WidgetType.TableWidget) {
-        rule.config.fieldRatio = "140px";
+        const customRadio = props.resetCmpRatio(
+          rule.config.config.name,
+          parentRuleType
+        );
+        rule.config.fieldRatio = customRadio || "140px";
       }
     }
     function getFormRule() {

package/es/components/search-filter/index.js

@@ -211,6 +211,14 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       () => props.modelValue,
       (val) => {
         selectValue.value = val;
+        if (!selectValue.value || selectValue.value.length <= 0) {
+          state.search = {
+            indeterminate: false,
+            checkedAll: false,
+            checkedReverse: false,
+            searchList: []
+          };
+        }
       },
       {
         immediate: true
@@ -221,9 +229,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       if (instance?.attrs.fieldNames || instance?.attrs["field-names"])
         key = (instance?.attrs).fieldNames?.value || (instance?.attrs)["field-names"].value;
       let value = checkAll(selectValue.value, key);
-      state.search.checkedReverse = false;
       state.search.indeterminate = !!value.length && value.length < (instance?.attrs.options).length;
       state.search.checkedAll = value.length === (instance?.attrs.options).length;
+      state.search.checkedReverse = false;
       selectValue.value = value.map((v) => {
         return v[key];
       }) || [];
@@ -246,7 +254,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
           (ele) => select.indexOf(ele[key]) <= -1
         ) : search = state.search.searchList;
       } else {
-        search = instance?.attrs.options;
+        state.search.checkedAll ? search = [] : search = instance?.attrs.options;
       }
       list = [...list, ...search];
       return list;
@@ -280,6 +288,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       state.search.checkedReverse = false;
       state.search.indeterminate = !!value.length && value.length < (instance?.attrs.options).length;
       state.search.checkedAll = value.length === (instance?.attrs.options).length;
+      state.search.searchList = [];
       emit("update:modelValue", value);
       emit("onChange", {
         value,

package/es/components/select-all/index.js

@@ -90,7 +90,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           (ele) => select.indexOf(ele[key]) <= -1
         ) : search = state.search.searchList;
       } else {
-        search = instance?.attrs.options;
+        state.search.checkedAll ? search = [] : search = instance?.attrs.options;
       }
       list = [...list, ...search];
       return list;
@@ -124,6 +124,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       state.search.checkedReverse = false;
       state.search.indeterminate = !!value.length && value.length < (instance?.attrs.options).length;
       state.search.checkedAll = value.length === (instance?.attrs.options).length;
+      state.search.searchList = [];
       emit("update:value", value);
       emit("onChange", {
         value,

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

@@ -207,18 +207,15 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
 }
 var BmHtmlNode = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc_render], ["__file", "BmHtmlNode.vue"]]);
 
-const _hoisted_1 = { class: "bm-condition-node" };
+const _hoisted_1 = ["onClick"];
 const _hoisted_2 = { class: "bm-condition-node-box" };
 const _hoisted_3 = { class: "condition-header" };
 const _hoisted_4 = { key: 0 };
 const _hoisted_5 = { class: "condition-desc" };
 const _hoisted_6 = { class: "desc" };
 const _hoisted_7 = { key: 0 };
-const __default__ = {
-  name: "BmConditionNode"
-};
 const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
-  ...__default__,
+  __name: "BmConditionNode",
   props: {
     isCustom: {
       type: Boolean,
@@ -236,6 +233,12 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
       type: String,
       default: " "
     },
+    nodeClick: {
+      type: Function,
+      default: () => {
+        console.info("\u70B9\u51FB\u8282\u70B9\u56DE\u8C03");
+      }
+    },
     copyCallback: {
       type: Function,
       default: () => {
@@ -250,8 +253,17 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
     }
   },
   setup(__props) {
+    const props = __props;
+    function callback() {
+      if (props.isCustom) {
+        props.nodeClick();
+      }
+    }
     return (_ctx, _cache) => {
-      return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
+      return vue.openBlock(), vue.createElementBlock("div", {
+        class: "bm-condition-node",
+        onClick: vue.withModifiers(callback, ["stop"])
+      }, [
         vue.createElementVNode("div", _hoisted_2, [
           vue.createElementVNode("div", _hoisted_3, [
             vue.createElementVNode("span", {
@@ -270,9 +282,12 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
             }, [
               vue.createCommentVNode(' <CopyOutlined\r\n            @click.stop="\r\n              () => {\r\n                copyCallback()\r\n              }\r\n            " />&nbsp;\u6682\u65F6\u5173\u95ED\u590D\u5236\u8282\u70B9 '),
               vue.createVNode(vue.unref(iconsVue.CloseOutlined), {
-                onClick: _cache[0] || (_cache[0] = () => {
-                  __props.deleteCallback();
-                })
+                onClick: _cache[0] || (_cache[0] = vue.withModifiers(
+                  () => {
+                    __props.deleteCallback();
+                  },
+                  ["stop"]
+                ))
               })
             ], 2)
           ]),
@@ -283,7 +298,7 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
             ])) : vue.createCommentVNode("v-if", true)
           ])
         ])
-      ]);
+      ], 8, _hoisted_1);
     };
   }
 });

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

@@ -15,6 +15,10 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    nodeClick: {
+        type: FunctionConstructor;
+        default: () => void;
+    };
     copyCallback: {
         type: FunctionConstructor;
         default: () => void;
@@ -41,6 +45,10 @@ declare const _default: import("vue").DefineComponent<{
             type: StringConstructor;
             default: string;
         };
+        nodeClick: {
+            type: FunctionConstructor;
+            default: () => void;
+        };
         copyCallback: {
             type: FunctionConstructor;
             default: () => void;
@@ -50,6 +58,7 @@ declare const _default: import("vue").DefineComponent<{
             default: () => void;
         };
     }>> & {}>>;
+    callback: () => void;
     readonly CloseOutlined: import("@ant-design/icons-vue/lib/icons/CloseOutlined").CloseOutlinedIconType;
     readonly RightOutlined: import("@ant-design/icons-vue/lib/icons/RightOutlined").RightOutlinedIconType;
     readonly Tag: {
@@ -227,6 +236,10 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    nodeClick: {
+        type: FunctionConstructor;
+        default: () => void;
+    };
     copyCallback: {
         type: FunctionConstructor;
         default: () => void;
@@ -240,6 +253,7 @@ declare const _default: import("vue").DefineComponent<{
     desc: string;
     isCustom: boolean;
     priority: number;
+    nodeClick: Function;
     copyCallback: Function;
     deleteCallback: Function;
 }>;

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

@@ -3574,6 +3574,10 @@ const formDesignerProps = {
         type: Function,
         default: (targetRule, parentRule) => true,
     },
+    resetCmpRatio: {
+        type: Function,
+        default: (ruleName, parentRuleName) => 0,
+    },
 };
 
 const _hoisted_1$3 = {
@@ -3644,6 +3648,18 @@ const _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({
 });
 var CheckboxSwitch = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__file", "checkbox-switch.vue"]]);
 
+function checkRuleConfigObj(obj) {
+    if (!lodashEs.isObject(obj))
+        return false;
+    const parses = ['icon', 'label', 'name', 'parse', 'props', 'rule'];
+    for (const parse of parses) {
+        if (!obj[parse]) {
+            console.error(`控件配置对象缺少【${parse}】字段,请补充完整`);
+            return false;
+        }
+    }
+    return true;
+}
 const widgetsTableAccept = {
     [input.name]: input,
     [textarea.name]: textarea,
@@ -3675,8 +3691,20 @@ const widgetNamesRowAccept = [
     shop.name,
     materialType.name,
 ];
+const tableWidgetsProxy = new Proxy(widgetsTableAccept, {
+    get(target, prop) {
+        return target[String(prop)];
+    },
+    set(target, prop, value) {
+        if (!checkRuleConfigObj(value)) {
+            return false;
+        }
+        target[String(prop)] = value;
+        return true;
+    },
+});
 function pushTableWidgets(key, config) {
-    widgetsTableAccept[key] = config;
+    tableWidgetsProxy[key] = config;
 }
 function pushRowWidgets(key) {
     widgetNamesRowAccept.push(key);
@@ -3701,8 +3729,20 @@ const rules = {
     [shop.name]: shop,
     [materialType.name]: materialType,
 };
+const rulesProxy = new Proxy(rules, {
+    get(target, prop) {
+        return target[String(prop)];
+    },
+    set(target, prop, value) {
+        if (!checkRuleConfigObj(value)) {
+            return false;
+        }
+        target[String(prop)] = value;
+        return true;
+    },
+});
 function pushRuleWidgets(key, config) {
-    rules[key] = config;
+    rulesProxy[key] = config;
 }
 
 const _hoisted_1$1 = {
@@ -4183,10 +4223,23 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       if (!parentRuleType) {
         rule.config.fieldRatio = "100%";
       } else if (parentRuleType === WidgetType.RowWidget) {
-        const ruleName = rule.config.config.name;
-        rule.config.fieldRatio = ruleName === "table" || ruleName === "product" ? 24 : 12;
+        const customRadio = props.resetCmpRatio(
+          rule.config.config.name,
+          parentRuleType
+        );
+        if (customRadio) {
+          rule.config.fieldRatio = customRadio;
+          return;
+        }
+        rule.config.fieldRatio = ["table", "product"].includes(
+          rule.config.config.name
+        ) ? 24 : 12;
       } else if (parentRuleType === WidgetType.TableWidget) {
-        rule.config.fieldRatio = "140px";
+        const customRadio = props.resetCmpRatio(
+          rule.config.config.name,
+          parentRuleType
+        );
+        rule.config.fieldRatio = customRadio || "140px";
       }
     }
     function getFormRule() {

package/lib/components/search-filter/index.js

@@ -221,6 +221,14 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
       () => props.modelValue,
       (val) => {
         selectValue.value = val;
+        if (!selectValue.value || selectValue.value.length <= 0) {
+          state.search = {
+            indeterminate: false,
+            checkedAll: false,
+            checkedReverse: false,
+            searchList: []
+          };
+        }
       },
       {
         immediate: true
@@ -231,9 +239,9 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
       if (instance?.attrs.fieldNames || instance?.attrs["field-names"])
         key = (instance?.attrs).fieldNames?.value || (instance?.attrs)["field-names"].value;
       let value = checkAll(selectValue.value, key);
-      state.search.checkedReverse = false;
       state.search.indeterminate = !!value.length && value.length < (instance?.attrs.options).length;
       state.search.checkedAll = value.length === (instance?.attrs.options).length;
+      state.search.checkedReverse = false;
       selectValue.value = value.map((v) => {
         return v[key];
       }) || [];
@@ -256,7 +264,7 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
           (ele) => select.indexOf(ele[key]) <= -1
         ) : search = state.search.searchList;
       } else {
-        search = instance?.attrs.options;
+        state.search.checkedAll ? search = [] : search = instance?.attrs.options;
       }
       list = [...list, ...search];
       return list;
@@ -290,6 +298,7 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
       state.search.checkedReverse = false;
       state.search.indeterminate = !!value.length && value.length < (instance?.attrs.options).length;
       state.search.checkedAll = value.length === (instance?.attrs.options).length;
+      state.search.searchList = [];
       emit("update:modelValue", value);
       emit("onChange", {
         value,

package/lib/components/select-all/index.js

@@ -98,7 +98,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           (ele) => select.indexOf(ele[key]) <= -1
         ) : search = state.search.searchList;
       } else {
-        search = instance?.attrs.options;
+        state.search.checkedAll ? search = [] : search = instance?.attrs.options;
       }
       list = [...list, ...search];
       return list;
@@ -132,6 +132,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       state.search.checkedReverse = false;
       state.search.indeterminate = !!value.length && value.length < (instance?.attrs.options).length;
       state.search.checkedAll = value.length === (instance?.attrs.options).length;
+      state.search.searchList = [];
       emit("update:value", value);
       emit("onChange", {
         value,

package/package.json

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

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

@@ -15,6 +15,10 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    nodeClick: {
+        type: FunctionConstructor;
+        default: () => void;
+    };
     copyCallback: {
         type: FunctionConstructor;
         default: () => void;
@@ -41,6 +45,10 @@ declare const _default: import("vue").DefineComponent<{
             type: StringConstructor;
             default: string;
         };
+        nodeClick: {
+            type: FunctionConstructor;
+            default: () => void;
+        };
         copyCallback: {
             type: FunctionConstructor;
             default: () => void;
@@ -50,6 +58,7 @@ declare const _default: import("vue").DefineComponent<{
             default: () => void;
         };
     }>> & {}>>;
+    callback: () => void;
     readonly CloseOutlined: import("@ant-design/icons-vue/lib/icons/CloseOutlined").CloseOutlinedIconType;
     readonly RightOutlined: import("@ant-design/icons-vue/lib/icons/RightOutlined").RightOutlinedIconType;
     readonly Tag: {
@@ -227,6 +236,10 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    nodeClick: {
+        type: FunctionConstructor;
+        default: () => void;
+    };
     copyCallback: {
         type: FunctionConstructor;
         default: () => void;
@@ -240,6 +253,7 @@ declare const _default: import("vue").DefineComponent<{
     desc: string;
     isCustom: boolean;
     priority: number;
+    nodeClick: Function;
     copyCallback: Function;
     deleteCallback: Function;
 }>;