cnhis-design-vue 3.0.7 → 3.1.0

package/CHANGELOG.md

@@ -2,6 +2,40 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [3.1.0](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/compare/v3.0.9...v3.1.0) (2022-05-31)
+
+
+### Features
+
+* 打印格式选择 ([56180bf](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/56180bfde66108455c7ed15870c257c46a88c834))
+* 下拉加映射配置 ([0ea094b](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/0ea094be74e155b2cf37b52df149694118ecf876))
+
+
+### Bug Fixes
+
+* 解决冲突 ([0ee5bc1](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/0ee5bc10e02148e208eb4da481590d2da9be536c))
+
+### [3.0.9](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/compare/v3.0.8...v3.0.9) (2022-05-30)
+
+
+### Bug Fixes
+
+* 不传scrollConfig报错； ([8897413](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/88974131e5eed48f39ebe2955830062b6976f8ec))
+
+### [3.0.8](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/compare/v3.0.7...v3.0.8) (2022-05-27)
+
+
+### Features
+
+* 表格按键配置、滚动事件派发、编辑formType事件index、选择行支持默认选中 ([1401d21](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/1401d21dada02da4a6aa82de33f23f206ef97662))
+* 选人组件 ([a21d86e](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/a21d86e638afdd580cc5d0a90094b520a59f1b44))
+
+
+### Bug Fixes
+
+* 表格MAX_CHECK_SIZE字段代码格式化导致传参失败 ([a22a3b4](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/a22a3b45c2c87be7f575a572549cfcdc407a7a52))
+* 异步加载allow-checking-not-loaded报错 ([d086dc2](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/d086dc2e77cbe4c53e7a796b0cf29a4dad7b4d52))
+
 ### [3.0.7](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/compare/v3.0.6...v3.0.7) (2022-05-25)
 
 

package/es/big-table/index.js

@@ -54,7 +54,7 @@ const bigTableState = {
 
 const bigTableProps = {
     data: { type: Array, default: () => [] },
-    MAX_CHECK_SIZE: { type: Number, default: 0 },
+    maxCheckSize: { type: Number, default: 0 },
     showFooter: Boolean,
     sumData: { type: Object, default: () => ({}) },
     avgData: { type: Object, default: () => ({}) },
@@ -210,7 +210,8 @@ const bigTableEmits = [
     "selectionChangeLocal",
     "switchBtnOnChange",
     "asyncTableChange",
-    "formChange"
+    "formChange",
+    "scroll"
 ];
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -13345,6 +13346,7 @@ var script$5 = defineComponent({
                 index: props.index
             });
         };
+        console.log(attrs);
         return () => [createVNode(NSelect, mergeProps(attrs, {
                 "options": state.options,
                 "consistentMenuWidth": false,
@@ -13389,13 +13391,47 @@ var script$4 = defineComponent({
                 index: props.index
             });
         };
+        const { isStartDate = false, isEndDate = false, connectField } = props.col;
+        const setDateDisabled = (cur, date) => {
+            if (isStartDate && connectField) {
+                return cur > date;
+            }
+            if (isEndDate && connectField) {
+                return cur < date;
+            }
+            return false;
+        };
+        const isDateDisabled = (ts) => {
+            return setDateDisabled(ts, new Date(props.row[connectField]).getTime());
+        };
+        const isTimeDisabled = (ts) => {
+            const date = new Date(props.row[connectField] || ts);
+            const h = date.getHours();
+            const m = date.getMinutes();
+            const s = date.getSeconds();
+            return {
+                isHourDisabled: (hour) => {
+                    return setDateDisabled(hour, h);
+                },
+                isMinuteDisabled: (minute) => {
+                    return setDateDisabled(minute, m);
+                },
+                isSecondDisabled: (second) => {
+                    return setDateDisabled(second, s);
+                }
+            };
+        };
         const config = {
             type: props.col.type || "datetime",
             clearable: props.col.clearable || true,
             disabled: props.col.disabled || false,
             valueFormat: props.col.valueFormat || "yyyy-MM-dd HH:mm:ss",
-            to: false
+            to: false,
+            isDateDisabled: props.col.isDateDisabled || isDateDisabled
         };
+        if (config.type.includes("time")) {
+            config.isTimeDisabled = props.col.isTimeDisabled || isTimeDisabled;
+        }
         return () => createVNode(NDatePicker, mergeProps(attrs, config, {
             "onUpdateFormattedValue": onConfirm
         }), null);
@@ -13465,15 +13501,35 @@ const useEdit = (props, state, emit, xGrid) => {
         await xGrid.value.insertAt(record, getInsertRecords.at(-1));
         xGrid.value.clearActived();
     };
-    const onFormChange = ({ value, row, column }) => {
-        row[column.columnName] = value;
-        emit("formChange", { value, row, column });
+    const getLabel = (opts, value) => {
+        return opts.find((opt) => opt.value === value)?.label || "";
+    };
+    const onFormChange = ({ value, row, column, index }) => {
+        let oldValue = row[column.columnName];
+        if ((column?.formType === "input" || column?.formType === "number") && props.columnConfig?.formValidate) {
+            row[column.columnName] = props.columnConfig?.formValidate({ row, column, current: value, old: row[column.columnName] });
+        }
+        else if (column?.formatMap) {
+            oldValue = {
+                label: row[column.formatMap.label],
+                value: row[column.formatMap.value]
+            };
+            row[column.formatMap.label] = getLabel(row[column.columnName + "_options"] || [], value);
+            row[column.formatMap.value] = value;
+        }
+        else {
+            row[column.columnName] = value;
+        }
+        emit("formChange", { value, row, column, index, oldValue });
     };
     const getDefaultValue = (params, item) => {
         const value = params.row[item.columnName];
         if (item.formType === "select") {
+            if (item.formatMap) {
+                return params.row[item.formatMap.label];
+            }
             if (item.options) {
-                return item.options.find((v) => v.value === value)?.label || "";
+                return item.options.find((v) => v.value == value)?.label || "";
             }
             if (item.queryOptions) {
                 return params.row[`${item.columnName}_options`]?.find((v) => v.value === value)?.label || "";
@@ -39521,7 +39577,7 @@ var script = /* @__PURE__ */ defineComponent({
         });
         const visibleCancelCheckAllBtn = computed(() => {
             let isCurrentPageAllCheck = state.currentPageSelectedLength === state.curAbleCheckedLen;
-            let isMaxChecked = currentCheckedKeys.value.length === props.MAX_CHECK_SIZE;
+            let isMaxChecked = currentCheckedKeys.value.length === props.maxCheckSize;
             let isCheckedTotal = currentCheckedKeys.value.length === props.pageVO.total;
             return isMaxChecked || !isCurrentPageAllCheck || isCheckedTotal;
         });
@@ -39847,6 +39903,7 @@ var script = /* @__PURE__ */ defineComponent({
         const formatterEdit = (params, col) => {
             let { row, column, $rowIndex, rowIndex } = params;
             let formType = column.formType || col.formType || "";
+            let formatMap = column.formatMap || col.formatMap || null;
             if (!formType)
                 return null;
             if (formType === "custom") {
@@ -39865,6 +39922,9 @@ var script = /* @__PURE__ */ defineComponent({
             if (formType === "date") {
                 propsData.defaultFormattedValue = row[col.columnName];
             }
+            else if (formatMap) {
+                propsData.defaultValue = row[formatMap.value];
+            }
             else {
                 propsData.defaultValue = row[col.columnName];
             }
@@ -40302,8 +40362,8 @@ var script = /* @__PURE__ */ defineComponent({
             emit("refreshTable");
         };
         const handleCheckAll = () => {
-            if (props.pageVO.total > props.MAX_CHECK_SIZE) {
-                let text = `\u5F53\u524D\u5217\u8868\u5171${props.pageVO.total}\u6761\u6570\u636E\uFF0C\u4E3A\u4E86\u786E\u4FDD\u7CFB\u7EDF\u5B89\u5168\uFF0C\u53EA\u80FD\u5355\u6B21\u64CD\u4F5C${props.MAX_CHECK_SIZE}\u6761\uFF0C\u4F60\u53EF\u4EE5\u901A\u8FC7\u9AD8\u7EA7\u7B5B\u9009\u8FC7\u6EE4\u518D\u6B21\u5C1D\u8BD5`;
+            if (props.pageVO.total > props.maxCheckSize) {
+                let text = `\u5F53\u524D\u5217\u8868\u5171${props.pageVO.total}\u6761\u6570\u636E\uFF0C\u4E3A\u4E86\u786E\u4FDD\u7CFB\u7EDF\u5B89\u5168\uFF0C\u53EA\u80FD\u5355\u6B21\u64CD\u4F5C${props.maxCheckSize}\u6761\uFF0C\u4F60\u53EF\u4EE5\u901A\u8FC7\u9AD8\u7EA7\u7B5B\u9009\u8FC7\u6EE4\u518D\u6B21\u5C1D\u8BD5`;
                 window.$message.warning(text);
             }
             emit("selectionChangeAll");
@@ -40391,7 +40451,7 @@ var script = /* @__PURE__ */ defineComponent({
         };
         const setChecklist = (list) => {
             return list.map((i) => {
-                i["checked"] = false;
+                i["checked"] = i.checked || false;
                 if (state.isTree == 2) {
                     const treeNodeKey = state.levelLazyLoadSetting.childCountKey;
                     const { isTreeOrList = "" } = props.tableParams;
@@ -40681,8 +40741,8 @@ var script = /* @__PURE__ */ defineComponent({
         const addCheckedRows = (rows) => {
             removeCheckedDisabledRows(state);
             let checkedRows = state.checkedRows;
-            if (currentCheckedKeys.value.length + rows.length > props.MAX_CHECK_SIZE) {
-                window.$message.warning(`\u4E3A\u4E86\u4FDD\u8BC1\u7CFB\u7EDF\u5B89\u5168\uFF0C\u5355\u6B21\u64CD\u4F5C\u6570\u636E\u91CF\u9650\u989D\u4E3A${props.MAX_CHECK_SIZE}\u6761\uFF0C\u4F60\u53EF\u4EE5\u901A\u8FC7\u9AD8\u7EA7\u7B5B\u9009\u8FC7\u6EE4\u540E\u518D\u6B21\u5C1D\u8BD5`);
+            if (currentCheckedKeys.value.length + rows.length > props.maxCheckSize) {
+                window.$message.warning(`\u4E3A\u4E86\u4FDD\u8BC1\u7CFB\u7EDF\u5B89\u5168\uFF0C\u5355\u6B21\u64CD\u4F5C\u6570\u636E\u91CF\u9650\u989D\u4E3A${props.maxCheckSize}\u6761\uFF0C\u4F60\u53EF\u4EE5\u901A\u8FC7\u9AD8\u7EA7\u7B5B\u9009\u8FC7\u6EE4\u540E\u518D\u6B21\u5C1D\u8BD5`);
                 return false;
             }
             let newCheckedRows = rows.filter((row) => {
@@ -40751,10 +40811,21 @@ var script = /* @__PURE__ */ defineComponent({
             emit("setNestTableClickSetting", props.isNestTable);
             emit("showDrawer", theads);
         };
+        let scrollEvent = (params) => {
+            emit("scroll", params);
+        };
+        const initScroll = () => {
+            const { throttle = false, throttleTime = 800, throttleOptions = {} } = props.columnConfig?.scrollConfig || {};
+            if (throttle) {
+                scrollEvent = xeUtils.throttle(scrollEvent, throttleTime, throttleOptions);
+            }
+        };
+        initScroll();
         const handlerScroll = (params) => {
             if (params.isX) {
                 hideFilterWrap(state, props);
             }
+            scrollEvent(params);
         };
         const handleCellMouseenter = ({ column, $event }) => {
             if (column.showOverflow === "title") {
@@ -41478,7 +41549,7 @@ var script = /* @__PURE__ */ defineComponent({
                             key: 0,
                             class: "check-wrap-btn",
                             onClick: handleCheckAll
-                        }, [_ctx.pageVO.total > _ctx.MAX_CHECK_SIZE ? (openBlock(), createElementBlock("span", _hoisted_5, [createCommentVNode(" {{ `\u6700\u5927\u52FE\u9009\u201C${tableName}\u201D ${MAX_CHECK_SIZE}\u6761\u6570\u636E` }} "), createTextVNode(toDisplayString(`\u52FE\u9009\u5168\u90E8\u9875 ${_ctx.MAX_CHECK_SIZE}\u6761\u6570\u636E`), 1)])) : (openBlock(), createElementBlock("span", _hoisted_6, [createCommentVNode(' {{ $t("1.9.598", { name: tableName, total }) }} '), createTextVNode(toDisplayString(`\u52FE\u9009\u5168\u90E8\u9875 ${_ctx.pageVO.total}\u6761\u6570\u636E`), 1)]))])) : (openBlock(), createElementBlock("p", {
+                        }, [_ctx.pageVO.total > _ctx.maxCheckSize ? (openBlock(), createElementBlock("span", _hoisted_5, [createCommentVNode(" {{ `\u6700\u5927\u52FE\u9009\u201C${tableName}\u201D ${maxCheckSize}\u6761\u6570\u636E` }} "), createTextVNode(toDisplayString(`\u52FE\u9009\u5168\u90E8\u9875 ${_ctx.maxCheckSize}\u6761\u6570\u636E`), 1)])) : (openBlock(), createElementBlock("span", _hoisted_6, [createCommentVNode(' {{ $t("1.9.598", { name: tableName, total }) }} '), createTextVNode(toDisplayString(`\u52FE\u9009\u5168\u90E8\u9875 ${_ctx.pageVO.total}\u6761\u6570\u636E`), 1)]))])) : (openBlock(), createElementBlock("p", {
                             key: 1,
                             class: "check-wrap-btn",
                             onClick: handleCancelAllCheck
@@ -41540,6 +41611,7 @@ var script = /* @__PURE__ */ defineComponent({
                         iconOpen: "iconfont icon-a-xitongtubiaozhediejian",
                         iconClose: "iconfont icon-a-xitongtubiaotianjia"
                     },
+                    "keyboard-config": _ctx.columnConfig.keyboardConfig || {},
                     onCellDblclick: rowdblclick,
                     onCellClick: handlerClickRow,
                     onCheckboxChange: selectionChange,
@@ -41590,7 +41662,7 @@ var script = /* @__PURE__ */ defineComponent({
                             }
                         })]),
                     _: 3
-                }, 8, ["seq-config", "tree-config", "row-id", "show-footer", "checkbox-config", "row-style", "edit-config", "expand-config"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
+                }, 8, ["seq-config", "tree-config", "row-id", "show-footer", "checkbox-config", "row-style", "edit-config", "expand-config", "keyboard-config"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
                     class: "refresh",
                     onClick: hanldeClickRefresh
                 }, [createVNode(unref(NIcon), {