cnhis-design-vue 3.0.9 → 3.1.2

package/CHANGELOG.md

@@ -2,6 +2,48 @@
 
 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.2](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/compare/v3.1.1...v3.1.2) (2022-06-02)
+
+
+### Features
+
+* 打印按钮无数据时提示配置，点击前增加前置事件，代码优化 ([abadb9c](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/abadb9c9531f9172c59736dc7479a65b435360f2))
+
+
+### Bug Fixes
+
+* 表格编辑更改data数据页面数据未联动 ([3e30da2](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/3e30da2dbf346217626811a8745a8e7286750c8c))
+* 下拉未匹配到的默认值没有显示、表格编辑下拉被表格挡住 ([e4260f6](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/e4260f61a137d2248d7940d7a77d2e4a3cbcf526))
+* 循环引用bigtable组件导致组件间sate数据联动的问题 ([472a415](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/472a4157b599c711ae2a90e72dee2d3dacd17a0e))
+* bigtable表格高度自适应 ([f462a97](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/f462a978b4b0a30e92a8b4b2a7bf5082c0bf0f91))
+
+### [3.1.1](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/compare/v3.1.0...v3.1.1) (2022-06-01)
+
+
+### Features
+
+* 表格编辑调接口下拉框支持关键字搜索 ([93157a8](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/93157a8e6cfca91f7f146c61ba7986eaa2716d0f))
+* 表格编辑默认状态设置、校验规则可配置 ([e9618a5](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/e9618a57b9c26dc1a354650bf631eadb91cd0552))
+
+
+### Bug Fixes
+
+* 打印组件选择格式后下拉菜单未收起，也没有选定的格式样式标识 ([f64f656](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/f64f656dc87c0efef1fea114a57fdc94c179b4b6))
+* big-table初始化会强制默认选中所有行 ([55eadeb](http://120.25.59.85:3000/cnhis-frontend/cnhis-design-vue/commit/55eadebe653f366d4fa27d5d82cfef6347d7f322))
+
+## [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)
 
 

package/es/big-table/index.js

@@ -13323,21 +13323,34 @@ var script$5 = defineComponent({
     emits: ["setOptions", "formChange"],
     setup(props, { attrs, slots, emit }) {
         const state = reactive({
-            options: []
+            options: [],
+            loading: false,
+            keyword: "",
+            config: {}
         });
         const setOptions = async () => {
             if (props.col.options) {
                 state.options = JSON.parse(JSON.stringify(props.col.options));
             }
             else {
-                const optionsName = `${props.col.columnName}_options`;
-                state.options = props.row[optionsName] || await props.col.queryOptions();
-                if (!props.row[optionsName]) {
-                    emit("setOptions", state.options);
-                }
+                `${props.col.columnName}_options`;
+                const obj = {
+                    keyword: state.keyword,
+                    row: props.row,
+                    column: props.col,
+                    index: props.index
+                };
+                state.options = await props.col.queryOptions(obj);
+                state.loading = false;
+                emit("setOptions", state.options);
             }
         };
-        setOptions();
+        let selectSearch = (value) => {
+            state.keyword = value;
+            state.loading = true;
+            setOptions();
+        };
+        selectSearch = xeUtils.debounce(selectSearch, 800);
         const onUpdateValue = (value) => {
             emit("formChange", {
                 value,
@@ -13346,14 +13359,24 @@ var script$5 = defineComponent({
                 index: props.index
             });
         };
-        console.log(attrs);
-        return () => [createVNode(NSelect, mergeProps(attrs, {
+        const init = () => {
+            if (props.col.options) {
+                setOptions();
+            }
+            else {
+                state.config.remote = true;
+                state.config.onSearch = selectSearch;
+                selectSearch("");
+            }
+        };
+        init();
+        return () => [createVNode(NSelect, mergeProps(attrs, state.config, {
                 "options": state.options,
                 "consistentMenuWidth": false,
                 "clearable": true,
                 "filterable": true,
-                "to": false,
                 "placeholder": "\u8BF7\u9009\u62E9",
+                "loading": state.loading,
                 "onUpdateValue": onUpdateValue
             }), null)];
     }
@@ -13426,7 +13449,6 @@ var script$4 = defineComponent({
             clearable: props.col.clearable || true,
             disabled: props.col.disabled || false,
             valueFormat: props.col.valueFormat || "yyyy-MM-dd HH:mm:ss",
-            to: false,
             isDateDisabled: props.col.isDateDisabled || isDateDisabled
         };
         if (config.type.includes("time")) {
@@ -13529,12 +13551,11 @@ const useEdit = (props, state, emit, xGrid) => {
                 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 || value || "";
             }
             if (item.queryOptions) {
-                return params.row[`${item.columnName}_options`]?.find((v) => v.value === value)?.label || "";
+                return params.row[`${item.columnName}_options`]?.find((v) => v.value === value)?.label || value || "";
             }
-            return value;
         }
         return value;
     };
@@ -39565,7 +39586,8 @@ var script = /* @__PURE__ */ defineComponent({
         const GROUP_TITLE_KEY = "group-show-title";
         window.$message = useMessage();
         const xGrid = ref(null);
-        const state = reactive(bigTableState);
+        const copyState = xeUtils.clone(bigTableState, true);
+        const state = reactive(copyState);
         const { formatData, htmlToText, getBtnStyle } = useFormat(state);
         const { imgs2imgArr, parseDurationValue, parseCombinationValue, formatFieldText } = useTableParse(formatData);
         const { allSelectedLength, checkOperateCurrentTable, setRowStatus, resetBatchOperationRowStatus, checkListFormUnionSettingParamsList, handleClickCancelBtnByInline, setAllRowInlineStatus, hideSelectCloumns, handleEditFormLength, resetOperationRowStatus, recordClickBtnInfo, getInlineOpreateRow } = useBatchEditing(props, state, emit, xGrid);
@@ -39741,7 +39763,7 @@ var script = /* @__PURE__ */ defineComponent({
                 return;
             let currentPageTableData = table.getTableData()?.tableData;
             let currentPageSelectedRows = currentPageTableData.filter((row) => {
-                return currentCheckedKeys.value.includes(row[props.primaryKey]);
+                return row[props.primaryKey] ? currentCheckedKeys.value.includes(row[props.primaryKey]) : false;
             });
             setCurrentCheckedLength();
             if (!currentPageSelectedRows || !currentPageSelectedRows.length) {
@@ -39862,6 +39884,9 @@ var script = /* @__PURE__ */ defineComponent({
                             if (!isEdit || item.columnName === "operatorColumn" || !item.isEdit) {
                                 return formatter(params, item);
                             }
+                            else if (isEdit && item.isEdit && item.checkEditStatus && item.checkEditStatus(params)) {
+                                return formatterEdit(params, item);
+                            }
                             else {
                                 return createVNode("span", null, [getDefaultValue(params, item)]);
                             }
@@ -39920,13 +39945,13 @@ var script = /* @__PURE__ */ defineComponent({
                 onFormChange
             };
             if (formType === "date") {
-                propsData.defaultFormattedValue = row[col.columnName];
+                propsData.formattedValue = row[col.columnName];
             }
             else if (formatMap) {
-                propsData.defaultValue = row[formatMap.value];
+                propsData.value = row[formatMap.value];
             }
             else {
-                propsData.defaultValue = row[col.columnName];
+                propsData.value = row[col.columnName];
             }
             if (formType === "select") {
                 propsData.onSetOptions = (options) => row[`${col.columnName}_options`] = options;
@@ -41413,7 +41438,8 @@ var script = /* @__PURE__ */ defineComponent({
                 loadData(value);
             });
         }, {
-            immediate: true
+            immediate: true,
+            deep: true
         });
         watch(() => currentCheckedKeys, (val) => {
             setVisibleCheckAllWrap(state, props, currentCheckedKeys.value);
@@ -41563,7 +41589,7 @@ var script = /* @__PURE__ */ defineComponent({
                     "highlight-current-row": "",
                     "show-footer-overflow": "title",
                     "keep-source": "",
-                    height: "auto",
+                    height: props.height ? "auto" : "unset",
                     resizable: "",
                     "auto-resize": "",
                     "seq-config": unref(handleSeqConfig),
@@ -41612,6 +41638,7 @@ var script = /* @__PURE__ */ defineComponent({
                         iconClose: "iconfont icon-a-xitongtubiaotianjia"
                     },
                     "keyboard-config": _ctx.columnConfig.keyboardConfig || {},
+                    "edit-rules": _ctx.columnConfig.editRules || {},
                     onCellDblclick: rowdblclick,
                     onCellClick: handlerClickRow,
                     onCheckboxChange: selectionChange,
@@ -41662,7 +41689,7 @@ var script = /* @__PURE__ */ defineComponent({
                             }
                         })]),
                     _: 3
-                }, 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", {
+                }, 8, ["height", "seq-config", "tree-config", "row-id", "show-footer", "checkbox-config", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
                     class: "refresh",
                     onClick: hanldeClickRefresh
                 }, [createVNode(unref(NIcon), {