cnhis-design-vue 3.0.8 → 3.1.1

package/es/index.js

@@ -38481,21 +38481,34 @@ var script$d = 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,
@@ -38504,13 +38517,25 @@ var script$d = defineComponent({
                 index: props.index
             });
         };
-        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)];
     }
@@ -38548,13 +38573,47 @@ var script$c = 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);
@@ -38624,13 +38683,33 @@ const useEdit = (props, state, emit, xGrid) => {
         await xGrid.value.insertAt(record, getInsertRecords.at(-1));
         xGrid.value.clearActived();
     };
+    const getLabel = (opts, value) => {
+        return opts.find((opt) => opt.value === value)?.label || "";
+    };
     const onFormChange = ({ value, row, column, index }) => {
-        row[column.columnName] = value;
-        emit("formChange", { 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 || "";
             }
@@ -39687,7 +39766,7 @@ var script$8 = /* @__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) {
@@ -39808,6 +39887,9 @@ var script$8 = /* @__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)]);
                             }
@@ -39849,6 +39931,7 @@ var script$8 = /* @__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") {
@@ -39867,6 +39950,9 @@ var script$8 = /* @__PURE__ */ defineComponent({
             if (formType === "date") {
                 propsData.defaultFormattedValue = row[col.columnName];
             }
+            else if (formatMap) {
+                propsData.defaultValue = row[formatMap.value];
+            }
             else {
                 propsData.defaultValue = row[col.columnName];
             }
@@ -40757,7 +40843,7 @@ var script$8 = /* @__PURE__ */ defineComponent({
             emit("scroll", params);
         };
         const initScroll = () => {
-            const { throttle = false, throttleTime = 800, throttleOptions = {} } = props.columnConfig?.scrollConfig;
+            const { throttle = false, throttleTime = 800, throttleOptions = {} } = props.columnConfig?.scrollConfig || {};
             if (throttle) {
                 scrollEvent = xeUtils.throttle(scrollEvent, throttleTime, throttleOptions);
             }
@@ -41554,6 +41640,7 @@ var script$8 = /* @__PURE__ */ defineComponent({
                         iconClose: "iconfont icon-a-xitongtubiaotianjia"
                     },
                     "keyboard-config": _ctx.columnConfig.keyboardConfig || {},
+                    "edit-rules": _ctx.columnConfig.editRules || {},
                     onCellDblclick: rowdblclick,
                     onCellClick: handlerClickRow,
                     onCheckboxChange: selectionChange,
@@ -41604,7 +41691,7 @@ var script$8 = /* @__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, ["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), {
@@ -45231,18 +45318,65 @@ const __default__$1 = create({
 var script$2 = /* @__PURE__ */ defineComponent({
     ...__default__$1,
     props: {
-        btnText: { type: String, required: false, default: "\u6253\u5370" },
-        printText: { type: String, required: false, default: "\u76F4\u63A5\u6253\u5370" },
-        previewText: { type: String, required: false, default: "\u6253\u5370\u9884\u89C8" },
-        formatEditText: { type: String, required: false, default: "\u683C\u5F0F\u7F16\u8F91" },
-        identityVerificationTitle: { type: String, required: false, default: "\u6253\u5370\u670D\u52A1\u8EAB\u4EFD\u6821\u9A8C" },
-        params: { type: Array, required: false, default: () => [] },
-        prevFn: { type: Function, required: false, default: () => Promise.resolve() },
-        verifyUser: { type: Function, required: false, default: () => Promise.resolve() },
-        queryPrintFormatByNumber: { type: Function, required: true, default: () => Promise.resolve({}) },
-        queryTemplateParams: { type: Function, required: false, default: () => Promise.resolve({}) },
-        strategy: { type: String, required: false, default: "MULTI" },
-        printParams: { type: Array, required: false }
+        btnText: {
+            type: String,
+            required: false,
+            default: "\u6253\u5370"
+        },
+        printText: {
+            type: String,
+            required: false,
+            default: "\u76F4\u63A5\u6253\u5370"
+        },
+        previewText: {
+            type: String,
+            required: false,
+            default: "\u6253\u5370\u9884\u89C8"
+        },
+        formatEditText: {
+            type: String,
+            required: false,
+            default: "\u683C\u5F0F\u7F16\u8F91"
+        },
+        identityVerificationTitle: {
+            type: String,
+            required: false,
+            default: "\u6253\u5370\u670D\u52A1\u8EAB\u4EFD\u6821\u9A8C"
+        },
+        params: {
+            type: Array,
+            required: false,
+            default: () => []
+        },
+        prevFn: {
+            type: Function,
+            required: false,
+            default: () => Promise.resolve()
+        },
+        verifyUser: {
+            type: Function,
+            required: false,
+            default: () => Promise.resolve()
+        },
+        queryPrintFormatByNumber: {
+            type: Function,
+            required: true,
+            default: () => Promise.resolve({})
+        },
+        queryTemplateParams: {
+            type: Function,
+            required: false,
+            default: () => Promise.resolve({})
+        },
+        strategy: {
+            type: String,
+            required: false,
+            default: "MULTI"
+        },
+        printParams: {
+            type: Array,
+            required: false
+        }
     },
     emits: ["success", "error"],
     setup(__props, { emit }) {
@@ -45263,27 +45397,30 @@ var script$2 = /* @__PURE__ */ defineComponent({
             watchPrintParamsReformatFn: null,
             spinTimer: null
         });
-        const options = reactive([
-            {
+        const options = reactive([{
                 label: props.printText,
                 key: "printText"
-            },
-            {
+            }, {
                 label: props.previewText,
                 key: "previewText"
-            },
-            {
+            }, {
                 label: props.formatEditText,
                 key: "formatEditText"
-            }
-        ]);
+            }]);
         const currentFormatItem = computed(() => {
             if (!state.currentFormatId)
                 return {};
             let id = state.currentFormatId;
             return state.formatList.find((item) => item.id === id);
         });
-        computed(() => currentFormatItem.value.name || "\u683C\u5F0F\u9009\u62E9");
+        const formatTitle = computed(() => currentFormatItem.value.name || "\u683C\u5F0F\u9009\u62E9");
+        const renderLabel = (option) => {
+            return createVNode("span", {
+                "class": {
+                    "active": option.key === state.currentFormatId
+                }
+            }, [option.label]);
+        };
         const getTemplateIdByFormatId = (id) => {
             let find = state.formatList.find((item) => item.id === id);
             return find.templateId;
@@ -45413,6 +45550,7 @@ var script$2 = /* @__PURE__ */ defineComponent({
                     break;
                 default:
                     state.currentFormatId = key;
+                    state.visible = false;
                     break;
             }
         };
@@ -45440,6 +45578,19 @@ var script$2 = /* @__PURE__ */ defineComponent({
             let findDefault = list.find((item) => item[key] == 1);
             return findDefault?.id || list[0].id;
         };
+        const setOptions = () => {
+            const children = state.formatList.map((v) => {
+                return {
+                    label: v.name,
+                    key: v.id
+                };
+            });
+            options.unshift({
+                label: formatTitle.value,
+                key: "format",
+                children
+            });
+        };
         const formatFormatList = (list) => {
             let formatList = [];
             list.forEach((item) => {
@@ -45505,6 +45656,7 @@ var script$2 = /* @__PURE__ */ defineComponent({
             state.formatList = formatListResult ? formatFormatList(formatListResult.obj) : [];
             console.log("formatListResult", formatListResult);
             state.currentFormatId = getDefaultFormatId(state.formatList, "defaultFlag");
+            setOptions();
             if (!state.currentFormatId) {
                 window.$message.error("\u83B7\u53D6\u6253\u5370\u683C\u5F0F\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\uFF01");
                 return requestError();
@@ -45572,48 +45724,51 @@ var script$2 = /* @__PURE__ */ defineComponent({
             if (!val?.length)
                 return false;
             reformatPrintParams();
-        }, { deep: true });
+        }, {
+            deep: true
+        });
         return (_ctx, _cache) => {
-            return openBlock(), createElementBlock("span", { onClick: handleClickWrap }, [
-                createVNode(unref(NDropdown), {
+            return openBlock(), createElementBlock("span", {
+                onClick: handleClickWrap
+            }, [createVNode(unref(NDropdown), {
+                    class: "rowFoldHideBtnList-dropdown",
                     placement: "bottom-start",
                     show: unref(state).visible,
                     onClickoutside: handleClickOutside,
                     options: unref(options),
-                    onSelect: handleSelect
+                    onSelect: handleSelect,
+                    "render-label": renderLabel
                 }, {
-                    default: withCtx(() => [
-                        renderSlot(_ctx.$slots, "button", {
+                    default: withCtx(() => [renderSlot(_ctx.$slots, "button", {
                             handleClickPrintBtn: handleClickBtn,
                             printSpinning: unref(state).spinning,
                             printbtnText: __props.btnText,
                             printVisible: unref(state).visible
-                        }, () => [
-                            createVNode(unref(NButton), {
+                        }, () => [createVNode(unref(NButton), {
                                 class: "dropdown-button",
-                                style: { "margin": "0 8px 8px 0" },
+                                style: {
+                                    "margin": "0 8px 8px 0"
+                                },
                                 onClick: withModifiers(handleClickBtn, ["stop"])
                             }, {
-                                default: withCtx(() => [
-                                    unref(state).spinning ? (openBlock(), createBlock(unref(NIcon), {
+                                default: withCtx(() => [unref(state).spinning ? (openBlock(), createBlock(unref(NIcon), {
                                         key: 0,
                                         component: unref(Reload),
-                                        style: { "line-height": "10px" }
-                                    }, null, 8, ["component"])) : createCommentVNode("v-if", true),
-                                    createTextVNode(" " + toDisplayString(__props.btnText) + " ", 1),
-                                    createVNode(unref(NIcon), { component: unref(ChevronDown) }, null, 8, ["component"])
-                                ]),
+                                        style: {
+                                            "line-height": "10px"
+                                        }
+                                    }, null, 8, ["component"])) : createCommentVNode("v-if", true), createTextVNode(" " + toDisplayString(__props.btnText) + " ", 1), createVNode(unref(NIcon), {
+                                        component: unref(ChevronDown)
+                                    }, null, 8, ["component"])]),
                                 _: 1
-                            }, 8, ["onClick"])
-                        ])
-                    ]),
+                            }, 8, ["onClick"])])]),
                     _: 3
-                }, 8, ["show", "options"]),
-                createVNode(script$3, mergeProps({
+                }, 8, ["show", "options"]), createVNode(script$3, mergeProps({
                     modelValue: unref(state).identityVerification.visible,
                     "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => unref(state).identityVerification.visible = $event)
-                }, _ctx.$attrs, { onSuccess: verifiySuccess }), null, 16, ["modelValue"])
-            ]);
+                }, _ctx.$attrs, {
+                    onSuccess: verifiySuccess
+                }), null, 16, ["modelValue"])]);
         };
     }
 });

package/es/select-person/index.css

@@ -593,6 +593,10 @@ body > .vxe-table--tooltip-wrapper {
   margin-bottom: 8px;
 }
 
+.rowFoldHideBtnList-dropdown .n-dropdown-menu-wrapper span.active {
+  color: #5585f5;
+}
+
 .login-form[data-v-06588d4e] {
   padding-top: 15px;
 }
@@ -732,48 +736,6 @@ body > .vxe-table--tooltip-wrapper {
   z-index: 2001;
 }
 
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] {
-  width: 100%;
-  margin-bottom: 16px;
-  overflow: hidden;
-  cursor: pointer;
-  color: #2e2e2e;
-}
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-      -ms-flex-pack: center;
-          justify-content: center;
-  -webkit-box-align: center;
-  -webkit-align-items: center;
-      -ms-flex-align: center;
-          align-items: center;
-  width: 100%;
-  height: 60px;
-  padding: 0 8px;
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-  margin-bottom: 8px;
-  background: #f3f5f8;
-}
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966]-input[data-v-55852966] {
-  width: 85%;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  cursor: pointer !important;
-}
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"][disabled][data-v-55852966],
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"][disabled][data-v-55852966],
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"].disabled[data-v-55852966],
-.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"].disabled[data-v-55852966] {
-  cursor: pointer !important;
-}
-
 .DragFormRightItem[data-v-2d9603cc] {
   position: relative;
 }
@@ -845,6 +807,64 @@ body > .vxe-table--tooltip-wrapper {
   color: red;
 }
 
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] {
+  width: 100%;
+  margin-bottom: 16px;
+  overflow: hidden;
+  cursor: pointer;
+  color: #2e2e2e;
+}
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+      -ms-flex-align: center;
+          align-items: center;
+  width: 100%;
+  height: 60px;
+  padding: 0 8px;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
+  margin-bottom: 8px;
+  background: #f3f5f8;
+}
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966]-input[data-v-55852966] {
+  width: 85%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  cursor: pointer !important;
+}
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"][disabled][data-v-55852966],
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"][disabled][data-v-55852966],
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="radio"].disabled[data-v-55852966],
+.DragFormLeftItem[data-v-55852966] .left-content[data-v-55852966] .style-box[data-v-55852966] input[type="checkbox"].disabled[data-v-55852966] {
+  cursor: pointer !important;
+}
+
+
+.popver-content {
+  height: 400px;
+  overflow: hidden;
+  overflow-y: auto;
+}
+.popver-ul {
+  margin-bottom: 10px;
+}
+.ul-title {
+  font-size: 14px;
+  font-weight: 400;
+  color: rgba(145, 159, 190, 1);
+  line-height: 20px;
+}
+
 ul[data-v-726261b7] {
   margin: 0;
   padding: 0;
@@ -1027,22 +1047,6 @@ ul[data-v-726261b7] {
   text-overflow: ellipsis;
 }
 
-
-.popver-content {
-  height: 400px;
-  overflow: hidden;
-  overflow-y: auto;
-}
-.popver-ul {
-  margin-bottom: 10px;
-}
-.ul-title {
-  font-size: 14px;
-  font-weight: 400;
-  color: rgba(145, 159, 190, 1);
-  line-height: 20px;
-}
-
 .df[data-v-3b67e11b] {
   display: -webkit-box;
   display: -webkit-flex;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.0.8",
+  "version": "3.1.1",
   "main": "es/index.js",
   "module": "es/index.js",
   "scripts": {

package/packages/big-table/src/BigTable.vue

@@ -97,6 +97,7 @@
         iconClose: 'iconfont icon-a-xitongtubiaotianjia',
       }"
       :keyboard-config="columnConfig.keyboardConfig || {}"
+      :edit-rules="columnConfig.editRules || {}"
       @cell-dblclick="rowdblclick"
       @cell-click="handlerClickRow"
       @checkbox-change="selectionChange"
@@ -475,7 +476,7 @@ const setCurrentPageRowChecked = () => {
   if (!table) return;
   let currentPageTableData = table.getTableData()?.tableData;
   let currentPageSelectedRows = currentPageTableData.filter((row: any) => {
-    return currentCheckedKeys.value.includes(row[props.primaryKey]);
+    return (row[props.primaryKey] ? currentCheckedKeys.value.includes(row[props.primaryKey]) : false)
   });
   setCurrentCheckedLength();
   if (!currentPageSelectedRows || !currentPageSelectedRows.length) {
@@ -655,6 +656,8 @@ const formatColumns = (map: any) => {
         default: (params: any) => {
           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 <span>{getDefaultValue(params, item)}</span>
           }
@@ -704,6 +707,7 @@ const formatColumns = (map: any) => {
 const formatterEdit = (params: any, col: any) => {
   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') {
     return col.slotFn(params)
@@ -717,9 +721,11 @@ const formatterEdit = (params: any, col: any) => {
     // vModel: [row[col.columnName], formType === 'date' ? 'formattedValue' :'value'],
     type: formType,
     onFormChange
-  }
+  } 
   if (formType === 'date') {
     propsData.defaultFormattedValue = row[col.columnName]
+  } else if(formatMap){
+    propsData.defaultValue = row[formatMap.value]
   } else {
     propsData.defaultValue = row[col.columnName]
   }
@@ -1689,7 +1695,7 @@ let scrollEvent = (params: any) => {
   emit('scroll', params)
 }
 const initScroll = () => {
-  const { throttle = false, throttleTime = 800, throttleOptions = {} } = props.columnConfig?.scrollConfig
+  const { throttle = false, throttleTime = 800, throttleOptions = {} } = props.columnConfig?.scrollConfig || {}
   if (throttle) {
     scrollEvent = vexutils.throttle(scrollEvent, throttleTime, throttleOptions)
   }