bm-admin-ui 1.0.45-alpha → 1.0.46-alpha

package/lib/components/float-table/index.js

@@ -49,6 +49,7 @@ const _sfc_main = {
     "radioChange",
     "checkboxChange",
     "checkboxChangeAll",
+    "cellClick",
     "pageChange",
     "pageSizeChange"
   ],
@@ -80,7 +81,7 @@ const _sfc_main = {
           reserve: false,
           highlight: vue.computed(function() {
             return props.config.columns.some(function(item) {
-              return item.type === "checkbox" || item.type === "checkbox";
+              return item.type === "checkbox";
             });
           }),
           trigger: "row"
@@ -100,6 +101,16 @@ const _sfc_main = {
         },
         checkboxAll(val) {
           emit("checkboxChangeAll", val);
+        },
+        cellClick(data) {
+          let { row, column } = data;
+          if (column.type === "checkbox" || column.type === "radio" || column.field === "action" || column.slots?.default === "floatHandle")
+            return;
+          else {
+            xGrid.value.clearCheckboxRow();
+            xGrid.value.setCheckboxRow(row, true);
+            emit("cellClick", data);
+          }
         }
       },
       atVisible: false,
@@ -110,7 +121,7 @@ const _sfc_main = {
       },
       trNodes: [],
       isInScroll: false,
-      inMaxScorllX: false,
+      inMaxScrollX: false,
       floatRow: {},
       floatRowIndex: void 0,
       floatHandleDomCol: null
@@ -121,7 +132,7 @@ const _sfc_main = {
         "bm-table",
         `table-${props.size}`,
         {
-          floatHandleTable: props.isNeedFloatHandle && (!state.atVisible || state.inMaxScorllX) && state.floatHandleDomCol
+          floatHandleTable: props.isNeedFloatHandle && (!state.atVisible || state.inMaxScrollX) && state.floatHandleDomCol
         }
       ];
     });
@@ -135,14 +146,14 @@ const _sfc_main = {
     const gridEvents = vue.computed(() => {
       let extraFn = {};
       if (props.isNeedFloatHandle) {
-        let propscellMouseenter = props.events.cellMouseenter;
+        let propsCellMouseenter = props.events.cellMouseenter;
         extraFn.cellMouseenter = (e) => {
           if (props.isNeedFloatHandle) {
             if (state.isInScroll) {
               state.isShowFloatHandle = false;
               return;
             }
-            if (state.inMaxScorllX) {
+            if (state.inMaxScrollX) {
               state.isShowFloatHandle = false;
             }
             let rowid = e.rowid;
@@ -171,7 +182,7 @@ const _sfc_main = {
                 top,
                 height: clientHeight
               };
-              if (!state.atVisible && !state.inMaxScorllX) {
+              if (!state.atVisible && !state.inMaxScrollX) {
                 state.isShowFloatHandle = true;
               }
               vue.nextTick(() => {
@@ -182,23 +193,23 @@ const _sfc_main = {
               });
             }, 200);
           }
-          propscellMouseenter && propscellMouseenter(e);
+          propsCellMouseenter && propsCellMouseenter(e);
         };
         extraFn.scroll = (e) => {
-          let propsscroll = props.events.scroll;
+          let propsScroll = props.events.scroll;
           if (e.isY && props.isNeedFloatHandle) {
             methods.scrollNotShowFloat();
           }
           if (e.isX && props.isNeedFloatHandle && state.floatHandleDomCol && gridOptions.value.data && gridOptions.value.data.length > 0) {
             if (e.scrollLeft + e.$event.target.clientWidth >= e.$event.target.scrollWidth - state.floatHandleDomCol.clientWidth) {
-              state.inMaxScorllX = true;
+              state.inMaxScrollX = true;
               state.isShowFloatHandle = false;
             } else {
-              state.inMaxScorllX = false;
+              state.inMaxScrollX = false;
               state.isShowFloatHandle = true;
             }
           }
-          propsscroll && propsscroll(e);
+          propsScroll && propsScroll(e);
         };
         extraFn.cellMouseleave = (e) => {
           let propsCellMouseLeave = props.events.cellMouseleave;

package/lib/components/float-table/src/float-table.vue.d.ts

@@ -58,7 +58,7 @@ declare const _default: {
         }>;
         trNodes: import("vue").Ref<any>;
         isInScroll: import("vue").Ref<boolean>;
-        inMaxScorllX: import("vue").Ref<boolean>;
+        inMaxScrollX: import("vue").Ref<boolean>;
         floatRow: import("vue").Ref<{}>;
         floatRowIndex: import("vue").Ref<undefined>;
         floatHandleDomCol: import("vue").Ref<any>;

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

@@ -11,14 +11,12 @@ var BmStaffsSelector = require('bm-admin-ui/lib/components/staffs-selector');
 var components = require('bm-admin-ui/lib/components');
 var iconsVue = require('@ant-design/icons-vue');
 var lodashEs = require('lodash-es');
-var FC = require('@form-create/ant-design-vue');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var dayjs__default = /*#__PURE__*/_interopDefaultLegacy(dayjs);
 var Picture__default = /*#__PURE__*/_interopDefaultLegacy(Picture);
 var BmStaffsSelector__default = /*#__PURE__*/_interopDefaultLegacy(BmStaffsSelector);
-var FC__default = /*#__PURE__*/_interopDefaultLegacy(FC);
 
 const fieldRatioMap = {
     '25%': 6,
@@ -785,15 +783,27 @@ const _sfc_main$a = /* @__PURE__ */ vue.defineComponent({
     "placeholder",
     "defaultSelected",
     "load",
-    "disabled"
+    "disabled",
+    "fieldNames"
   ],
   emits: ["change"],
   setup(__props, { emit: emits }) {
     const props = __props;
+    const fieldNames = props.fieldNames || {
+      label: "name",
+      value: "code"
+    };
     const selected = vue.ref([]);
     const visible = vue.ref(false);
     function selectedChange(val) {
-      emits("change", val);
+      emits(
+        "change",
+        val.map((item) => ({
+          [fieldNames.value]: item.key,
+          [fieldNames.label]: item.title,
+          ...item
+        }))
+      );
     }
     function handleAdd() {
       visible.value = true;
@@ -838,6 +848,7 @@ var StaffSelector = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__file", "staff-
 var people = {
     name: 'people',
     rule(data, extraConfig) {
+        var _a;
         return {
             type: 'StaffSelector',
             component: StaffSelector,
@@ -853,6 +864,7 @@ var people = {
                         return yield extraConfig.people.fetch(params);
                     });
                 },
+                fieldNames: (_a = extraConfig.people) === null || _a === void 0 ? void 0 : _a.fieldNames,
             },
             effect: {
                 required: data.effect.required && '请选择',
@@ -877,6 +889,7 @@ var people = {
         };
     },
     rowRule(data, extraConfig) {
+        var _a;
         return {
             type: 'StaffSelector',
             component: StaffSelector,
@@ -892,6 +905,7 @@ var people = {
                         return yield extraConfig.people.fetch(params);
                     });
                 },
+                fieldNames: (_a = extraConfig.people) === null || _a === void 0 ? void 0 : _a.fieldNames,
             },
             effect: {
                 required: data.effect.required && '请选择',
@@ -2238,7 +2252,11 @@ const _sfc_main$4 = /* @__PURE__ */ vue.defineComponent({
   emits: ["change"],
   setup(__props, { emit: emits }) {
     const props = __props;
-    const value = vue.ref(props.value?.value);
+    const fieldNames = props.extraConfig.fieldNames || {
+      label: "name",
+      value: "code"
+    };
+    const value = vue.ref(props.value?.[fieldNames.value]);
     const options = vue.ref([]);
     const keyword = vue.ref("");
     const debounceFetch = lodashEs.debounce((value2) => {
@@ -2258,7 +2276,10 @@ const _sfc_main$4 = /* @__PURE__ */ vue.defineComponent({
     }
     function handleChange(val, option) {
       value.value = val;
-      emits("change", option);
+      emits("change", {
+        [fieldNames.value]: option.value,
+        [fieldNames.label]: option.label
+      });
     }
     function handleSearch(value2) {
       keyword.value = value2;
@@ -2377,7 +2398,7 @@ var shop = {
 };
 
 const _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({
-  __name: "material-type-in-table",
+  __name: "material-type",
   props: ["config", "multiple", "format", "value"],
   emits: ["change"],
   setup(__props, { emit: emits }) {
@@ -2402,58 +2423,65 @@ const _sfc_main$3 = /* @__PURE__ */ vue.defineComponent({
         result.forEach((item) => {
           item.isLeaf = props.format === optionLength + 1;
         });
-        targetOption.children = result;
+        if (result.length) {
+          targetOption.children = result;
+        } else {
+          targetOption.isLeaf = true;
+        }
       }).finally(() => {
         targetOption.loading = false;
       });
     }
-    function handleChange(v) {
-      emits("change", v);
+    function handleChange(value, selectedOptions) {
+      const result = lodashEs.cloneDeep(selectedOptions);
+      processValue(result);
+      emits("change", result);
+    }
+    function processValue(selectedOptions) {
+      selectedOptions.forEach((item) => {
+        if (Array.isArray(item))
+          processValue(item);
+        else {
+          delete item.disabled;
+          delete item.children;
+          delete item.isLeaf;
+          delete item.loading;
+        }
+      });
+    }
+    function formatValue(value) {
+      value = value || [];
+      return value.reduce((pre, cur) => {
+        if (Array.isArray(cur)) {
+          pre.push(cur.map((c) => c.value));
+        } else {
+          pre.push(cur.value);
+        }
+        return pre;
+      }, []);
     }
     initOptions();
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createBlock(vue.unref(antDesignVue.Cascader), {
-        value: __props.value,
+        value: formatValue(__props.value),
         placeholder: "\u8BF7\u8F93\u5165",
         multiple: __props.multiple,
         options: options.value,
         "load-data": loadData,
         "get-popup-container": vue.unref(getContainer),
-        "onUpdate:value": handleChange
+        onChange: handleChange
       }, null, 8, ["value", "multiple", "options", "get-popup-container"]);
     };
   }
 });
-var materialTypeInTable = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__file", "material-type-in-table.vue"]]);
+var materialType$1 = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__file", "material-type.vue"]]);
 
-FC__default["default"].register({
-    name: 'materialTypesOption',
-    init({ value }, rule) {
-        getOption(value, { level: 1, relationCode: '' }).then((data) => {
-            data = isLeaf(data, rule.config.format === 1);
-            if (rule.props) {
-                rule.props.options = data;
-            }
-            else {
-                (rule.props = {}).options = data;
-            }
-        });
-    },
-});
-function getOption(config, data) {
-    return config.fetch(data);
-}
-function isLeaf(data, value) {
-    data.forEach((item) => {
-        item.isLeaf = value;
-    });
-    return data;
-}
 var materialType = {
     name: 'materialType',
     rule(data, extraConfig) {
         return {
-            type: 'cascader',
+            type: 'materialType',
+            component: materialType$1,
             field: data.field,
             title: '素材类型',
             validate: [
@@ -2465,38 +2493,22 @@ var materialType = {
                 },
             ],
             props: {
-                placeholder: '请选择',
+                value: data.value,
                 multiple: data.props.multiple,
-                loadData(inject, selectedOptions) {
-                    const optionLength = selectedOptions.length;
-                    const targetOption = selectedOptions[optionLength - 1];
-                    targetOption.loading = true;
-                    getOption(extraConfig.materialType, {
-                        level: optionLength + 1,
-                        relationCode: targetOption.value,
-                    })
-                        .then((result) => {
-                        result = isLeaf(result, inject.self.config.format === optionLength + 1);
-                        targetOption.children = result;
-                    })
-                        .finally(() => {
-                        targetOption.loading = false;
-                    });
-                },
-            },
-            config: {
                 format: data.config.format,
-            },
-            effect: {
-                materialTypesOption: extraConfig.materialType,
+                config: extraConfig.materialType,
+                disabled: data.disabled,
             },
             inject: true,
             on: {
                 change(inject, list) {
                     const rule = inject.self;
                     rule.value = list;
+                    rule.props.value = list;
                     vue.nextTick(() => {
-                        inject.api.validateField(rule.field);
+                        setTimeout(() => {
+                            inject.api.validateField(rule.field);
+                        });
                     });
                 },
             },
@@ -2505,7 +2517,8 @@ var materialType = {
     },
     rowRule(data, extraConfig) {
         return {
-            type: 'cascader',
+            type: 'materialType',
+            component: materialType$1,
             field: data.field,
             title: '素材类型',
             validate: [
@@ -2517,35 +2530,22 @@ var materialType = {
                 },
             ],
             props: {
-                placeholder: '请选择',
+                value: data.value,
                 multiple: data.props.multiple,
-                loadData(inject, selectedOptions) {
-                    const optionLength = selectedOptions.length;
-                    const targetOption = selectedOptions[optionLength - 1];
-                    targetOption.loading = true;
-                    getOption(extraConfig.materialType, optionLength + 1)
-                        .then((result) => {
-                        result = isLeaf(result, inject.self.config.format === optionLength + 1);
-                        targetOption.children = result;
-                    })
-                        .finally(() => {
-                        targetOption.loading = false;
-                    });
-                },
-            },
-            config: {
                 format: data.config.format,
-            },
-            effect: {
-                materialTypesOption: extraConfig.materialType,
+                config: extraConfig.materialType,
+                disabled: data.disabled,
             },
             inject: true,
             on: {
                 change(inject, list) {
                     const rule = inject.self;
                     rule.value = list;
+                    rule.props.value = list;
                     vue.nextTick(() => {
-                        inject.api.validateField(rule.field);
+                        setTimeout(() => {
+                            inject.api.validateField(rule.field);
+                        });
                     });
                 },
             },
@@ -2564,7 +2564,7 @@ var materialType = {
             minWidth: '138px',
             slots: {
                 default({ row }) {
-                    return vue.h(materialTypeInTable, {
+                    return vue.h(materialType$1, {
                         multiple: data.props.multiple,
                         format: data.config.format,
                         config: extraConfig.materialType,
@@ -2614,6 +2614,7 @@ var row = {
 var department = {
     name: 'department',
     rule(data, extraConfig) {
+        var _a;
         return {
             type: 'StaffSelector',
             component: StaffSelector,
@@ -2631,6 +2632,7 @@ var department = {
                         return yield extraConfig.department.fetch();
                     });
                 },
+                fieldNames: (_a = extraConfig.people) === null || _a === void 0 ? void 0 : _a.fieldNames,
             },
             effect: {
                 required: data.effect.required && '请选择',
@@ -2655,6 +2657,7 @@ var department = {
         };
     },
     rowRule(data, extraConfig) {
+        var _a;
         return {
             type: 'StaffSelector',
             component: StaffSelector,
@@ -2672,6 +2675,7 @@ var department = {
                         return yield extraConfig.department.fetch();
                     });
                 },
+                fieldNames: (_a = extraConfig.people) === null || _a === void 0 ? void 0 : _a.fieldNames,
             },
             effect: {
                 required: data.effect.required && '请选择',