cnhis-design-vue 3.1.22-beta.1 → 3.1.22-beta.2.1

package/es/components/iho-table/src/plugins/rendererPlugins/{colorRendererPlugin.js → widgets/colorRendererPlugin.js}

@@ -1,7 +1,8 @@
-import { inject, createVNode } from 'vue';
-import '../../../index2.js';
-import { WIDGET_TYPE, InjectionIhoTableConfig } from '../../constants/index2.js';
-import { defineTablePlugin } from '../../hooks/useTablePlugin2.js';
+import { createVNode } from 'vue';
+import '../../../../index2.js';
+import { WIDGET_TYPE } from '../../../constants/index2.js';
+import { getRowHeight } from '../../../utils/index2.js';
+import { defineTablePlugin } from '../../../hooks/useTablePlugin2.js';
 
 function colorRendererPlugin() {
   const pluginName = "checkRendererPlugin";
@@ -28,15 +29,12 @@ function colorRendererPlugin() {
           row,
           column
         }) {
-          var _a, _b, _c;
           const value = row[column.field];
           const [color, alias] = value.split("-");
-          const config = inject(InjectionIhoTableConfig);
-          const height = (_c = (_b = (_a = config == null ? void 0 : config.value) == null ? void 0 : _a.rowConfig) == null ? void 0 : _b.height) != null ? _c : 32;
           return [createVNode("div", {
             "style": {
               background: colorMap[alias] || color,
-              height: height - 8 + "px"
+              height: getRowHeight() - 8 + "px"
             }
           }, null)];
         }

package/es/components/iho-table/src/plugins/rendererPlugins/{defaultRendererPlugin.d.ts → widgets/defaultRendererPlugin.d.ts}

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

package/es/components/iho-table/src/plugins/rendererPlugins/{defaultRendererPlugin.js → widgets/defaultRendererPlugin.js}

@@ -1,9 +1,9 @@
 import { createVNode } from 'vue';
 import { isString } from 'lodash-es';
-import '../../../index2.js';
-import { WIDGET_TYPE } from '../../constants/index2.js';
-import { IhoTableWarn } from '../../utils/index2.js';
-import { defineTablePlugin } from '../../hooks/useTablePlugin2.js';
+import '../../../../index2.js';
+import { WIDGET_TYPE } from '../../../constants/index2.js';
+import { IhoTableWarn } from '../../../utils/index2.js';
+import { defineTablePlugin } from '../../../hooks/useTablePlugin2.js';
 
 function defaultRendererPlugin() {
   const pluginName = "defaultRendererPlugin";

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

@@ -0,0 +1,6 @@
+export * from './labelRendererPlugin';
+export * from './defaultRendererPlugin';
+export * from './colorRendererPlugin';
+export * from './seqRendererPlugin';
+export * from './checkRendererPlugin';
+export * from './pictureRendererPlugin';

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

@@ -0,0 +1,6 @@
+export { labelRendererPlugin } from './labelRendererPlugin.js';
+export { defaultRendererPlugin } from './defaultRendererPlugin.js';
+export { colorRendererPlugin } from './colorRendererPlugin.js';
+export { seqRendererPlugin } from './seqRendererPlugin.js';
+export { checkRendererPlugin } from './checkRendererPlugin.js';
+export { pictureRendererPlugin } from './pictureRendererPlugin.js';

package/es/components/iho-table/src/plugins/rendererPlugins/{labelRendererPlugin.d.ts → widgets/labelRendererPlugin.d.ts}

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

package/es/components/iho-table/src/plugins/rendererPlugins/{labelRendererPlugin.js → widgets/labelRendererPlugin.js}

@@ -1,8 +1,8 @@
 import { createVNode } from 'vue';
 import { isArray, isString } from 'lodash-es';
-import '../../../index2.js';
-import { WIDGET_TYPE } from '../../constants/index2.js';
-import { defineTablePlugin } from '../../hooks/useTablePlugin2.js';
+import '../../../../index2.js';
+import { WIDGET_TYPE } from '../../../constants/index2.js';
+import { defineTablePlugin } from '../../../hooks/useTablePlugin2.js';
 
 function labelRendererPlugin() {
   const pluginName = "labelRendererPlugin";

package/es/components/iho-table/src/plugins/rendererPlugins/widgets/pictureRendererPlugin.d.ts

@@ -0,0 +1,2 @@
+import 'viewerjs/dist/viewer.css';
+export declare function pictureRendererPlugin(): import("../../../../../../../es/components/iho-table").TablePlugin;

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

@@ -0,0 +1,89 @@
+import { defineComponent, watch, createVNode } from 'vue';
+import { arrayed } from '../../../../../../shared/utils/index2.js';
+import '../../../../index2.js';
+import { WIDGET_TYPE } from '../../../constants/index2.js';
+import { getRowHeight, IhoTableWarn } from '../../../utils/index2.js';
+import Viewer from 'viewerjs';
+import 'viewerjs/dist/viewer.css';
+import { defineTablePlugin } from '../../../hooks/useTablePlugin2.js';
+
+function pictureRendererPlugin() {
+  const pluginName = "pictureRendererPlugin";
+  return defineTablePlugin({
+    name: pluginName,
+    vxe(instance) {
+      function createRenderOptions(style) {
+        return {
+          renderCell(renderOpts, {
+            row,
+            column
+          }) {
+            try {
+              const value = JSON.parse(row[column.field]);
+              const height = getRowHeight();
+              return [createVNode("section", {
+                "style": "display:flex;justify-content:center"
+              }, [createVNode(ViewerImage, {
+                "style": {
+                  width: height + "px",
+                  height: height + "px",
+                  ...style
+                },
+                "images": arrayed(value).map((v) => v.url)
+              }, null)])];
+            } catch (e) {
+              IhoTableWarn(`invalid ${renderOpts.name} value of field(${column.field}): ${row[column.field]}`);
+              return [];
+            }
+          }
+        };
+      }
+      instance.renderer.add(WIDGET_TYPE.PICTURE, createRenderOptions({}));
+      instance.renderer.add(WIDGET_TYPE.HEADPORTRAIT, createRenderOptions({
+        "border-radius": "50%"
+      }));
+    }
+  });
+}
+const ViewerImage = defineComponent({
+  name: "ViewerImage",
+  props: {
+    images: {
+      type: Array,
+      default: () => []
+    },
+    options: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  setup(props) {
+    let $viewer = null;
+    function show() {
+      if ($viewer)
+        return $viewer.show();
+      const wrapper = document.createElement("section");
+      props.images.map((image) => wrapper.appendChild(createImage(image)));
+      $viewer = new Viewer(wrapper, props.options).show();
+    }
+    function createImage(image) {
+      const imageEle = new Image();
+      imageEle.src = image;
+      return imageEle;
+    }
+    watch([() => props.images, () => props.options], () => {
+      $viewer == null ? void 0 : $viewer.destroy();
+      $viewer = null;
+    }, {
+      deep: true
+    });
+    return () => createVNode("img", {
+      "style": "cursor:pointer",
+      "alt": "",
+      "src": props.images[0],
+      "onClick": show
+    }, null);
+  }
+});
+
+export { pictureRendererPlugin };

package/es/components/iho-table/src/plugins/rendererPlugins/{seqRendererPlugin.d.ts → widgets/seqRendererPlugin.d.ts}

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

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

@@ -1,9 +1,9 @@
 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 { defineTablePlugin } from '../../hooks/useTablePlugin2.js';
+import '../../../../index2.js';
+import { WIDGET_TYPE, InjectionIhoTableEmits } from '../../../constants/index2.js';
+import { defineTablePlugin } from '../../../hooks/useTablePlugin2.js';
 
 function seqRendererPlugin() {
   const pluginName = "seqRendererPlugin";

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

@@ -1,3 +1,4 @@
+import { AnyObject } from '../../../../../es/shared/types';
 import { VxeTableProps, VxeTableDefines } from 'vxe-table';
 export * from './pluginType';
 export interface IhoTableConfig extends VxeTableProps {
@@ -21,3 +22,9 @@ export declare type LowCodeTableFieldItem = {
     colWidth?: string | number;
     settingObj: LowCodeTableSettingObj;
 }>;
+export declare type IhoFormChangePayload = {
+    column: VxeTableDefines.ColumnInfo;
+    row: AnyObject;
+    value: unknown;
+    index: number;
+};

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

@@ -19,6 +19,20 @@ export declare abstract class AbstractConfigHooks {
     abstract readonly rowConfig: SyncWaterfallHook<WithTableConfig<IhoTableConfig['rowConfig']>>;
     abstract readonly editConfig: SyncWaterfallHook<WithTableConfig<IhoTableConfig['editConfig']>>;
     abstract readonly columnConfig: SyncWaterfallHook<WithTableConfig<IhoTableConfig['columnConfig']>>;
+    abstract readonly resizableConfig: SyncWaterfallHook<WithTableConfig<IhoTableConfig['resizableConfig']>>;
+    abstract readonly seqConfig: SyncWaterfallHook<WithTableConfig<IhoTableConfig['seqConfig']>>;
+    abstract readonly sortConfig: SyncWaterfallHook<WithTableConfig<IhoTableConfig['sortConfig']>>;
+    abstract readonly filterConfig: SyncWaterfallHook<WithTableConfig<IhoTableConfig['filterConfig']>>;
+    abstract readonly radioConfig: SyncWaterfallHook<WithTableConfig<IhoTableConfig['radioConfig']>>;
+    abstract readonly checkboxConfig: SyncWaterfallHook<WithTableConfig<IhoTableConfig['checkboxConfig']>>;
+    abstract readonly expandConfig: SyncWaterfallHook<WithTableConfig<IhoTableConfig['expandConfig']>>;
+    abstract readonly treeConfig: SyncWaterfallHook<WithTableConfig<IhoTableConfig['treeConfig']>>;
+    abstract readonly mouseConfig: SyncWaterfallHook<WithTableConfig<IhoTableConfig['mouseConfig']>>;
+    abstract readonly menuConfig: SyncWaterfallHook<WithTableConfig<IhoTableConfig['menuConfig']>>;
+    abstract readonly keyboardConfig: SyncWaterfallHook<WithTableConfig<IhoTableConfig['keyboardConfig']>>;
+    abstract readonly scrollY: SyncWaterfallHook<WithTableConfig<IhoTableConfig['scrollY']>>;
+    abstract readonly scrollX: SyncWaterfallHook<WithTableConfig<IhoTableConfig['scrollX']>>;
+    abstract readonly editRules: SyncWaterfallHook<WithTableConfig<IhoTableConfig['editRules']>>;
 }
 export interface FieldHookContext {
     index: number;

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

@@ -1,2 +1,3 @@
 export declare function IhoTableLog(message: string): void;
 export declare function IhoTableWarn(message: string): void;
+export declare function getRowHeight(): number;

package/es/components/iho-table/src/utils/index.js

@@ -1 +1 @@
-export { IhoTableLog, IhoTableWarn } from './index2.js';
+export { IhoTableLog, IhoTableWarn, getRowHeight } from './index2.js';

package/es/components/iho-table/src/utils/index2.js

@@ -1,8 +1,19 @@
+import { inject } from 'vue';
+import { InjectionIhoTableConfig } from '../constants/index2.js';
+
 function IhoTableLog(message) {
   return console.log(`[IhoTable]: ${message}`);
 }
 function IhoTableWarn(message) {
   return console.warn(`[IhoTable]: ${message}`);
 }
+function getRowHeight() {
+  var _a, _b, _c;
+  const config = inject(InjectionIhoTableConfig);
+  if (!config) {
+    IhoTableWarn("please use this function(getRowHeight) in setup environment");
+  }
+  return (_c = (_b = (_a = config == null ? void 0 : config.value) == null ? void 0 : _a.rowConfig) == null ? void 0 : _b.height) != null ? _c : 32;
+}
 
-export { IhoTableLog, IhoTableWarn };
+export { IhoTableLog, IhoTableWarn, getRowHeight };

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.22-beta.1",
+  "version": "3.1.22-beta.2.1",
   "license": "ISC",
   "module": "./es/components/index.js",
   "main": "./es/components/index.js",
@@ -15,7 +15,8 @@
   ],
   "peerDependencies": {
     "naive-ui": "^2.30.0",
-    "vue": "^3.2.0"
+    "vue": "^3.2.0",
+    "vxe-table": "^4.2.5"
   },
   "dependencies": {
     "@formily/core": "2.1.9",
@@ -55,7 +56,6 @@
     "vue": "^3.2.0",
     "vue-simple-uploader": "^1.0.0-beta.5",
     "vuedraggable": "4.1.0",
-    "vxe-table": "4.2.6",
     "xe-utils": "^3.5.4"
   },
   "browserslist": [
@@ -66,5 +66,5 @@
     "iOS 7",
     "last 3 iOS versions"
   ],
-  "gitHead": "0df5a178c3cfc0cd8ff8dc298937c7e00423c2b7"
+  "gitHead": "051bc10653f436fed492c22f7a672a13e5892ba0"
 }

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

@@ -1,2 +0,0 @@
-import { App } from 'vue';
-export declare function loadVxeTable(app: App): void;

package/es/shared/utils/loadVxe.js

@@ -1 +0,0 @@
-export { loadVxeTable } from './loadVxe2.js';

package/es/shared/utils/loadVxe2.js

@@ -1,12 +0,0 @@
-import { safeComponentRegister } from './index2.js';
-import VXETable from 'vxe-table';
-
-function loadVxeTable(app) {
-  safeComponentRegister(app, VXETable, "VxeTable", () => {
-    app.use(VXETable);
-    import('vxe-table/lib/style.css');
-    import('xe-utils');
-  });
-}
-
-export { loadVxeTable };