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

package/es/components/fabric-chart/src/hooks/useEvent2.js

@@ -18,13 +18,13 @@ function useCanvasEvent(canvas, propItems, emits) {
       width,
       height,
       stroke: "transparent",
-      strokeWidth: 1,
       fill: "transparent",
       lockMovementX: true,
       lockMovementY: true,
       transparentCorners: false,
       hasControls: false,
-      ...selectionStyle
+      ...selectionStyle,
+      strokeWidth: 0
     });
     canvas.value.add(rect);
     return rect;
@@ -77,12 +77,15 @@ function useCanvasEvent(canvas, propItems, emits) {
           if (button == 1) {
             const _key = obj.key.replace("All", "");
             const key = pointer.x <= originX ? _key + "Title" : _key;
+            obj.sendToBack();
             select(key);
             emits("select", key);
           }
         });
       } else {
         obj.on("mousedown", () => {
+          resetStrokeWidth();
+          setActiveObj(obj);
           emits("select", obj.key);
         });
         setTimeout(() => {
@@ -95,18 +98,19 @@ function useCanvasEvent(canvas, propItems, emits) {
   }
   function addSelectionListener() {
     canvas.value.on("selection:cleared", selectionCB);
-    canvas.value.on("selection:updated", selectionCB);
     function selectionCB(event) {
       const { deselected = [] } = event;
       deselected.forEach((obj) => {
+        obj.set("strokeWidth", 0);
         obj.key.endsWith("All") && obj.sendToBack();
       });
     }
   }
   function select(key) {
     canvas.value.discardActiveObject().renderAll();
+    resetStrokeWidth();
     const obj = selections == null ? void 0 : selections.find((obj2) => obj2.key === key);
-    obj == null ? void 0 : obj.bringToFront();
+    setActiveObj(obj);
     obj && canvas.value.setActiveObject(obj);
   }
   function init() {
@@ -115,6 +119,16 @@ function useCanvasEvent(canvas, propItems, emits) {
     selections = initSelection();
     addSelectionListener();
   }
+  function resetStrokeWidth() {
+    selections.forEach((obj) => {
+      obj.set("strokeWidth", 0);
+      obj.key.endsWith("All") && obj.sendToBack();
+    });
+  }
+  function setActiveObj(obj) {
+    var _a;
+    obj == null ? void 0 : obj.bringToFront().set("strokeWidth", (_a = selectionStyle.strokeWidth) != null ? _a : 2);
+  }
   init();
   return { select };
 }

package/es/components/form-config/index.d.ts

@@ -938,6 +938,7 @@ declare const FormConfig: 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/form-config/src/FormConfig.vue.d.ts

@@ -940,6 +940,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/components/form-config/src/components/FormConfigEdit.vue.d.ts

@@ -67,6 +67,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/components/form-render/src/components/renderer/levelSearchCascade.d.ts

@@ -24,6 +24,7 @@ export declare const LEVEL_SEARCH_CASCADE: import("vue").DefineComponent<{
             name: string;
             render_key: string[];
             search_key: string[];
+            primary_key: string;
             type: string;
             value_key: string;
             level_key: string;
@@ -62,6 +63,7 @@ export declare const LEVEL_SEARCH_CASCADE: import("vue").DefineComponent<{
             name: string;
             render_key: string[];
             search_key: string[];
+            primary_key: string;
             type: string;
             value_key: string;
             level_key: string;

package/es/components/form-render/src/components/renderer/levelSearchCascade.js

@@ -1,5 +1,4 @@
 import { defineComponent, computed, ref, inject, watch, createVNode } from 'vue';
-import { arrayed } from '../../../../../shared/utils/index2.js';
 import { isEqual, isString, isEmpty } from 'lodash-es';
 import '../../../index2.js';
 import { InjectAsyncQueue } from '../../constants/index2.js';
@@ -74,7 +73,7 @@ const script = defineComponent({
           valueRef.value = createOptionValue(node);
           return;
         }
-        const result = await asyncQueue.addAsync(createParams(props.wordbook, props.autograph, field.value, fieldKey.value));
+        const result = await asyncQueue.addAsync(createParams(props.wordbook, props.autograph, field.value, node, fieldKey.value));
         if (!node) {
           optionsRef.value = result.map((option) => {
             option.__keyword = !!keyword;
@@ -137,13 +136,15 @@ const script = defineComponent({
       function parseLinkFromString2List(linkString) {
         return linkString.split("_").filter((s) => s);
       }
-      function createParams(wordbook, autograph, field2, key2) {
+      function createParams(wordbook, autograph, field2, node2, key2) {
         const params = {
           autograph,
           wordbookId: wordbook.id,
           wordbookType: wordbook.type,
           fieldKeys: wordbook.search_key ? JSON.stringify(wordbook.search_key) : void 0,
-          conObj: wordbook.conObj ? JSON.stringify(enrichConObj(wordbook.conObj, node)) : void 0,
+          conObj: JSON.stringify(createConfigObject(wordbook), node2),
+          primaryKey: wordbook.primary_key,
+          levelKey: wordbook.level_key,
           keyword,
           page: 1
         };
@@ -152,19 +153,24 @@ const script = defineComponent({
           params,
           key: key2
         };
-        function enrichConObj(conObj, node2) {
-          return arrayed(conObj).map((item) => ({
-            ...item,
-            value: node2 == null ? void 0 : node2[valueKey.value]
-          }));
-        }
+      }
+      function createConfigObject(wordbook, node2) {
+        if (!node2)
+          return wordbook.conObjFirstLevel || [];
+        return [{
+          con: "EQ",
+          is_compare_field: false,
+          field_key: wordbook.level_key,
+          value: node2[valueKey.value]
+        }];
       }
     }
     async function fetchPrimaryKeyValue(primaryKeys) {
       if (!getSearchRequestInfo().primaryKeyUrl)
         return [];
       try {
-        return await asyncQueue.addAsync(createParams(props.wordbook, props.autograph, primaryKeys, fieldKey.value));
+        const params = createParams(props.wordbook, props.autograph, primaryKeys, fieldKey.value);
+        return await asyncQueue.addAsync(params);
       } catch (e) {
         isString(e) && formRenderLog(e);
       }
@@ -172,10 +178,12 @@ const script = defineComponent({
         const requestInfo = getSearchRequestInfo();
         return {
           key: key2,
-          autograph,
-          tableId: wordbook.id,
-          primaryKeyValue: primaryKeys2.join(","),
-          page: 1,
+          params: {
+            autograph,
+            tableId: wordbook.id,
+            primaryKeyValue: primaryKeys2.join(","),
+            page: 1
+          },
           ...requestInfo,
           url: requestInfo.primaryKeyUrl
         };

package/es/components/form-render/src/components/renderer/search.d.ts

@@ -19,6 +19,7 @@ export declare const SEARCH: import("vue").DefineComponent<{
             name: string;
             render_key: string[];
             search_key: string[];
+            primary_key: string;
             type: string;
             value_key: string;
             level_key: string;
@@ -53,6 +54,7 @@ export declare const SEARCH: import("vue").DefineComponent<{
             name: string;
             render_key: string[];
             search_key: string[];
+            primary_key: string;
             type: string;
             value_key: string;
             level_key: string;

package/es/components/form-render/src/components/renderer/search.js

@@ -3,6 +3,7 @@ import { useDebounceFn } from '@vueuse/core';
 import { isString, cloneDeep, isEqual } from 'lodash-es';
 import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
 import { InjectAsyncQueue, InjectionChangeContextCollector } from '../../constants/index2.js';
+import '../../../../../shared/utils/index2.js';
 import '../../../index2.js';
 import { formRenderLog, optionMatcher } from '../../utils/index.js';
 import { useFormRequest } from '../../hooks/useFormRequest2.js';

package/es/components/form-render/src/components/renderer/searchCascade.js

@@ -3,6 +3,7 @@ import { isField } from '@formily/core';
 import { isEqual, isArray } from 'lodash-es';
 import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
 import { InjectAsyncQueue } from '../../constants/index2.js';
+import '../../../../../shared/utils/index2.js';
 import '@vueuse/core';
 import '../../../index2.js';
 import '../../utils/index.js';

package/es/components/form-render/src/components/renderer/select.js

@@ -4,6 +4,7 @@ import { useDebounceFn } from '@vueuse/core';
 import { isString, cloneDeep, isEqual } from 'lodash-es';
 import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
 import { InjectAsyncQueue, InjectionChangeContextCollector, InjectionFormItemDepsCollector } from '../../constants/index2.js';
+import '../../../../../shared/utils/index2.js';
 import '../../../index2.js';
 import { formRenderLog, optionMatcher } from '../../utils/index.js';
 import { useFormField } from '../../hooks/useFormField2.js';

package/es/components/form-render/src/types/fieldItem.d.ts

@@ -72,6 +72,7 @@ export declare type FormWordbook = Partial<{
     name: string;
     render_key: string[];
     search_key: string[];
+    primary_key: string;
     type: string;
     value_key: string;
     level_key: string;

package/es/components/iho-table/src/components/IhoTableColumn.js

@@ -13,7 +13,7 @@ const ColumnComponent = defineComponent({
     const VxeColumn = resolveComponent("vxe-column");
     const VxeColumnGroup = resolveComponent("vxe-colgroup");
     function renderColumn(field) {
-      return createVNode(VxeColumn, field, null);
+      return createVNode(VxeColumn, field, field.slots);
     }
     function renderColumnGroup(group, children) {
       return createVNode(VxeColumnGroup, omit(group, ["children"]), {

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

@@ -14,7 +14,7 @@ function defaultConfigPlugin() {
           showSeq: true,
           selectType: "checkbox",
           columnConfig: { resizable: true },
-          rowConfig: { height: 32, isHover: true, isCurrent: true, keyField: "theUniqueKey" },
+          rowConfig: { height: 48, isHover: true, isCurrent: true, keyField: "theUniqueKey" },
           editConfig: {
             trigger: "click",
             mode: "cell",

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

@@ -2,3 +2,4 @@ export * from './defaultConfigPlugin';
 export * from './lowCodeFieldAdaptorPlugin';
 export * from './rendererPlugins';
 export * from './rowGroupSettingPlugin';
+export * from './virtualTreePlugin';

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

@@ -12,3 +12,4 @@ export { selectRendererPlugin } from './rendererPlugins/editableWidgets/selectRe
 export { dateRendererPlugin } from './rendererPlugins/editableWidgets/dateRendererPlugin/index.js';
 export { timeRendererPlugin } from './rendererPlugins/editableWidgets/timeRendererPlugin/index.js';
 export { rowGroupSettingPlugin } from './rowGroupSettingPlugin/index2.js';
+export { virtualTreePlugin } from './virtualTreePlugin/index2.js';

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

@@ -12,3 +12,4 @@ export { selectRendererPlugin } from './rendererPlugins/editableWidgets/selectRe
 export { dateRendererPlugin } from './rendererPlugins/editableWidgets/dateRendererPlugin/index.js';
 export { timeRendererPlugin } from './rendererPlugins/editableWidgets/timeRendererPlugin/index.js';
 export { rowGroupSettingPlugin } from './rowGroupSettingPlugin/index2.js';
+export { virtualTreePlugin } from './virtualTreePlugin/index2.js';

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

@@ -14,7 +14,7 @@ function lowCodeFieldAdaptorPlugin() {
           field: _field.columnName,
           width: _field.colWidth,
           showOverflow: "tooltip",
-          ...pick(_field, ["title"])
+          ...pick(_field, ["title", "treeNode"])
         };
         settingObjAdaptor(result, _field);
         return result;

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

@@ -16,6 +16,8 @@ function checkRendererPlugin() {
         if (index === 0 && config.selectType) {
           insertBefore({
             field: pluginName,
+            width: 50,
+            align: "center",
             type: config.selectType
           });
         }

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

@@ -15,6 +15,8 @@ function labelRendererPlugin() {
           column
         }) {
           try {
+            if (!row[column.field])
+              return [];
             const value = JSON.parse(row[column.field]);
             const labels = isArray(value.labels) ? value.labels : parseLabelString(value.labelStr);
             return labels.map(renderLabelItem);

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

@@ -19,8 +19,10 @@ function pictureRendererPlugin() {
             column
           }) {
             try {
+              if (!row[column.field])
+                return [];
               const value = JSON.parse(row[column.field]);
-              const height = getRowHeight();
+              const height = getRowHeight() - 16;
               return [createVNode("section", {
                 "style": "display:flex;justify-content:center"
               }, [createVNode(ViewerImage, {

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "3.1.23-beta.11",
+  "version": "3.1.23-beta.13",
   "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": "167f92da3f533240af1a598f58f70b85a365414f"
 }