cnhis-design-vue 3.1.33-beta.10 → 3.1.33-beta.13

package/es/components/big-table/src/BigTable.vue2.js

@@ -529,7 +529,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         editTrigger: state.editConfig.trigger
       };
       if (["date", "time"].includes(formType)) {
-        propsData.formattedValue = row[col.columnName];
+        propsData.formattedValue = row[col.columnName] || void 0;
       } else if (formatMap) {
         propsData.value = row[formatMap.value];
       } else {

package/es/components/big-table/src/components/edit-form/edit-input.js

@@ -35,7 +35,7 @@ var EditInput = defineComponent({
     const {
       formRef
     } = useCommon(props, attrs);
-    const __value = ref(attrs.value);
+    const __value = ref(props.type === "number" ? attrs.value || void 0 : attrs.value);
     const commData = {
       row: props.row,
       column: props.col,

package/es/components/iho-table/src/hooks/useColumnConfigAdaptor.js

@@ -1,4 +1,4 @@
-import { cloneDeep, isString, isFunction, isArray } from 'lodash-es';
+import { cloneDeep, isString, isFunction, pick, isArray } from 'lodash-es';
 import { isObject } from '@vue/shared';
 
 const REMOVE_PROPERTY = Symbol("remove property");
@@ -139,6 +139,11 @@ function useColumnConfigAdaptor() {
             }
           }
         });
+        result.componentProps = Object.assign(
+          {},
+          result.componentProps,
+          pick(result, ["options", "multiple", "isDateDisabled"])
+        );
         return result;
         function valueTransfer(value, rule) {
           var _a, _b;

package/es/components/iho-table/src/plugins/rowGroupSettingPlugin/rowGroupUtils.js

@@ -12,13 +12,14 @@ function createRowGroupList(rowGroupSetting, fieldList, getKey = (field) => fiel
       if (!isArray(groupSetting.list) || !groupSetting.list.length)
         return;
       const children = [];
+      let currentGroupItem = null;
       groupSetting.list.forEach((fieldName, idx) => {
-        const groupIdx = groupIndexSearcher(fieldName, result);
+        const groupIdx = groupIndexSearcher(fieldName, result, currentGroupItem);
         if (!~groupIdx)
           return;
         children.push(result[groupIdx]);
         if (idx === 0) {
-          result.splice(groupIdx, 1, { fieldName: groupSetting.title, children });
+          result.splice(groupIdx, 1, currentGroupItem = { fieldName: groupSetting.title, children });
         } else {
           result.splice(groupIdx, 1);
         }
@@ -26,8 +27,10 @@ function createRowGroupList(rowGroupSetting, fieldList, getKey = (field) => fiel
     });
   });
   return result;
-  function groupIndexSearcher(fieldName, groupList) {
-    return groupList.findIndex((group) => (isObject(group) ? group.fieldName : group) === fieldName);
+  function groupIndexSearcher(fieldName, groupList, currentGroupItem) {
+    return groupList.findIndex(
+      (group) => group !== currentGroupItem && (isObject(group) ? group.fieldName : group) === fieldName
+    );
   }
 }
 function groupTraverser(groupList, replacer) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.33-beta.10",
+	"version": "3.1.33-beta.13",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "1bc2b75dcb13f7249f473c7064cda9542d0ffbee"
+	"gitHead": "2ffdc7d8612c26b671ff9e546ddda15f0da24f29"
 }