cnhis-design-vue 3.1.35-beta.1 → 3.1.35-beta.11

package/es/components/big-table/src/components/edit-form/edit-separate.vue.d.ts

@@ -40,18 +40,21 @@ declare const _default: import("vue").DefineComponent<{
         index: number;
         rawRow: AnyObject;
         row: AnyObject;
+        colspans?: Record<string, number> | undefined;
     } | undefined;
     onShow: (target: {
         separateData: Record<string, string>;
         index: number;
         rawRow: AnyObject;
         row: AnyObject;
+        colspans?: Record<string, number> | undefined;
     } | undefined) => Promise<void>;
     onClose: (target: {
         separateData: Record<string, string>;
         index: number;
         rawRow: AnyObject;
         row: AnyObject;
+        colspans?: Record<string, number> | undefined;
     } | undefined) => Promise<void>;
     updateShow: (show: boolean) => void;
     style: CSSProperties;
@@ -99,6 +102,7 @@ declare const _default: import("vue").DefineComponent<{
             index: number;
             rawRow: AnyObject;
             row: AnyObject;
+            colspans?: Record<string, number> | undefined;
         }>>;
         displayContent: import("vue").ComputedRef<string>;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/components/big-table/src/components/separate.vue.d.ts

@@ -25,6 +25,7 @@ declare const _default: import("vue").DefineComponent<{
         index: number;
         rawRow: AnyObject;
         row: AnyObject;
+        colspans?: Record<string, number> | undefined;
     }>>;
     displayContent: import("vue").ComputedRef<string>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/components/big-table/src/hooks/useEdit.d.ts

@@ -232,18 +232,21 @@ export declare const comps: {
             index: number;
             rawRow: import("../../../../shared/types").AnyObject;
             row: import("../../../../shared/types").AnyObject;
+            colspans?: Record<string, number> | undefined;
         } | undefined;
         onShow: (target: {
             separateData: Record<string, string>;
             index: number;
             rawRow: import("../../../../shared/types").AnyObject;
             row: import("../../../../shared/types").AnyObject;
+            colspans?: Record<string, number> | undefined;
         } | undefined) => Promise<void>;
         onClose: (target: {
             separateData: Record<string, string>;
             index: number;
             rawRow: import("../../../../shared/types").AnyObject;
             row: import("../../../../shared/types").AnyObject;
+            colspans?: Record<string, number> | undefined;
         } | undefined) => Promise<void>;
         updateShow: (show: boolean) => void;
         style: import("vue").CSSProperties;
@@ -291,6 +294,7 @@ export declare const comps: {
                 index: number;
                 rawRow: import("../../../../shared/types").AnyObject;
                 row: import("../../../../shared/types").AnyObject;
+                colspans?: Record<string, number> | undefined;
             }>>;
             displayContent: import("vue").ComputedRef<string>;
         }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/components/big-table/src/hooks/useSeparateRow.d.ts

@@ -1,6 +1,7 @@
 import { AnyObject, Func } from '../../../../../es/shared/types';
 import { Ref } from 'vue';
 import { VxeTableEvents, VxeTableInstance } from 'vxe-table';
+import { VxeTablePropTypes } from 'vxe-table/types/table';
 export declare class SeparateHandle {
     callbacks: Set<Func<any[], any>>;
     add(cb: Func): void;
@@ -14,17 +15,26 @@ export declare function useSeparateMap(): {
         index: number;
         rawRow: AnyObject;
         row: AnyObject;
+        colspans?: Record<string, number> | undefined;
     }>>;
     getRowData: (row: AnyObject) => {
         separateData: Record<string, string>;
         index: number;
         rawRow: AnyObject;
         row: AnyObject;
+        colspans?: Record<string, number> | undefined;
     } | undefined;
 };
-export declare function useSeparateRow(getColumnConfig: () => AnyObject[], getFieldItem: (columnName: string) => AnyObject, $VXETable: Ref<undefined | VxeTableInstance>): {
+export declare function useSeparateRow(getColumnConfig: () => AnyObject[], spanMethod: VxeTablePropTypes.SpanMethod, getFieldItem: (columnName: string) => AnyObject, $VXETable: Ref<undefined | VxeTableInstance>): {
     onColumnResize: VxeTableEvents.ResizableChange;
     needSeparateColumn: import("vue").ComputedRef<AnyObject[]>;
     separate: (data: AnyObject[], rawData: AnyObject[]) => Promise<AnyObject[]>;
     separateHandle: SeparateHandle;
+    separateDataMap: Ref<WeakMap<AnyObject, {
+        separateData: Record<string, string>;
+        index: number;
+        rawRow: AnyObject;
+        row: AnyObject;
+        colspans?: Record<string, number> | undefined;
+    }>>;
 };

package/es/components/big-table/src/hooks/useSeparateRow.js

@@ -1,5 +1,5 @@
 import { getStringWidth } from '../../../../shared/utils/index.js';
-import { isNumber, isArray, cloneDeep, isString } from 'lodash-es';
+import { isFunction, isNumber, isArray, cloneDeep, isString } from 'lodash-es';
 import { ref, computed, provide, watch, nextTick } from 'vue';
 import { InjectionSeparateHandle } from '../constants/index.js';
 
@@ -29,22 +29,32 @@ function useSeparateMap() {
   }
   return { separateDataMap, getRowData };
 }
-function useSeparateRow(getColumnConfig, getFieldItem, $VXETable) {
+function useSeparateRow(getColumnConfig, spanMethod, getFieldItem, $VXETable) {
   const needSeparateColumn = computed(() => {
     return getColumnConfig().filter((column) => column.formType === "separate");
   });
+  const columnWidthCacheMap = /* @__PURE__ */ new Map();
   async function separate(data, rawData) {
+    var _a, _b;
     if (!needSeparateColumn.value.length) {
       return data;
     }
+    columnWidthCacheMap.clear();
+    const visibleColumn = (_b = (_a = $VXETable.value) == null ? void 0 : _a.getColumns()) != null ? _b : [];
     return data.reduce(async (res, row, dataIndex) => {
       const parsedRowData = [];
       for (const column of needSeparateColumn.value) {
+        const { width, colspan } = await getColumnRenderWidth(column, row, dataIndex);
         parsedRowData.push({
           columnName: column.columnName,
-          data: contentSeparate(row[column.columnName], column.columnName, await getColumnRenderWidth(column))
+          colspan,
+          data: contentSeparate(row[column.columnName], column.columnName, width)
         });
       }
+      const separateColspans = visibleColumn.reduce((res2, column) => {
+        res2[column.field] = getColspanInfo(column.field, row, dataIndex).colspan;
+        return res2;
+      }, {});
       (await res).push(
         ...Array.from({ length: getColumnInfoMaxLength(parsedRowData) }).map((_, index) => {
           const separateData = getSeparateRowData(parsedRowData, index);
@@ -53,7 +63,8 @@ function useSeparateRow(getColumnConfig, getFieldItem, $VXETable) {
               row,
               rawRow: rawData[dataIndex],
               index: dataIndex,
-              separateData
+              separateData,
+              colspans: separateColspans
             });
             row.$__SEPARATE_DATA = [separateData];
             return row;
@@ -77,21 +88,55 @@ function useSeparateRow(getColumnConfig, getFieldItem, $VXETable) {
         return res;
       }, {});
     }
-    function getColumnInfoMaxLength(parsedRowData) {
-      return Math.max(...parsedRowData.map((r) => r.data.length), 1);
-    }
-    async function getColumnRenderWidth(column) {
+  }
+  function getColumnInfoMaxLength(parsedRowData) {
+    return Math.max(...parsedRowData.map((r) => r.data.length), 1);
+  }
+  function getColspanInfo(field, row, rowIndex) {
+    if (!$VXETable.value)
+      return { colspan: 1, columnIndex: 0 };
+    const columnInfo = $VXETable.value.getColumnByField(field);
+    const columnIndex = $VXETable.value.getColumnIndex(columnInfo);
+    const visibleColumn = $VXETable.value.getColumns() || [];
+    const _columnIndex = visibleColumn.findIndex((column) => column.field === field);
+    const { colspan = 1 } = spanMethod({
+      column: columnInfo,
+      row,
+      rowIndex,
+      $rowIndex: rowIndex,
+      _rowIndex: rowIndex,
+      columnIndex,
+      $columnIndex: columnIndex,
+      _columnIndex
+    }) || {};
+    return { colspan, columnIndex, _columnIndex };
+  }
+  async function getColumnRenderWidth(column, row, rowIndex) {
+    if (!isFunction(spanMethod) || !$VXETable.value)
+      return { width: await getWidth(column), colspan: 1 };
+    const { colspan, _columnIndex, columnIndex } = getColspanInfo(column.columnName, row, rowIndex);
+    const colIndex = _columnIndex != null ? _columnIndex : columnIndex;
+    const width = colspan <= 0 ? 0 : colspan === 1 ? await getWidth(column) : await $VXETable.value.getColumns().slice(colIndex, colIndex + colspan).reduce(async (res, columnInfo) => {
+      return await res + await getWidth({ columnName: columnInfo.field });
+    }, Promise.resolve(0));
+    return { width, colspan };
+    async function getWidth(column2) {
+      let width2 = columnWidthCacheMap.get(column2.columnName);
+      if (width2)
+        return width2;
       const prev = getRenderWidth();
       if (!prev) {
         await nextTick();
       }
-      return getRenderWidth() || getColumnWidth();
+      width2 = getRenderWidth() || getColumnWidth();
+      columnWidthCacheMap.set(column2.columnName, width2);
+      return width2;
       function getRenderWidth() {
         var _a, _b;
-        return (_b = (_a = $VXETable.value) == null ? void 0 : _a.getColumnByField(column.columnName)) == null ? void 0 : _b.renderWidth;
+        return (_b = (_a = $VXETable.value) == null ? void 0 : _a.getColumnByField(column2.columnName)) == null ? void 0 : _b.renderWidth;
       }
       function getColumnWidth() {
-        return isNumber(column.width) ? column.width : 64;
+        return isNumber(column2.width) ? column2.width : 64;
       }
     }
   }
@@ -126,7 +171,7 @@ function useSeparateRow(getColumnConfig, getFieldItem, $VXETable) {
   const separateHandle = new SeparateHandle();
   provide(InjectionSeparateHandle, separateHandle);
   watch(needSeparateColumn, separateHandle.trigger.bind(separateHandle));
-  return { onColumnResize, needSeparateColumn, separate, separateHandle };
+  return { onColumnResize, needSeparateColumn, separate, separateHandle, separateDataMap };
 }
 
 export { SeparateHandle, useSeparateMap, useSeparateRow };

package/es/components/bpmn-workflow/types/BpmnViewer.d.ts

@@ -0,0 +1 @@
+declare module 'bpmn-js/lib/Viewer';

package/es/components/bpmn-workflow/types/ModelingModule.d.ts

@@ -0,0 +1 @@
+declare module 'bpmn-js/lib/features/modeling';

package/es/components/bpmn-workflow/types/MoveCanvasModule.d.ts

@@ -0,0 +1 @@
+declare module 'diagram-js/lib/navigation/movecanvas';