bm-admin-ui 1.0.39-alpha → 1.0.40-alpha

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, Fragment, isRef, renderList, renderSlot, nextTick, 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, onBeforeUnmount, 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';
@@ -466,7 +466,7 @@ var input = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             props: {
@@ -499,6 +499,7 @@ var input = {
                 field: fieldsMap$g['props.placeholder'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder,
             },
@@ -508,6 +509,7 @@ var input = {
                 field: fieldsMap$g['value'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 200,
                 },
                 value: rule.value,
             },
@@ -567,7 +569,7 @@ var textarea = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             props: {
@@ -601,6 +603,7 @@ var textarea = {
                 field: fieldsMap$f['props.placeholder'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder,
             },
@@ -610,6 +613,7 @@ var textarea = {
                 field: fieldsMap$f['value'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 5000,
                 },
                 value: rule.value,
             },
@@ -670,7 +674,7 @@ var numInput = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             props: {
@@ -705,6 +709,7 @@ var numInput = {
                 field: fieldsMap$e['props.placeholder'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder,
             },
@@ -778,6 +783,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
     const visible = ref(false);
     const text = ref("");
     const repeatOption = ref([]);
+    const maxlength = 500;
     function edit() {
       visible.value = true;
       text.value = makeText(props.options);
@@ -799,6 +805,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
     function handleOk() {
       const options = text.value.split("\n").reduce((pre, cur) => {
         if (cur) {
+          cur = cur.substring(0, maxlength - 1);
           pre.push({ value: cur, label: cur });
         }
         return pre;
@@ -867,6 +874,7 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
                           "bm-handle-options__input",
                           repeatOption.value.length && repeatOption.value.includes(element.value) ? "is-error" : ""
                         ]),
+                        maxlength,
                         onBlur: ($event) => handleBlur(element)
                       }, null, 8, ["value", "onUpdate:value", "class", "onBlur"])
                     ]),
@@ -963,7 +971,7 @@ var radio = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             options: [
@@ -1009,6 +1017,7 @@ var radio = {
                 field: fieldsMap$d['props.placeholder'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder,
             },
@@ -1101,7 +1110,7 @@ var checkbox = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             options: [
@@ -1147,6 +1156,7 @@ var checkbox = {
                 field: fieldsMap$c['props.placeholder'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder,
             },
@@ -1308,7 +1318,7 @@ var date = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             props: {
@@ -1371,6 +1381,7 @@ var date = {
                 field: fieldsMap$b['props.placeholder'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder,
             },
@@ -1452,7 +1463,7 @@ var dateRange = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             props: {
@@ -1517,6 +1528,7 @@ var dateRange = {
                 field: fieldsMap$a['props.placeholder.0'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder[0],
             },
@@ -1526,6 +1538,7 @@ var dateRange = {
                 field: fieldsMap$a['props.placeholder.1'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder[1],
             },
@@ -1599,10 +1612,23 @@ var instruction = {
                 title: label$9,
                 field: fieldsMap$9.value,
                 value: rule.value,
+                inject: true,
                 prefix: {
                     type: 'TextColor',
+                    on: {
+                        change({ api, self }, color) {
+                            api.emit('change', 'style.color', color, self, api, true);
+                        },
+                    },
                     props: {
-                        rule,
+                        color: rule.style.color,
+                    },
+                },
+                on: {
+                    change({ api, self }, list) {
+                        nextTick(() => {
+                            api.refresh();
+                        });
                     },
                 },
             },
@@ -1645,7 +1671,7 @@ var picture = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             props: {
@@ -1994,7 +2020,15 @@ var table = {
                 effect: {
                     required: true,
                 },
+                inject: true,
                 value: rule.config.childRules,
+                on: {
+                    change({ api, self }, list) {
+                        nextTick(() => {
+                            api.validate();
+                        });
+                    },
+                },
             },
             {
                 type: 'checkbox',
@@ -2057,7 +2091,7 @@ var file = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             config: {
@@ -2128,7 +2162,7 @@ var people = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             props: {
@@ -2161,6 +2195,7 @@ var people = {
                 field: fieldsMap$5['props.placeholder'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder,
             },
@@ -2249,7 +2284,7 @@ var department = {
                 },
             },
             effect: {
-                required: true,
+                required: false,
                 formRule: 'formRule',
             },
             props: {
@@ -2282,6 +2317,7 @@ var department = {
                 field: fieldsMap$4['props.placeholder'],
                 props: {
                     placeholder: '请输入',
+                    maxlength: 30,
                 },
                 value: rule.props.placeholder,
             },
@@ -3554,7 +3590,8 @@ const _hoisted_2$1 = { class: "bm-table-column-btn-wrap" };
 const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   __name: "table-column",
   props: ["formCreateInject"],
-  setup(__props) {
+  emits: ["change"],
+  setup(__props, { emit: emits }) {
     const props = __props;
     const handleClass = "bm-table-column__drag-icon";
     const btnCom = ref();
@@ -3579,6 +3616,15 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     function getPopupContainer() {
       return document.body;
     }
+    watch(
+      childRules,
+      (val) => {
+        emits("change", val);
+      },
+      {
+        deep: true
+      }
+    );
     return (_ctx, _cache) => {
       const _component_Delete = resolveComponent("Delete");
       const _component_ARow = resolveComponent("ARow");
@@ -3659,12 +3705,17 @@ var TableColumn = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__file", "table-co
 
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   __name: "text-color",
-  props: ["rule"],
-  setup(__props) {
+  props: ["color"],
+  emits: ["change"],
+  setup(__props, { emit: emits }) {
     const props = __props;
+    const color = ref(props.color);
+    function getColor(curColor) {
+      return curColor === Colors.Black ? Colors.Blue : Colors.Black;
+    }
     function handleClick() {
-      const rule = props.rule;
-      rule.style.color = rule.style.color === Colors.Black ? Colors.Blue : Colors.Black;
+      color.value = getColor(color.value);
+      emits("change", color.value);
     }
     return (_ctx, _cache) => {
       const _component_ColorPanel = resolveComponent("ColorPanel");
@@ -3676,16 +3727,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
           width: "1em",
           height: "1em",
           fontSize: "20px",
-          color: __props.rule.style.color,
+          color: getColor(color.value),
           cursor: "pointer"
         }),
         onClick: withModifiers(handleClick, ["prevent", "stop"])
-      }, {
-        default: withCtx(() => [
-          createTextVNode("change")
-        ]),
-        _: 1
-      }, 8, ["style", "onClick"]);
+      }, null, 8, ["style", "onClick"]);
     };
   }
 });
@@ -3983,6 +4029,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return rule.config.config.parse(rule);
     }
     function edit(formRules) {
+      widgetFormRules.splice(0);
       formRules.forEach((item) => {
         const rule = makeRule(ruleList[item.name]);
         delete item.name;
@@ -4000,22 +4047,73 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function getRule(name) {
       return makeRule(ruleList[name]);
     }
+    function validate() {
+      let pass = true;
+      for (const rule of widgetFormRules) {
+        const config = rule.config.config || {};
+        const childRules = rule.config.childRules || [];
+        if (!rule?.title?.title && config.name !== "instruction") {
+          pass = false;
+        }
+        if (config.name === "table" && !childRules.length) {
+          pass = false;
+        }
+        if (!pass && rule.field !== activeRule.value.field) {
+          setActiveRule(rule);
+        }
+        if (pass && childRules.length) {
+          for (const childRule of childRules) {
+            if (!childRule?.title?.title) {
+              pass = false;
+              if (childRule.field !== activeRule.value.field) {
+                setActiveRule(childRule, rule);
+              }
+              break;
+            }
+          }
+        }
+        if (!pass) {
+          nextTick(() => {
+            fApi.value.validate();
+          });
+          break;
+        }
+      }
+      return pass;
+    }
+    function flowConditionEffect(activeProps2, flowCondition) {
+      const requiredRule = activeProps2?.find(
+        (rule) => rule.field === "effect.required"
+      );
+      if (requiredRule) {
+        if (!requiredRule.props) {
+          requiredRule.props = {};
+        }
+        requiredRule.props.disabled = !!flowCondition[activeRule.value.field];
+      }
+    }
     watch(
       () => props.presetRules,
       (presetRules) => {
         widgetFormRules.push(...presetRules);
-      },
-      {
-        immediate: true
       }
     );
     watch(
       () => props.formRules,
       (formRules) => {
-        edit(formRules);
+        formRules && edit(formRules);
+      }
+    );
+    watch(activeProps, (activeProps2) => {
+      flowConditionEffect(activeProps2, props.flowCondition);
+    });
+    watch(
+      () => props.flowCondition,
+      (flowCondition) => {
+        flowConditionEffect(activeProps.value, flowCondition);
       },
       {
-        immediate: true
+        deep: true
       }
     );
     onBeforeUnmount(() => {
@@ -4023,7 +4121,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     expose({
       getFormRule,
-      getRule
+      getRule,
+      validate
     });
     return (_ctx, _cache) => {
       const _component_ACol = resolveComponent("ACol");
@@ -4066,7 +4165,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     move: moveMenuItem,
                     "force-fallback": true,
                     "scroll-sensitivity": 100,
-                    delay: 50,
                     onStart: handleMenuItemDragStart,
                     onEnd: handleMenuItemDragEnd
                   }, {
@@ -4131,7 +4229,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   ]),
                   _: 1
                 }, 8, ["list"]),
-                showDragTip.value && !_ctx.formRules.length ? (openBlock(), createBlock(NoDataTip, {
+                showDragTip.value && !_ctx.formRules?.length ? (openBlock(), createBlock(NoDataTip, {
                   key: 0,
                   class: "bm-no-data-tip"
                 })) : createCommentVNode("v-if", true)

package/es/components/input-tags-display/index.js

@@ -16,6 +16,10 @@ var _export_sfc = (sfc, props) => {
 const _sfc_main = defineComponent({
   components: { ToolTip, CloseCircleFilled, Button, Tag },
   props: {
+    disabled: {
+      type: Boolean,
+      default: false
+    },
     list: {
       type: Array,
       default: () => []
@@ -26,7 +30,7 @@ const _sfc_main = defineComponent({
     },
     placeholder: {
       type: String,
-      default: "top"
+      default: "\u8BF7\u9009\u62E9"
     },
     showEmptyBtn: {
       type: Boolean,
@@ -66,6 +70,9 @@ const _sfc_main = defineComponent({
       return document.querySelector(`#${containId}`);
     }
     function clear() {
+      if (props.disabled) {
+        return;
+      }
       emit("update:list", []);
       emit("clear");
       if (!props.showEmptyBtn && !props.showEmpty) {
@@ -75,6 +82,9 @@ const _sfc_main = defineComponent({
       }
     }
     function toAddTags() {
+      if (props.disabled) {
+        return;
+      }
       if (!props.list.length || props.alwaysInvoke)
         emit("addClick");
     }
@@ -172,7 +182,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 _: 2
               }, 1024);
             }), 128)),
-            createElementVNode("div", {
+            !_ctx.disabled ? (openBlock(), createElementBlock("div", {
+              key: 0,
               class: "list-clear",
               onClick: _cache[1] || (_cache[1] = withModifiers((...args) => _ctx.clear && _ctx.clear(...args), ["stop"])),
               onMouseenter: _cache[2] || (_cache[2] = withModifiers(() => {
@@ -181,7 +192,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               }, ["stop"]))
             }, [
               createVNode(_component_CloseCircleFilled)
-            ], 32)
+            ], 32)) : createCommentVNode("v-if", true)
           ])
         ]),
         _: 1

package/es/components/input-tags-display/src/input-tags-display.vue.d.ts

@@ -3,6 +3,10 @@ declare type ItemType = {
     title: string;
 };
 declare const _default: import("vue").DefineComponent<{
+    disabled: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     list: {
         type: ArrayConstructor;
         default: () => ItemType[];
@@ -66,6 +70,10 @@ declare const _default: import("vue").DefineComponent<{
         trigger: string;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("clear" | "update:list" | "addClick")[], "clear" | "update:list" | "addClick", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    disabled: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     list: {
         type: ArrayConstructor;
         default: () => ItemType[];
@@ -114,6 +122,7 @@ declare const _default: import("vue").DefineComponent<{
     "onUpdate:list"?: ((...args: any[]) => any) | undefined;
     onAddClick?: ((...args: any[]) => any) | undefined;
 }, {
+    disabled: boolean;
     placeholder: string;
     placement: string;
     list: unknown[];

package/es/utils/bm-admin-ui-resolver.d.ts

@@ -1,4 +1,6 @@
-export declare function BmAdminUiResolver(options: any): {
+export declare function BmAdminUiResolver(options?: {
+    importStyle: boolean;
+}): {
     type: string;
     resolve: (name: string) => {
         name: string;

package/es/utils/bm-admin-ui-resolver.js

@@ -2,7 +2,7 @@ function kebabCase(key) {
     const result = key.replace(/([A-Z])/g, ' $1').trim();
     return result.split(' ').join('-').toLowerCase();
 }
-export function BmAdminUiResolver(options) {
+export function BmAdminUiResolver(options = { importStyle: false }) {
     return [
         {
             type: 'component',