bm-admin-ui 1.2.29-alpha → 1.2.30-alpha

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;
@@ -672,6 +672,9 @@ const label$e = '数字输入框';
 const fieldsMap$e = {
     'title.title': 'title.title',
     'props.placeholder': 'props.placeholder',
+    'props.precision': 'props.precision',
+    'props.min': 'props.min',
+    'props.addonAfter': 'props.addonAfter',
     value: 'value',
     'config.fieldRatio': 'config.fieldRatio',
     'config.count': 'config.count',
@@ -780,6 +783,9 @@ var numInput = {
             },
             props: {
                 placeholder: rule.props.placeholder,
+                precision: rule.props.precision,
+                min: rule.props.min,
+                addonAfter: rule.props.addonAfter,
             },
             value: rule.value,
             config: {
@@ -1879,11 +1885,11 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
       emits("mouseleave");
     }
     function emitSetActiveRuleEvt(rule) {
+      if (rule?.config.immutable)
+        return;
       emits("set-active-rule", rule, tableRule.value);
     }
     function handleClick(element) {
-      if (element?.config.immutable)
-        return;
       emitSetActiveRuleEvt(element);
     }
     function handleUpdate({ newIndex }) {
@@ -2785,7 +2791,7 @@ var materialTemp = {
 const _hoisted_1$7 = /* @__PURE__ */ createElementVNode("div", { class: "bm-product-info-item__title" }, "\u5546\u54C1\u7F16\u53F7", -1);
 const _hoisted_2$5 = { class: "bm-product-info-item__content" };
 const _hoisted_3$4 = { class: "bm-product-info-item__title" };
-const _hoisted_4$2 = /* @__PURE__ */ createElementVNode("div", { class: "bm-product-info-item__content" }, "\u7CFB\u7EDF\u81EA\u52A8\u5E26\u51FA", -1);
+const _hoisted_4$2 = /* @__PURE__ */ createElementVNode("div", { class: "bm-product-info-item__content" }, "\u7CFB\u7EDF\u81EA\u52A8\u83B7\u53D6", -1);
 const _sfc_main$8 = /* @__PURE__ */ defineComponent({
   __name: "product-info",
   props: ["formCreateInject"],
@@ -3548,10 +3554,6 @@ const formDesignerProps = {
         type: Boolean,
         default: false,
     },
-    dragCheckFunc: {
-        type: Function,
-        default: (underlying_vm) => true,
-    },
     formRulePipe: {
         type: Function,
         default: (obj) => obj,
@@ -3560,9 +3562,13 @@ const formDesignerProps = {
         type: Function,
         default: (pushRuleWidget, pushRowWidget, pushTableWidget) => null,
     },
-    deleteFormItemCheck: {
+    resetCmpRatio: {
         type: Function,
-        default: (targetRule, parentRule) => true,
+        default: (ruleName, parentRuleName) => 0,
+    },
+    dragingCallback: {
+        type: Object,
+        default: () => ({}),
     },
 };
 
@@ -3634,6 +3640,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 +3683,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 +3721,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 = {
@@ -3914,6 +3956,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       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 tabData = typeof props.formRulePipe === "function" ? props.formRulePipe(createTab()) : [];
+    (() => {
+      if (!(tabData instanceof Array)) {
+        console.error("formRulePipe\u5C5E\u6027\u8FD4\u56DE\u53C2\u6570\u7C7B\u578B\u5E94\u4E3AArray");
+      }
+      tabData.some((tab) => {
+        if (!tab["key"] || !tab["tab"] || !tab["menuList"] || !(tab["menuList"] instanceof Array)) {
+          console.error(
+            "\u8BF7\u6B63\u786E\u914D\u7F6EformRulePipe\u8FD4\u56DE\u6570\u7EC4\u7C7B\u578B:{key:string, tab:string, menuList: {name:string, title: string, list: any[]}[]}[]"
+          );
+          return true;
+        }
+      });
+    })();
     typeof props.addWidgetFunc === "function" && props.addWidgetFunc(pushRuleWidgets, pushRowWidgets, pushTableWidgets);
     const activeKey = ref("controlLibrary");
     const widgetFormRules = reactive([]);
@@ -3921,6 +3976,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const cacheProps = reactive({});
     const fApi = ref();
     const activeParentRule = ref();
+    const defaultCallbackfun = {
+      movingCallback: (config) => true,
+      deleteCallback: (targetRule, parentRule) => true,
+      afterAdded: (targetRule, parentRule) => null,
+      rearrangeCallback: (config) => true
+    };
+    function executeCallback(func) {
+      if (!props.dragingCallback[func] || typeof props.dragingCallback[func] !== "function") {
+        return defaultCallbackfun[func];
+      }
+      return props.dragingCallback[func];
+    }
     const menuList = computed(
       () => tabData.find((tab) => tab.key === activeKey.value)?.menuList
     );
@@ -3953,10 +4020,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     function moveMenuItem(evt) {
-      return props?.dragCheckFunc(evt?.dragged?._underlying_vm_) && checkDragMove(evt);
+      return executeCallback("movingCallback")(
+        evt?.dragged?._underlying_vm_?.config?.config
+      ) && checkDragMove(evt);
     }
     function moveFormItem(evt) {
-      return props?.dragCheckFunc(evt?.dragged?._underlying_vm_) && checkDragMove(evt);
+      return executeCallback("rearrangeCallback")(
+        evt?.dragged?._underlying_vm_?.config?.config
+      ) && checkDragMove(evt);
     }
     function handleMenuItemDragStart(evt) {
       const item = evt.item.children[0];
@@ -3980,7 +4051,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const rule = makeRule(config);
       const activeParentRuleName = activeParentRule.value?.config?.config?.name;
       if (!widgetNamesRowAccept.includes(config.name) && activeParentRuleName === "row" || !Object.keys(widgetsTableAccept).includes(config.name) && activeParentRuleName === "table") {
-        disabledTip(activeParentRule.value.config.config.name);
+        disabledTip(activeParentRule.value?.config?.config?.name);
+      } else if (!executeCallback("movingCallback")(config)) {
+        return;
       } else {
         const index = activeRuleInList.value.findIndex(
           (item) => item.field === activeRule.value.field
@@ -4016,6 +4089,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function handleFormItemAdd({ newIndex }) {
       const rule = widgetFormRules[newIndex];
+      executeCallback("afterAdded")(rule, void 0);
       dragAdd(rule);
       hideShowDragTip();
     }
@@ -4051,6 +4125,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return newRule;
     }
     function handleFormItemCopy(rule, parentRule) {
+      if (!executeCallback("movingCallback")(rule.config.config)) {
+        return;
+      }
       const newRule = copyRule(
         rule,
         rule.config.config,
@@ -4059,7 +4136,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       setActiveRule(newRule, parentRule);
     }
     function handleFormItemDelete(targetRule, parentRule) {
-      const customerCheck = props.deleteFormItemCheck(targetRule, parentRule);
+      const customerCheck = executeCallback("deleteCallback")(
+        targetRule,
+        parentRule
+      );
       if (!customerCheck) {
         return;
       }
@@ -4079,8 +4159,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       delete cacheProps[targetRule.field];
       if (targetRule.field === activeRule.value.field) {
         const newIndex = Math.min(parentList.length - 1, index);
-        if (newIndex >= 0) {
-          setActiveRule(parentList[newIndex]);
+        const next = parentList[newIndex];
+        if (newIndex >= 0 && !next?.config?.immutable) {
+          setActiveRule(next);
         } else if (parentRule) {
           setActiveRule(parentRule);
         } else {
@@ -4155,6 +4236,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
     }
     function handleWidgetAdd(rule, parentRule) {
+      executeCallback("afterAdded")(rule, parentRule);
       dragAdd(rule, parentRule);
     }
     function handlePropsSetActive(rule) {
@@ -4173,10 +4255,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/over-tooltips/index.d.ts

@@ -14,7 +14,7 @@ declare const BmOverTooltips: import("bm-admin-ui/es/utils/with-install").SFCWit
             default: number;
         };
         width: {
-            type: (NumberConstructor | StringConstructor)[];
+            type: (StringConstructor | NumberConstructor)[];
             default: number;
         };
         showAlways: {

package/es/components/over-tooltips/src/over-tooltips.vue.d.ts

@@ -14,7 +14,7 @@ declare const _default: {
             default: number;
         };
         width: {
-            type: (NumberConstructor | StringConstructor)[];
+            type: (StringConstructor | NumberConstructor)[];
             default: number;
         };
         showAlways: {

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

@@ -82,8 +82,8 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
             default: string;
         };
     }>> & {
-        onChange?: ((...args: any[]) => any) | undefined;
         "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
+        onChange?: ((...args: any[]) => any) | undefined;
         "onUpdate:select"?: ((...args: any[]) => any) | undefined;
     }>>;
     emit: (event: "change" | "update:visible" | "update:select", ...args: any[]) => void;
@@ -144,7 +144,7 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
                     type: BooleanConstructor;
                     default: any;
                 };
-                width: (NumberConstructor | StringConstructor)[];
+                width: (StringConstructor | NumberConstructor)[];
                 footer: import("vue-types").VueTypeValidableDef<any>;
                 okText: import("vue-types").VueTypeValidableDef<any>;
                 okType: import("vue").PropType<import("ant-design-vue/lib/button/buttonTypes").LegacyButtonType>;
@@ -290,7 +290,7 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
                 modalRender: import("vue").PropType<(arg: {
                     originVNode: import("ant-design-vue/lib/_util/type").VueNode;
                 }) => import("ant-design-vue/lib/_util/type").VueNode>;
-            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "visible" | "keyboard" | "confirmLoading" | "closable" | "centered" | "maskClosable" | "forceRender" | "destroyOnClose" | "getContainer" | "bodyStyle" | "maskStyle" | "mask" | "focusTriggerAfterClose">;
+            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "visible" | "confirmLoading" | "closable" | "centered" | "maskClosable" | "forceRender" | "destroyOnClose" | "getContainer" | "bodyStyle" | "maskStyle" | "mask" | "keyboard" | "focusTriggerAfterClose">;
             $attrs: {
                 [x: string]: unknown;
             };
@@ -329,7 +329,7 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
                     type: BooleanConstructor;
                     default: any;
                 };
-                width: (NumberConstructor | StringConstructor)[];
+                width: (StringConstructor | NumberConstructor)[];
                 footer: import("vue-types").VueTypeValidableDef<any>;
                 okText: import("vue-types").VueTypeValidableDef<any>;
                 okType: import("vue").PropType<import("ant-design-vue/lib/button/buttonTypes").LegacyButtonType>;
@@ -534,7 +534,7 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
                 type: BooleanConstructor;
                 default: any;
             };
-            width: (NumberConstructor | StringConstructor)[];
+            width: (StringConstructor | NumberConstructor)[];
             footer: import("vue-types").VueTypeValidableDef<any>;
             okText: import("vue-types").VueTypeValidableDef<any>;
             okType: import("vue").PropType<import("ant-design-vue/lib/button/buttonTypes").LegacyButtonType>;
@@ -709,7 +709,7 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
             type: BooleanConstructor;
             default: any;
         };
-        width: (NumberConstructor | StringConstructor)[];
+        width: (StringConstructor | NumberConstructor)[];
         footer: import("vue-types").VueTypeValidableDef<any>;
         okText: import("vue-types").VueTypeValidableDef<any>;
         okType: import("vue").PropType<import("ant-design-vue/lib/button/buttonTypes").LegacyButtonType>;
@@ -1043,12 +1043,12 @@ declare const BmStaffsSelector: import("bm-admin-ui/es/utils/with-install").SFCW
         default: string;
     };
 }>> & {
-    onChange?: ((...args: any[]) => any) | undefined;
     "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
+    onChange?: ((...args: any[]) => any) | undefined;
     "onUpdate:select"?: ((...args: any[]) => any) | undefined;
 }, {
-    title: string;
     visible: boolean;
+    title: string;
     mode: string;
     showCount: boolean;
     unitStr: string;

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

@@ -191,13 +191,13 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
           value: _ctx.searchVal,
           "onUpdate:value": _cache[0] || (_cache[0] = ($event) => _ctx.searchVal = $event),
           placeholder: "\u8BF7\u8F93\u5165\u59D3\u540D",
-          onBlur: _ctx.search
+          onChange: _ctx.search
         }, {
           suffix: withCtx(() => [
             createVNode(_component_search_outlined, { style: { color: "#9393A3" } })
           ]),
           _: 1
-        }, 8, ["value", "onBlur"]),
+        }, 8, ["value", "onChange"]),
         createElementVNode("div", _hoisted_4$3, [
           createElementVNode("div", _hoisted_5$3, [
             withDirectives(createVNode(_component_Checkbox, {

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

@@ -82,8 +82,8 @@ declare const _default: import("vue").DefineComponent<{
             default: string;
         };
     }>> & {
-        onChange?: ((...args: any[]) => any) | undefined;
         "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
+        onChange?: ((...args: any[]) => any) | undefined;
         "onUpdate:select"?: ((...args: any[]) => any) | undefined;
     }>>;
     emit: (event: "change" | "update:visible" | "update:select", ...args: any[]) => void;
@@ -144,7 +144,7 @@ declare const _default: import("vue").DefineComponent<{
                     type: BooleanConstructor;
                     default: any;
                 };
-                width: (NumberConstructor | StringConstructor)[];
+                width: (StringConstructor | NumberConstructor)[];
                 footer: import("vue-types").VueTypeValidableDef<any>;
                 okText: import("vue-types").VueTypeValidableDef<any>;
                 okType: import("vue").PropType<import("ant-design-vue/lib/button/buttonTypes").LegacyButtonType>;
@@ -290,7 +290,7 @@ declare const _default: import("vue").DefineComponent<{
                 modalRender: import("vue").PropType<(arg: {
                     originVNode: import("ant-design-vue/lib/_util/type").VueNode;
                 }) => import("ant-design-vue/lib/_util/type").VueNode>;
-            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "visible" | "keyboard" | "confirmLoading" | "closable" | "centered" | "maskClosable" | "forceRender" | "destroyOnClose" | "getContainer" | "bodyStyle" | "maskStyle" | "mask" | "focusTriggerAfterClose">;
+            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "visible" | "confirmLoading" | "closable" | "centered" | "maskClosable" | "forceRender" | "destroyOnClose" | "getContainer" | "bodyStyle" | "maskStyle" | "mask" | "keyboard" | "focusTriggerAfterClose">;
             $attrs: {
                 [x: string]: unknown;
             };
@@ -329,7 +329,7 @@ declare const _default: import("vue").DefineComponent<{
                     type: BooleanConstructor;
                     default: any;
                 };
-                width: (NumberConstructor | StringConstructor)[];
+                width: (StringConstructor | NumberConstructor)[];
                 footer: import("vue-types").VueTypeValidableDef<any>;
                 okText: import("vue-types").VueTypeValidableDef<any>;
                 okType: import("vue").PropType<import("ant-design-vue/lib/button/buttonTypes").LegacyButtonType>;
@@ -534,7 +534,7 @@ declare const _default: import("vue").DefineComponent<{
                 type: BooleanConstructor;
                 default: any;
             };
-            width: (NumberConstructor | StringConstructor)[];
+            width: (StringConstructor | NumberConstructor)[];
             footer: import("vue-types").VueTypeValidableDef<any>;
             okText: import("vue-types").VueTypeValidableDef<any>;
             okType: import("vue").PropType<import("ant-design-vue/lib/button/buttonTypes").LegacyButtonType>;
@@ -709,7 +709,7 @@ declare const _default: import("vue").DefineComponent<{
             type: BooleanConstructor;
             default: any;
         };
-        width: (NumberConstructor | StringConstructor)[];
+        width: (StringConstructor | NumberConstructor)[];
         footer: import("vue-types").VueTypeValidableDef<any>;
         okText: import("vue-types").VueTypeValidableDef<any>;
         okType: import("vue").PropType<import("ant-design-vue/lib/button/buttonTypes").LegacyButtonType>;
@@ -1043,12 +1043,12 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
 }>> & {
-    onChange?: ((...args: any[]) => any) | undefined;
     "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
+    onChange?: ((...args: any[]) => any) | undefined;
     "onUpdate:select"?: ((...args: any[]) => any) | undefined;
 }, {
-    title: string;
     visible: boolean;
+    title: string;
     mode: string;
     showCount: boolean;
     unitStr: string;

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

@@ -19,7 +19,7 @@ declare const BmUpload: import("bm-admin-ui/es/utils/with-install").SFCWithInsta
                     default: number;
                 };
                 width: {
-                    type: (NumberConstructor | StringConstructor)[];
+                    type: (StringConstructor | NumberConstructor)[];
                     default: number;
                 };
                 showAlways: {

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

@@ -19,7 +19,7 @@ declare const _default: {
                     default: number;
                 };
                 width: {
-                    type: (NumberConstructor | StringConstructor)[];
+                    type: (StringConstructor | NumberConstructor)[];
                     default: number;
                 };
                 showAlways: {

package/es/utils/index.d.ts

@@ -0,0 +1,7 @@
+declare const utils: {
+    confirmModal(content: string | string[], title?: string, type?: string, config?: {}, cate?: string): Promise<unknown>;
+    toThousands(num: string | number): string;
+    toFixNumHasDefault(value: string | number | undefined, num?: number, isMoney?: boolean, defaultValue?: string): string;
+    wait(ms?: number): Promise<void>;
+};
+export default utils;

package/es/utils/index.js

@@ -0,0 +1,62 @@
+import { Modal as AModal } from 'ant-design-vue';
+import { createVNode, h } from 'vue';
+import { InfoCircleFilled, ExclamationCircleFilled, CheckCircleFilled, CloseCircleFilled, } from '@ant-design/icons-vue';
+const utils = {
+    confirmModal(content, title = '提示', type = 'info', config = {}, cate = 'confirm') {
+        content = content || '确定提交吗？';
+        const icon = {
+            info: InfoCircleFilled,
+            warning: ExclamationCircleFilled,
+            success: CheckCircleFilled,
+            error: CloseCircleFilled,
+        };
+        const iconStyles = {
+            info: 'color:#FF9019;',
+            warning: 'color:#FF9019;',
+            success: 'color:#29CC7A;',
+            error: 'color:#E64C2E;',
+        };
+        return new Promise((resolve) => {
+            AModal[cate](Object.assign(Object.assign({ class: `bm-confirm-modal bm-confirm-modal-${type}`, closable: false, title, centered: true, icon: createVNode(icon[type], { style: iconStyles[type] }), content: typeof content === 'object'
+                    ? h('div', { style: 'color:#555;' }, content.map((ele) => {
+                        return h('p', ele);
+                    }))
+                    : createVNode('div', { style: 'color:#555;' }, content) }, config), { onOk() {
+                    resolve(true);
+                },
+                onCancel() {
+                    resolve(false);
+                } }));
+        });
+    },
+    toThousands(num) {
+        num = String(num);
+        if (!/^(\+|-)?(\d+)(\.\d+)?$/.test(num)) {
+            return num;
+        }
+        let a = RegExp.$1;
+        let b = RegExp.$2;
+        let c = RegExp.$3;
+        let re = /(\\d)(\\d{3})(,|$)/;
+        re.compile('(\\d)(\\d{3})(,|$)');
+        while (re.test(b)) {
+            b = b.replace(re, '$1,$2$3');
+        }
+        return a + '' + b + '' + c;
+    },
+    toFixNumHasDefault(value, num = 0, isMoney = false, defaultValue = '-') {
+        if (value === 0 || value === '0' || value) {
+            return ((isMoney ? '¥' : '') +
+                (value === 0 || value === '0'
+                    ? 0
+                    : this.toThousands(Number(value).toFixed(num))));
+        }
+        else {
+            return defaultValue;
+        }
+    },
+    wait(ms = 0) {
+        return new Promise((resolve) => setTimeout(resolve, ms));
+    },
+};
+export default utils;

package/es/utils/isNull.js

@@ -1,5 +1,5 @@
 export function isNull(value) {
-    return (!value ||
+    return ([null, undefined, ''].includes(value) ||
         (Array.isArray(value) && !value.length) ||
         (value.constructor === Object && !Object.keys(value).length));
 }

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

@@ -36,7 +36,7 @@ declare const BmAttachment: import("bm-admin-ui/es/utils/with-install").SFCWithI
                 default: number;
             };
             width: {
-                type: (NumberConstructor | StringConstructor)[];
+                type: (StringConstructor | NumberConstructor)[];
                 default: number;
             };
             showAlways: {

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

@@ -36,7 +36,7 @@ declare const _default: import("vue").DefineComponent<{
                 default: number;
             };
             width: {
-                type: (NumberConstructor | StringConstructor)[];
+                type: (StringConstructor | NumberConstructor)[];
                 default: number;
             };
             showAlways: {

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, "htmlType" | "loading" | "disabled" | "ghost" | "block" | "danger">;
+            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "ghost" | "danger" | "htmlType" | "loading" | "disabled" | "block">;
             $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, "htmlType" | "loading" | "disabled" | "ghost" | "block" | "danger">;
+            }>> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, "ghost" | "danger" | "htmlType" | "loading" | "disabled" | "block">;
             $attrs: {
                 [x: string]: unknown;
             };

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

@@ -23,8 +23,8 @@ declare const BmCascader: import("bm-admin-ui/es/utils/with-install").SFCWithIns
         default: () => number;
     };
 }>>, {
-    tipType: string;
     width: number;
+    tipType: string;
 }>>;
 export { BmCascader };
 export default BmCascader;

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

@@ -23,7 +23,7 @@ declare var _default: import("vue").DefineComponent<{
         default: () => number;
     };
 }>>, {
-    tipType: string;
     width: number;
+    tipType: string;
 }>;
 export default _default;

package/lib/components/edit-form/index.d.ts

@@ -47,7 +47,7 @@ declare const BmEditForm: import("bm-admin-ui/es/utils/with-install").SFCWithIns
     };
     tmpForm: import("vue").Ref<Record<string, any>>;
     formRef: import("vue").Ref<import("ant-design-vue").FormInstance | null>;
-    colCount: import("vue").ComputedRef<2 | 3 | 1>;
+    colCount: import("vue").ComputedRef<2 | 1 | 3>;
     getValueOfOption: (key: string | undefined, defaultKey: "label" | "value", option: any) => string;
     getPopupContainer: (e: any) => any;
     getColsConfig: (type: "labelCol" | "wrapperCol", item: import("./src/types").Control, index?: number | undefined) => {
@@ -103,7 +103,7 @@ declare const BmEditForm: import("bm-admin-ui/es/utils/with-install").SFCWithIns
                 default: number;
             };
             width: {
-                type: (NumberConstructor | StringConstructor)[];
+                type: (StringConstructor | NumberConstructor)[];
                 default: number;
             };
             showAlways: {

package/lib/components/edit-form/src/edit-form.vue.d.ts

@@ -46,7 +46,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     tmpForm: import("vue").Ref<Record<string, any>>;
     formRef: import("vue").Ref<FormInstance | null>;
-    colCount: import("vue").ComputedRef<2 | 3 | 1>;
+    colCount: import("vue").ComputedRef<2 | 1 | 3>;
     getValueOfOption: (key: string | undefined, defaultKey: "label" | "value", option: any) => string;
     getPopupContainer: (e: any) => any;
     getColsConfig: (type: "labelCol" | "wrapperCol", item: import("./types").Control, index?: number | undefined) => {
@@ -102,7 +102,7 @@ declare const _default: import("vue").DefineComponent<{
                 default: number;
             };
             width: {
-                type: (NumberConstructor | StringConstructor)[];
+                type: (StringConstructor | NumberConstructor)[];
                 default: number;
             };
             showAlways: {