bm-admin-ui 1.0.54-alpha → 1.0.55-alpha

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

@@ -1,5 +1,5 @@
 import { withInstall } from 'bm-admin-ui/es/utils/with-install';
-import { h, nextTick, defineComponent, ref, watch, openBlock, createElementBlock, createVNode, unref, computed, normalizeStyle, Fragment, renderList, normalizeClass, reactive, createBlock, withCtx, createTextVNode, createElementVNode, toDisplayString, createCommentVNode, inject, createStaticVNode, provide, resolveComponent } from 'vue';
+import { h, nextTick, defineComponent, ref, watch, openBlock, createElementBlock, createVNode, unref, computed, normalizeStyle, Fragment, renderList, normalizeClass, reactive, createBlock, withCtx, createTextVNode, createElementVNode, toDisplayString, createCommentVNode, createSlots, inject, createStaticVNode, provide, resolveComponent } from 'vue';
 import { Input, InputNumber, Select, DatePicker, RangePicker, message, Modal, Layout, LayoutSider, Tree, LayoutContent, Button, Row, Col, Pagination, FormItemRest, Divider, Tabs, TabPane, Cascader } from 'ant-design-vue';
 import dayjs from 'dayjs';
 import Picture from 'bm-admin-ui/es/components/upload';
@@ -8,6 +8,7 @@ import { BmTagsDisplay, BmFloatTable } from 'bm-admin-ui/es/components';
 import { SearchOutlined, CheckCircleFilled, PlusOutlined } from '@ant-design/icons-vue';
 import { cloneDeep, floor, debounce } from 'lodash-es';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
+import { isNull } from 'bm-admin-ui/es/utils/isNull';
 
 const fieldRatioMap = {
     '25%': 6,
@@ -811,6 +812,9 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
     function handleAdd() {
       visible.value = true;
     }
+    function getPopupContainer() {
+      return document.body;
+    }
     watch(
       () => props.defaultSelected,
       (val) => {
@@ -830,9 +834,12 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
           "onUpdate:list": _cache[0] || (_cache[0] = ($event) => selected.value = $event),
           "show-empty-btn": false,
           disabled: __props.disabled,
+          "tool-tip-props": {
+            getPopupContainer
+          },
           "show-empty": "",
           onAddClick: handleAdd
-        }, null, 8, ["list", "disabled"]),
+        }, null, 8, ["list", "disabled", "tool-tip-props"]),
         createVNode(unref(BmStaffsSelector), {
           select: selected.value,
           "onUpdate:select": _cache[1] || (_cache[1] = ($event) => selected.value = $event),
@@ -1278,7 +1285,8 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     "extraConfig",
     "disabled",
     "disabledTable",
-    "hidden"
+    "hidden",
+    "formCreateInject"
   ],
   emits: ["change"],
   setup(__props, { emit: emits }) {
@@ -1303,6 +1311,9 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     const config = computed(() => ({
       columns: [...columns],
       data: [...data],
+      columnConfig: {
+        resizable: true
+      },
       checkboxConfig: {
         trigger: "cell",
         checkMethod() {
@@ -1341,12 +1352,15 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
         return result;
       }, {}) || {}
     );
+    const productInputSlots = reactive([]);
+    const formData = computed(() => props.formCreateInject.api.bind());
     function isShow(key) {
       return props.rule.config.tableAdvancedFeatures.includes(key);
     }
     function initConfig() {
       columns.splice(0, columns.length);
       data.splice(0, data.length);
+      productInputSlots.splice(0, productInputSlots.length);
       const childRules = cloneDeep(props.rule.config.childRules);
       const value = props.rule.value;
       if (deleteFeature.value && !props.hidden) {
@@ -1400,6 +1414,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
       const productName = `\u5546\u54C1${String(++productIndex).padStart(2, "0")}`;
       const field = rule.field;
       const associatedFields = rule.config.associatedFields;
+      productInputSlots.push(rule);
       const columns2 = [
         {
           field,
@@ -1407,19 +1422,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
           headerClassName: rule.effect.required ? "is-required" : "",
           minWidth: "138px",
           slots: {
-            default({ row }) {
-              return h(Input, {
-                value: row[field],
-                placeholder: "\u8BF7\u8F93\u5165",
-                disabled: rule.disabled,
-                "onUpdate:value": (value) => {
-                  row[field] = value;
-                },
-                onPressEnter() {
-                  queryProductInfo(rule, row);
-                }
-              });
-            }
+            default: rule.field
           }
         }
       ];
@@ -1495,9 +1498,9 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
       const field = rule.field;
       const associatedFields = rule?.config?.associatedFields;
       return await props.extraConfig.product.fetch({ productCode: row[field] }).then((data2) => {
-        if (data2 && associatedFields.length)
+        if (associatedFields.length)
           associatedFields.forEach((item) => {
-            row[field + item.value] = data2[productInfoKeyMap[item.value]];
+            row[field + item.value] = data2 ? data2[productInfoKeyMap[item.value]] : void 0;
           });
         return data2;
       });
@@ -1655,6 +1658,18 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
         return Promise.resolve(rowData);
       }
     }
+    function pruductInputDisabled(shopField) {
+      if (!shopField)
+        return false;
+      return !formData.value[shopField];
+    }
+    function handlePressEnter(rule, row) {
+      queryProductInfo(rule, row).then((data2) => {
+        if (!data2) {
+          row[rule.field] = "";
+        }
+      });
+    }
     watch(
       () => props.rule,
       () => {
@@ -1737,7 +1752,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
                 ref_key: "bmFloatTableRef",
                 ref: bmFloatTableRef,
                 config: unref(config)
-              }, {
+              }, createSlots({
                 floatHandle: withCtx(({ row, rowIndex }) => [
                   unref(copyFeature) ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                     createVNode(unref(Button), {
@@ -1765,8 +1780,23 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
                     _: 2
                   }, 1032, ["disabled", "onClick"])
                 ]),
-                _: 1
-              }, 8, ["config"])
+                _: 2
+              }, [
+                renderList(productInputSlots, (item) => {
+                  return {
+                    name: item.field,
+                    fn: withCtx(({ row }) => [
+                      createVNode(unref(Input), {
+                        value: row[item.field],
+                        "onUpdate:value": ($event) => row[item.field] = $event,
+                        placeholder: "\u8BF7\u8F93\u5165",
+                        disabled: item.disabled || pruductInputDisabled(item.config?.dataFiltering),
+                        onPressEnter: ($event) => handlePressEnter(item, row)
+                      }, null, 8, ["value", "onUpdate:value", "disabled", "onPressEnter"])
+                    ])
+                  };
+                })
+              ]), 1032, ["config"])
             ]),
             _: 1
           })
@@ -1971,7 +2001,8 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
         return void 0;
     }
     function handleTableDataChange(value) {
-      getAcitvePane().tableData = value;
+      const activePane2 = getAcitvePane();
+      activePane2.tableData = value;
     }
     function emitChange() {
       emits("change", {
@@ -1982,7 +2013,8 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
           tempIdSelected: pane.tempSelected.templateCode || pane.tempIdSelected,
           templateName: pane.tempSelected?.templateName || pane.templateName,
           tableData: pane.tableData,
-          uploadList: pane.uploadList
+          uploadList: pane.uploadList,
+          tableRequiredFields: pane.tableRule?.config?.childRules?.filter((rule) => rule.effect?.required).map((rule) => rule.field)
         }))
       });
     }
@@ -2320,6 +2352,30 @@ var materialTemp = {
                             inject.self.value = value;
                         },
                     },
+                    validate: [
+                        {
+                            validator(rule, value) {
+                                if (isNull(value)) {
+                                    return Promise.reject();
+                                }
+                                const panes = value.panes;
+                                for (const pane of panes) {
+                                    if (!pane.tempIdSelected) {
+                                        return Promise.reject();
+                                    }
+                                    if (pane.tableRequiredFields) {
+                                        for (const field of pane.tableRequiredFields) {
+                                            if (pane.tableData.some((row) => isNull(row[field]))) {
+                                                return Promise.reject();
+                                            }
+                                        }
+                                    }
+                                }
+                                return Promise.resolve();
+                            },
+                            message: '请检查必填项',
+                        },
+                    ],
                 },
             ],
             class: 'bm-fc-module-widget',
@@ -2337,7 +2393,8 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     "required",
     "extraConfig",
     "defalutValue",
-    "disabled"
+    "disabled",
+    "formCreateInject"
   ],
   emits: ["change"],
   setup(__props, { emit: emits }) {
@@ -2352,8 +2409,9 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
       \u5546\u54C1\u5355\u4F4D: "unit"
     };
     const unitMap = ["\u652F", "\u74F6", "\u5957", "\u7EC4", "\u7BB1", "\u4E2A", "\u5F20"];
+    const formData = computed(() => props.formCreateInject.api.bind());
     async function fetch(value) {
-      productInfo.value = await props.extraConfig.fetch({
+      productInfo.value = await props.extraConfig.product.fetch({
         productCode: value,
         filterByShopcode: props.dataFiltering
       }) || {};
@@ -2369,6 +2427,9 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     function emitChange(value) {
       emits("change", value);
     }
+    function inputDisbale(shopField) {
+      return shopField && !formData.value[shopField];
+    }
     watch(
       () => props.defalutValue,
       (val) => {
@@ -2401,7 +2462,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
                       createVNode(unref(Input), {
                         placeholder: "\u8BF7\u8F93\u5165",
                         value: __props.defalutValue,
-                        disabled: __props.disabled,
+                        disabled: __props.disabled || inputDisbale(__props.dataFiltering),
                         onPressEnter: handleBlur
                       }, null, 8, ["value", "disabled"])
                     ]),
@@ -2435,7 +2496,8 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
                         getValue(field.value) ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                           field.value === "\u5546\u54C1\u56FE\u7247" ? (openBlock(), createElementBlock("img", {
                             key: 0,
-                            src: getValue(field.value)
+                            class: "bm-fc-form-item__img",
+                            src: __props.extraConfig.common.previewImg(getValue(field.value))
                           }, null, 8, _hoisted_2$2)) : field.value === "\u5546\u54C1\u5355\u4F4D" ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
                             createTextVNode(toDisplayString(unitMap[getValue(field.value)]), 1)
                           ], 64)) : (openBlock(), createElementBlock(Fragment, { key: 2 }, [
@@ -2476,7 +2538,7 @@ var product = {
                 required: data.effect.required,
                 associatedFields: data.config.associatedFields,
                 dataFiltering: data.config.dataFiltering,
-                extraConfig: extraConfig.product,
+                extraConfig: extraConfig,
                 defalutValue: data.value,
             },
             inject: true,
@@ -2490,7 +2552,7 @@ var product = {
             },
         };
     },
-    rowRule(data) {
+    rowRule(data, extraConfig) {
         return {
             type: 'ProductInfo',
             component: ProductInfo,
@@ -2503,6 +2565,7 @@ var product = {
                 associatedFields: data.config.associatedFields,
                 dataFiltering: data.config.dataFiltering,
                 defalutValue: data.value,
+                extraConfig: extraConfig,
             },
             inject: true,
             on: {
@@ -3030,6 +3093,20 @@ var department = {
     },
 };
 
+function validator(rule, value) {
+    var _a;
+    const childRules = ((_a = rule.config) === null || _a === void 0 ? void 0 : _a.childRules) || [];
+    const requiredRules = childRules.filter((rule) => { var _a; return (_a = rule === null || rule === void 0 ? void 0 : rule.effect) === null || _a === void 0 ? void 0 : _a.required; });
+    if (requiredRules.length && isNull(value)) {
+        return Promise.reject();
+    }
+    for (const rule of requiredRules) {
+        if (value.some((item) => isNull(item[rule.field]))) {
+            return Promise.reject();
+        }
+    }
+    return Promise.resolve();
+}
 var table = {
     name: 'table',
     rule(data, extraConfig) {
@@ -3044,9 +3121,19 @@ var table = {
             inject: true,
             on: {
                 change(inject, value) {
-                    inject.self.value = value;
+                    const rule = inject.self;
+                    rule.value = value;
+                    inject.api.emit('table-change', inject.api.bind());
                 },
             },
+            validate: [
+                {
+                    validator(rule, value) {
+                        return validator(data, value);
+                    },
+                    message: '请检查必填项',
+                },
+            ],
         };
     },
     rowRule(data, extraConfig) {
@@ -3062,8 +3149,17 @@ var table = {
             on: {
                 change(inject, value) {
                     inject.self.value = value;
+                    inject.api.emit('table-change', inject.api.bind());
                 },
             },
+            validate: [
+                {
+                    validator(rule, value) {
+                        return validator(data, value);
+                    },
+                    message: '请检查必填项',
+                },
+            ],
             col: {
                 span: 24,
             },
@@ -3384,7 +3480,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           "model-value": __props.value,
           option,
           rule: rule.value,
-          "onUpdate:modelValue": handleValue
+          "onUpdate:modelValue": handleValue,
+          onTableChange: handleValue
         }, null, 8, ["api", "model-value", "rule"])
       ], 64);
     };

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

@@ -1354,6 +1354,7 @@ var date = {
             props: {
                 placeholder: '请选择',
                 format: 'YYYY-MM',
+                valueFormat: 'YYYY-MM',
             },
             config: {
                 propsFields: Object.values(fieldsMap$b),
@@ -1404,6 +1405,12 @@ var date = {
                     },
                 ],
                 value: rule.props.format,
+                inject: true,
+                on: {
+                    change({ api, self }, format) {
+                        api.emit('props.valueFormat', format.value);
+                    },
+                },
             },
             {
                 type: 'input',

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

@@ -917,6 +917,7 @@ 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,7 +156,9 @@ 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);
@@ -181,6 +183,7 @@ const _sfc_main$3 = defineComponent({
     }
     return {
       changeTreeCheck,
+      departmentSelect,
       ...toRefs(state),
       ...toRefs(selectState),
       list,
@@ -261,7 +264,7 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
             }), 128))
           ], 64)) : _ctx.isTree ? (openBlock(), createBlock(_component_ATree, {
             key: 1,
-            "checked-keys": _ctx.multipDepartment,
+            "checked-keys": _ctx.departmentSelect,
             checkable: "",
             "tree-data": _ctx.list,
             onCheck: _ctx.changeTreeCheck

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

@@ -35,6 +35,7 @@ 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,6 +917,7 @@ 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/utils/isNull.d.ts

@@ -0,0 +1 @@
+export declare function isNull(value: any): boolean;

package/es/utils/isNull.js

@@ -0,0 +1,5 @@
+export function isNull(value) {
+    return (!value ||
+        (Array.isArray(value) && !value.length) ||
+        (value.constructor === Object && !Object.keys(value).length));
+}