cnhis-design-vue 3.1.23-beta.11 → 3.1.23-beta.12

package/es/components/iho-table/src/plugins/rendererPlugins/widgets/seqRendererPlugin.js

@@ -2,34 +2,13 @@ import { inject, createVNode } from 'vue';
 import { SettingsSharp } from '@vicons/ionicons5';
 import { NIcon } from 'naive-ui';
 import '../../../../index2.js';
-import { WIDGET_TYPE, InjectionIhoTableEmits } from '../../../constants/index2.js';
+import { InjectionIhoTableEmits } from '../../../constants/index2.js';
 import { defineTablePlugin } from '../../../hooks/useTablePlugin2.js';
 
 function seqRendererPlugin() {
   const pluginName = "seqRendererPlugin";
   return defineTablePlugin({
     name: pluginName,
-    vxe(instance) {
-      instance.renderer.add(WIDGET_TYPE.SEQUENCE, {
-        renderCell(renderOpts, {
-          $rowIndex
-        }) {
-          return [`${$rowIndex}`];
-        },
-        renderHeader() {
-          const emits = inject(InjectionIhoTableEmits);
-          function onClick() {
-            emits && emits("settingClick");
-          }
-          return [createVNode(NIcon, {
-            "size": "14",
-            "color": "#777",
-            "component": SettingsSharp,
-            "onClick": onClick
-          }, null)];
-        }
-      });
-    },
     apply(hooks) {
       hooks.fieldHooks.field.tap(pluginName, (field, {
         index,
@@ -39,10 +18,21 @@ function seqRendererPlugin() {
           insertBefore({
             align: "center",
             fixed: "left",
-            width: 34,
-            field: pluginName,
-            editRender: {
-              name: WIDGET_TYPE.SEQUENCE
+            width: 50,
+            type: "seq",
+            slots: {
+              header() {
+                const emits = inject(InjectionIhoTableEmits);
+                function onClick() {
+                  emits && emits("settingClick");
+                }
+                return [createVNode(NIcon, {
+                  "size": "14",
+                  "color": "#777",
+                  "component": SettingsSharp,
+                  "onClick": onClick
+                }, null)];
+              }
             }
           });
         }

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

@@ -0,0 +1 @@
+export declare function virtualTreePlugin(): import("../../../../../../es/components/iho-table").TablePlugin;

package/es/components/iho-table/src/plugins/virtualTreePlugin/index.js

@@ -0,0 +1 @@
+export { virtualTreePlugin } from './index2.js';

package/es/components/iho-table/src/plugins/virtualTreePlugin/index2.js

@@ -0,0 +1,84 @@
+import { DMZ, traverse, uuidGenerator } from '../../../../../shared/utils/index2.js';
+import { isArray, isFunction } from 'lodash-es';
+import { onBeforeUnmount } from 'vue';
+import '../../../index2.js';
+import { defineTablePlugin } from '../../hooks/useTablePlugin2.js';
+
+function virtualTreePlugin() {
+  const pluginName = "virtualTreePlugin";
+  const treeNodeColumnIndexMap = /* @__PURE__ */ new Map();
+  return defineTablePlugin({
+    name: pluginName,
+    apply(hooks) {
+      hooks.dataHooks.data.tap(pluginName, (rowData, context, config) => {
+        const {
+          transform,
+          rowField = "__parentId",
+          parentField = "parentId",
+          children = "childrenList"
+        } = config.treeConfig || DMZ;
+        if (!transform)
+          return;
+        enrichRowData(rowData);
+        if (!isArray(rowData[children]))
+          return;
+        traverse(rowData[children], (item, _, parent) => {
+          parent && (item[parentField] = parent[rowField]);
+          context.insertAfter(item);
+          enrichRowData(item);
+        }, children, rowData);
+        function enrichRowData(rowData2) {
+          rowData2[rowField] = rowData2[rowField] || rowData2.theUniqueKey || uuidGenerator();
+        }
+      });
+      hooks.fieldHooks.fieldList.tap(pluginName, (fieldList, config) => {
+        const { transform } = config.treeConfig || DMZ;
+        if (transform && config.uuid) {
+          const treeNodeColumnIndex = fieldList.findIndex((field) => field.treeNode);
+          treeNodeColumnIndexMap.set(config.uuid, {
+            index: ~treeNodeColumnIndex ? treeNodeColumnIndex : 0,
+            length: fieldList.length
+          });
+          !~treeNodeColumnIndex && Reflect.set(fieldList[0], "treeNode", true);
+        }
+        return fieldList;
+      });
+      hooks.configHooks.config.tap(pluginName, (config) => {
+        const { transform, parentField = "parentId", rowField = "__parentId" } = config.treeConfig || DMZ;
+        if (!transform)
+          return config;
+        Object.assign(config.treeConfig, { parentField, rowField });
+        if (transform && !isFunction(config.spanMethod)) {
+          config.spanMethod = (...args) => {
+            const { row, column, columnIndex } = args[0];
+            const treeNodeColumnInfo = treeNodeColumnIndexMap.get(config.uuid);
+            if (!treeNodeColumnInfo)
+              return;
+            if (column.treeNode) {
+              if (row[parentField])
+                return { rowspan: 1, colspan: 1 };
+              return { rowspan: 1, colspan: 99999 };
+            } else {
+              if (row[parentField])
+                return { rowspan: 1, colspan: 1 };
+              if (columnIndex < treeNodeColumnInfo.index)
+                return { rowspan: 1, colspan: 1 };
+              return { rowspan: 0, colspan: 0 };
+            }
+          };
+        }
+        return config;
+      });
+      hooks.setupHooks.setup.tap(pluginName, (configRef) => {
+        onBeforeUnmount(() => {
+          var _a;
+          if (!((_a = configRef.value) == null ? void 0 : _a.uuid))
+            return;
+          treeNodeColumnIndexMap.delete(configRef.value.uuid);
+        });
+      });
+    }
+  });
+}
+
+export { virtualTreePlugin };

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

@@ -37,6 +37,7 @@ export declare type LowCodeTableFieldItem = {
     title: string;
     colWidth: string | number;
     settingObj: LowCodeTableSettingObj;
+    treeNode: boolean;
 }>;
 export declare type IhoFormChangePayload = {
     column: VxeTableDefines.ColumnInfo;

package/es/components/shortcut-setter/index.d.ts

@@ -98,6 +98,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             name?: string | undefined;
             render_key?: string[] | undefined;
             search_key?: string[] | undefined;
+            primary_key?: string | undefined;
             type?: string | undefined;
             value_key?: string | undefined;
             level_key?: string | undefined;

package/es/components/shortcut-setter/src/ShortcutSetter.vue.d.ts

@@ -100,6 +100,7 @@ declare const _default: import("vue").DefineComponent<{
             name?: string | undefined;
             render_key?: string[] | undefined;
             search_key?: string[] | undefined;
+            primary_key?: string | undefined;
             type?: string | undefined;
             value_key?: string | undefined;
             level_key?: string | undefined;

package/es/shared/utils/index.d.ts

@@ -1,8 +1,9 @@
 import { AnyObject, ArrayAble } from '../../../es/shared/types';
 import { App, Component } from 'vue';
-export declare function traverse<T extends ArrayAble<AnyObject>>(target: T, handler: (item: T extends Array<infer P> ? P : T, stop: () => void) => void, keys?: ArrayAble<string>): void;
+export declare function traverse<T extends ArrayAble<AnyObject>>(target: T, handler: (item: T extends Array<infer P> ? P : T, stop: () => void, parent?: typeof item) => void, keys?: ArrayAble<string>, parent?: T): void;
 export declare function safeComponentRegister(app: App, component: Component, cName?: string | undefined, scheduler?: () => void): void;
 export declare function generateTimeFormat(format: string): string | undefined;
 export declare function arrayed<T>(maybeArray: T): T extends Array<any> ? T : [T];
 export declare function uuidGenerator(): string;
 export declare const getStringWidth: import("@vueuse/core").UseMemoizedFn<number, [str: string]>;
+export declare const DMZ: AnyObject;

package/es/shared/utils/index.js

@@ -1 +1 @@
-export { arrayed, generateTimeFormat, getStringWidth, safeComponentRegister, traverse, uuidGenerator } from './index2.js';
+export { DMZ, arrayed, generateTimeFormat, getStringWidth, safeComponentRegister, traverse, uuidGenerator } from './index2.js';

package/es/shared/utils/index2.js

@@ -1,15 +1,15 @@
 import { useMemoize } from '@vueuse/core';
 import { isArray, isString } from 'lodash-es';
 
-function traverse(target, handler, keys = "children") {
+function traverse(target, handler, keys = "children", parent) {
   function stop() {
     throw "silence break traverse";
   }
   try {
     arrayed(target).forEach((item) => {
-      handler(item, stop);
+      handler(item, stop, parent);
       arrayed(keys).forEach((key) => {
-        isArray(item[key]) && traverse(item[key], handler);
+        isArray(item[key]) && traverse(item[key], handler, keys, item);
       });
     });
   } catch (err) {
@@ -93,5 +93,6 @@ const getStringWidth = /* @__PURE__ */ useMemoize(function(str) {
     return width + 6;
   }, 0);
 });
+const DMZ = Object.seal(/* @__PURE__ */ Object.create(null));
 
-export { arrayed, generateTimeFormat, getStringWidth, safeComponentRegister, traverse, uuidGenerator };
+export { DMZ, arrayed, generateTimeFormat, getStringWidth, safeComponentRegister, traverse, uuidGenerator };

package/es/shared/utils/tapable/index.d.ts

@@ -0,0 +1,139 @@
+type FixedSizeArray<T extends number, U> = T extends 0
+	? void[]
+	: ReadonlyArray<U> & {
+			0: U;
+			length: T;
+	  };
+type Measure<T extends number> = T extends 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 ? T : never;
+type Append<T extends any[], U> = {
+	0: [U];
+	1: [T[0], U];
+	2: [T[0], T[1], U];
+	3: [T[0], T[1], T[2], U];
+	4: [T[0], T[1], T[2], T[3], U];
+	5: [T[0], T[1], T[2], T[3], T[4], U];
+	6: [T[0], T[1], T[2], T[3], T[4], T[5], U];
+	7: [T[0], T[1], T[2], T[3], T[4], T[5], T[6], U];
+	8: [T[0], T[1], T[2], T[3], T[4], T[5], T[6], T[7], U];
+}[Measure<T['length']>];
+type AsArray<T> = T extends any[] ? T : [T];
+
+declare class UnsetAdditionalOptions {
+	_UnsetAdditionalOptions: true;
+}
+type IfSet<X> = X extends UnsetAdditionalOptions ? {} : X;
+
+type Callback<E, T> = (error: E | null, result?: T) => void;
+type InnerCallback<E, T> = (error?: E | null | false, result?: T) => void;
+
+type FullTap = Tap & {
+	type: 'sync' | 'async' | 'promise';
+	fn: Function;
+};
+
+type Tap = TapOptions & {
+	name: string;
+};
+
+type TapOptions = {
+	before?: string;
+	stage?: number;
+};
+
+interface HookInterceptor<T, R, AdditionalOptions = UnsetAdditionalOptions> {
+	name?: string;
+	tap?: (tap: FullTap & IfSet<AdditionalOptions>) => void;
+	call?: (...args: any[]) => void;
+	loop?: (...args: any[]) => void;
+	error?: (err: Error) => void;
+	result?: (result: R) => void;
+	done?: () => void;
+	register?: (tap: FullTap & IfSet<AdditionalOptions>) => FullTap & IfSet<AdditionalOptions>;
+}
+
+type ArgumentNames<T extends any[]> = FixedSizeArray<T['length'], string>;
+
+declare class Hook<T, R, AdditionalOptions = UnsetAdditionalOptions> {
+	constructor(args?: ArgumentNames<AsArray<T>>, name?: string);
+	name: string | undefined;
+	taps: FullTap[];
+	intercept(interceptor: HookInterceptor<T, R, AdditionalOptions>): void;
+	isUsed(): boolean;
+	callAsync(...args: Append<AsArray<T>, Callback<Error, R>>): void;
+	promise(...args: AsArray<T>): Promise<R>;
+	tap(options: string | (Tap & IfSet<AdditionalOptions>), fn: (...args: AsArray<T>) => R): void;
+	withOptions(options: TapOptions & IfSet<AdditionalOptions>): Omit<this, 'call' | 'callAsync' | 'promise'>;
+}
+
+export class SyncHook<T, R = void, AdditionalOptions = UnsetAdditionalOptions> extends Hook<T, R, AdditionalOptions> {
+	call(...args: AsArray<T>): R;
+}
+
+export class SyncBailHook<T, R, AdditionalOptions = UnsetAdditionalOptions> extends SyncHook<T, R, AdditionalOptions> {}
+export class SyncLoopHook<T, AdditionalOptions = UnsetAdditionalOptions> extends SyncHook<T, void, AdditionalOptions> {}
+export class SyncWaterfallHook<T, AdditionalOptions = UnsetAdditionalOptions> extends SyncHook<
+	T,
+	AsArray<T>[0],
+	AdditionalOptions
+> {}
+
+declare class AsyncHook<T, R, AdditionalOptions = UnsetAdditionalOptions> extends Hook<T, R, AdditionalOptions> {
+	tapAsync(
+		options: string | (Tap & IfSet<AdditionalOptions>),
+		fn: (...args: Append<AsArray<T>, InnerCallback<Error, R>>) => void
+	): void;
+	tapPromise(options: string | (Tap & IfSet<AdditionalOptions>), fn: (...args: AsArray<T>) => Promise<R>): void;
+}
+
+export class AsyncParallelHook<T, AdditionalOptions = UnsetAdditionalOptions> extends AsyncHook<
+	T,
+	void,
+	AdditionalOptions
+> {}
+export class AsyncParallelBailHook<T, R, AdditionalOptions = UnsetAdditionalOptions> extends AsyncHook<
+	T,
+	R,
+	AdditionalOptions
+> {}
+export class AsyncSeriesHook<T, AdditionalOptions = UnsetAdditionalOptions> extends AsyncHook<
+	T,
+	void,
+	AdditionalOptions
+> {}
+export class AsyncSeriesBailHook<T, R, AdditionalOptions = UnsetAdditionalOptions> extends AsyncHook<
+	T,
+	R,
+	AdditionalOptions
+> {}
+export class AsyncSeriesLoopHook<T, AdditionalOptions = UnsetAdditionalOptions> extends AsyncHook<
+	T,
+	void,
+	AdditionalOptions
+> {}
+export class AsyncSeriesWaterfallHook<T, AdditionalOptions = UnsetAdditionalOptions> extends AsyncHook<
+	T,
+	AsArray<T>[0],
+	AdditionalOptions
+> {}
+
+type HookFactory<H> = (key: any, hook?: H) => H;
+
+interface HookMapInterceptor<H> {
+	factory?: HookFactory<H>;
+}
+
+export class HookMap<H> {
+	constructor(factory: HookFactory<H>, name?: string);
+	name: string | undefined;
+	get(key: any): H | undefined;
+	for(key: any): H;
+	intercept(interceptor: HookMapInterceptor<H>): void;
+}
+
+export class MultiHook<H> {
+	constructor(hooks: H[], name?: string);
+	name: string | undefined;
+	tap(options: string | Tap, fn?: Function): void;
+	tapAsync(options: string | Tap, fn?: Function): void;
+	tapPromise(options: string | Tap, fn?: Function): void;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "3.1.23-beta.11",
+  "version": "3.1.23-beta.12",
   "license": "ISC",
   "module": "./es/components/index.js",
   "main": "./es/components/index.js",
@@ -66,5 +66,5 @@
     "iOS 7",
     "last 3 iOS versions"
   ],
-  "gitHead": "5582c78f5b4a4e969ee1e6089307d2142107816c"
+  "gitHead": "f819538beb54e1a0cac4986b22568eadb3331662"
 }