cnhis-design-vue 3.4.0-beta.7 → 3.4.0-beta.70

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/timeRendererPlugin/index.js

@@ -36,7 +36,7 @@ function timeRendererPlugin() {
       });
     },
     apply(hooks) {
-      useAutoFocus().bindAutoFocusConfig(pluginName, EDITABLE_WIDGET_TYPE.TIME, ".n-input__input-el", {
+      useAutoFocus(hooks).bindAutoFocusConfig(pluginName, EDITABLE_WIDGET_TYPE.TIME, ".n-input__input-el", {
         after: (fieldItem) => {
           Reflect.set(fieldItem.editRender, "autoselect", true);
           return fieldItem;

package/es/components/iho-table/src/plugins/verticalTablePlugin/src/utils.d.ts

@@ -28,7 +28,7 @@ export declare function getOriginBasePayload(row: AnyObject, column: VxeTableDef
     $rowIndex: number;
     column: VxeTableDefines.ColumnInfo;
     fixed: import("vxe-table").VxeColumnPropTypes.Fixed;
-    type: "checkbox" | "radio" | "seq" | "expand" | "html";
+    type: "html" | "seq" | "radio" | "checkbox" | "expand";
 };
 export declare function findFixedLeftFields(fieldList: IhoTableFieldItem[]): IhoTableFieldItem[];
 export declare function createVerticalStateHandler(verticalState: IhoTableVerticalState): {

package/es/components/iho-table/src/plugins/verticalTablePlugin/src/utils.js

@@ -35,9 +35,12 @@ function bindHeaderInfoAndFlatten(fieldList, depth) {
     Object.entries(fieldItem).forEach(([key, value]) => {
       if (!key.match(/^header_(\d+)$/))
         return;
+      if (key === `header_${depth}`)
+        return;
       if (value !== prevItem[key] || !value)
         return;
-      if (key === `header_${depth}`)
+      const fieldKey = key + "_key";
+      if (fieldItem[fieldKey] && prevItem[fieldKey] && fieldItem[fieldKey] !== prevItem[fieldKey])
         return;
       fieldItem[`${key}_colspan`] = 0;
       fieldItem[`${key}_rowspan`] = 0;
@@ -47,6 +50,7 @@ function bindHeaderInfoAndFlatten(fieldList, depth) {
   function setHeaderInfo(field, depth2) {
     if (!field.parent) {
       field[`header_${depth2}`] = field.title;
+      field[`header_${depth2}_key`] = field.val_key;
       range(depth2 + 1).forEach((idx) => {
         field[`header_${idx}_colspan`] = idx === depth2 ? depth2 + 1 : 0;
         field[`header_${idx}_rowspan`] = idx === depth2 ? 1 : 0;
@@ -61,15 +65,17 @@ function bindHeaderInfoAndFlatten(fieldList, depth) {
       fieldLine.unshift(currentField);
     }
     range(depth2 + 1).forEach((index) => {
-      var _a, _b;
+      var _a, _b, _c, _d;
       const item = fieldLine[index];
       if (!item) {
         field[`header_${index}`] = "";
+        field[`header_${index}_key`] = "";
         field[`header_${index}_colspan`] = 0;
         field[`header_${index}_rowspan`] = 0;
         return;
       }
       field[`header_${index}`] = (_b = (_a = fieldLine[index]) == null ? void 0 : _a.title) != null ? _b : "";
+      field[`header_${index}_key`] = (_d = (_c = fieldLine[index]) == null ? void 0 : _c.val_key) != null ? _d : "";
       field[`header_${index}_colspan`] = index < fieldDepth ? 1 : depth2 - fieldDepth + 1;
       field[`header_${index}_rowspan`] = getChildrenNum(item);
     });

package/es/components/iho-table/src/types/index.d.ts

@@ -156,7 +156,9 @@ export declare namespace IhoTableLowCodeField {
         }>;
     }>;
     type FilterSetting = Partial<{
-        daterange: boolean;
+        daterange: Partial<{
+            datePickerProps: AnyObject;
+        }>;
         type: 'daterange' | 'text' | 'remote';
         pagination: boolean;
         text: Partial<{

package/es/components/iho-table/src/utils/index.d.ts

@@ -28,10 +28,10 @@ export declare function useIhoTableFormEvent(payloadRef: MaybeRef<Pick<VxeGlobal
     emitFormClickWithParams: (params?: AnyObject) => void;
 };
 export declare function getLowCodeFieldFromField(field: IhoTableFieldItem): LowCodeTableFieldItem | undefined;
-declare function createDefaultRenderCell(): ((renderOpts: VxeColumnPropTypes.EditRender, params: VxeGlobalRendererHandles.RenderCellParams) => VxeGlobalRendererHandles.RenderResult) | undefined;
+declare function createDefaultRenderCell(): ((renderOpts: VxeColumnPropTypes.EditRender, params: VxeGlobalRendererHandles.RenderCellParams) => any) | undefined;
 declare function createRenderEdit(renderer: (payload: VxeGlobalRendererHandles.RenderEditParams & {
     fieldItem: Partial<LowCodeTableFieldItem>;
-} & ReturnType<typeof useIhoTableFormEvent>) => VxeGlobalRendererHandles.RenderResult): ((renderOpts: VxeColumnPropTypes.EditRender, params: VxeGlobalRendererHandles.RenderEditParams) => VxeGlobalRendererHandles.RenderResult) | undefined;
+} & ReturnType<typeof useIhoTableFormEvent>) => VxeGlobalRendererHandles.RenderResult): ((renderOpts: VxeColumnPropTypes.EditRender, params: VxeGlobalRendererHandles.RenderEditParams) => any) | undefined;
 export declare const IhoTableRenderHelper: Readonly<{
     createDefaultRenderCell: typeof createDefaultRenderCell;
     createRenderEdit: typeof createRenderEdit;

package/es/components/iho-table/src/utils/separateMap.d.ts

@@ -1,5 +1,18 @@
 import { AnyObject } from '../../../../shared/types';
 import { IhoTableSeparateInfo } from '../../../../components/iho-table';
-export declare function getSeparateInfo(uuid: string, rowData: AnyObject): IhoTableSeparateInfo | undefined;
+export declare function getSeparateInfo(uuid: string, rowData: AnyObject): {
+    index: number;
+    isOriginRow: boolean;
+    isLastRow: boolean;
+    separateData: AnyObject;
+    originalData: AnyObject;
+    separateIndex: number;
+    separateLength: number;
+    ihoTableHandler?: {
+        updateConfigRef: () => void;
+        updateFieldListRef: () => void;
+        updateTableDataRef: () => void;
+    } | undefined;
+} | undefined;
 export declare function setSeparateInfo(uuid: string, rowData: AnyObject, data: IhoTableSeparateInfo): void;
 export declare function deleteSeparateInfo(uuid: string): void;