cnhis-design-vue 3.0.8 → 3.0.9

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.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)
 
 

package/es/big-table/index.js

@@ -13346,6 +13346,7 @@ var script$5 = defineComponent({
                 index: props.index
             });
         };
+        console.log(attrs);
         return () => [createVNode(NSelect, mergeProps(attrs, {
                 "options": state.options,
                 "consistentMenuWidth": false,
@@ -13390,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);
@@ -13466,13 +13501,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 || "";
             }
@@ -39848,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") {
@@ -39866,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];
             }
@@ -40756,7 +40815,7 @@ var script = /* @__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);
             }

package/es/index.js

@@ -38504,6 +38504,7 @@ var script$d = defineComponent({
                 index: props.index
             });
         };
+        console.log(attrs);
         return () => [createVNode(NSelect, mergeProps(attrs, {
                 "options": state.options,
                 "consistentMenuWidth": false,
@@ -38548,13 +38549,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 +38659,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 || "";
             }
@@ -39849,6 +39904,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 +39923,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 +40816,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);
             }

package/package.json

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

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

@@ -704,6 +704,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 +718,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 +1692,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)
   }

package/packages/big-table/src/components/edit-form/edit-date.vue

@@ -27,12 +27,46 @@ export default defineComponent({
     const onConfirm = (value: any) => {
       emit('formChange', { value, row: props.row, column: props.col, index: props.index })
     }
-    const config = {
+    const { isStartDate = false, isEndDate = false, connectField } = props.col
+    const setDateDisabled = (cur: number, date: number) => {
+      if (isStartDate && connectField) {
+        return cur > date
+      }
+      if(isEndDate && connectField) {
+        return cur < date
+      }
+      return false
+    }
+    const isDateDisabled = (ts: number) => {
+      return setDateDisabled(ts, new Date(props.row[connectField]).getTime())
+    }
+    const isTimeDisabled = (ts: number) => {
+      const date = new Date(props.row[connectField] || ts)
+      const h = date.getHours()
+      const m = date.getMinutes()
+      const s = date.getSeconds()
+      return {
+        isHourDisabled: (hour: number) => {
+          return setDateDisabled(hour, h)
+        },
+        isMinuteDisabled: (minute: number) => {
+          return setDateDisabled(minute, m)
+        },
+        isSecondDisabled: (second: number) => {
+          return setDateDisabled(second, s)
+        }
+      }
+    }
+    const config: any = {
       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 () => <NDatePicker {...attrs} {...config} onUpdateFormattedValue={onConfirm} />
   }

package/packages/big-table/src/components/edit-form/edit-select.vue

@@ -48,6 +48,7 @@ export default defineComponent({
       emit('formChange', { value, row: props.row, column: props.col, index: props.index })
     }
 
+    console.log(attrs) 
     return () => [
       <NSelect
         {...attrs} 

package/packages/big-table/src/hooks/useEdit.ts

@@ -82,14 +82,33 @@ export const useEdit = (props: any, state: any, emit: any, xGrid: any) => {
     xGrid.value.clearActived()
   }
 
+  const getLabel = (opts: any[], value: any): any => {
+    return opts.find((opt: any) => opt.value === value)?.label || '';
+  };
+
   const onFormChange = ({ value, row, column, index }: {value: number | string | null, row: any, column: any, index: number}) => {
-    row[column.columnName] = value
-    emit('formChange', { value, row, column, index })
+    let oldValue: any = 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: any, item: any) => {
     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: any) => v.value == value)?.label || ''
       }