cnhis-design-vue 3.1.34-beta.3 → 3.1.34-beta.5

package/es/components/big-table/src/components/edit-form/edit-input.js

@@ -32,10 +32,11 @@ var EditInput = defineComponent({
     attrs,
     emit
   }) {
+    var _a;
     const {
       formRef
     } = useCommon(props, attrs);
-    const __value = ref(props.type === "number" ? attrs.value || void 0 : attrs.value);
+    const __value = ref(props.type === "number" ? (_a = attrs.value) != null ? _a : void 0 : attrs.value);
     const commData = {
       row: props.row,
       column: props.col,

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

@@ -230,6 +230,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       pacemaker = {},
       upArrowStyle = {},
       limitValueStyle = {},
+      nonePainPointStyle = {},
       dataList = []
     } = scaleValue;
     const pointList = [];
@@ -444,7 +445,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         lockMovementX: true,
         ...v.pacemakerShow && type == "pulse" ? pacemaker.style : pointAttr,
         ...propItems.event,
-        ...isNonePain ? { selectable: false, evented: false } : {}
+        ...isNonePain ? { selectable: false, evented: false, ...nonePainPointStyle } : {}
       };
       if (previousLine) {
         const y = previousLine.get("y2");

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

@@ -2076,6 +2076,8 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
         onActiveCellChangeStart?: ((params: import("vxe-table").VxeTableProDefines.ActiveCellChangeStartEventParams) => void) | undefined;
         onActiveCellChangeEnd?: ((params: import("vxe-table").VxeTableProDefines.ActiveCellChangeEndEventParams) => void) | undefined;
         uuid?: string | undefined;
+        isTree?: 0 | 2 | 1 | 3 | undefined;
+        isSort?: 0 | 1 | undefined;
         showSeq?: boolean | undefined;
         selectType?: "checkbox" | "radio" | null | undefined;
         rowGroupSetting?: {
@@ -4464,6 +4466,8 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
         } | undefined;
         params?: any;
         uuid?: string | undefined;
+        isTree?: 0 | 2 | 1 | 3 | undefined;
+        isSort?: 0 | 1 | undefined;
         showSeq?: boolean | undefined;
         selectType?: "checkbox" | "radio" | null | undefined;
         rowGroupSetting?: {

package/es/components/iho-table/src/IhoTable.vue.d.ts

@@ -2075,6 +2075,8 @@ declare const _default: import("vue").DefineComponent<{
         onActiveCellChangeStart?: ((params: import("vxe-table").VxeTableProDefines.ActiveCellChangeStartEventParams) => void) | undefined;
         onActiveCellChangeEnd?: ((params: import("vxe-table").VxeTableProDefines.ActiveCellChangeEndEventParams) => void) | undefined;
         uuid?: string | undefined;
+        isTree?: 0 | 2 | 1 | 3 | undefined;
+        isSort?: 0 | 1 | undefined;
         showSeq?: boolean | undefined;
         selectType?: "checkbox" | "radio" | null | undefined;
         rowGroupSetting?: {
@@ -4463,6 +4465,8 @@ declare const _default: import("vue").DefineComponent<{
         } | undefined;
         params?: any;
         uuid?: string | undefined;
+        isTree?: 0 | 2 | 1 | 3 | undefined;
+        isSort?: 0 | 1 | undefined;
         showSeq?: boolean | undefined;
         selectType?: "checkbox" | "radio" | null | undefined;
         rowGroupSetting?: {

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

@@ -27,7 +27,7 @@ const ColumnComponent = defineComponent({
         "class": "iho-table__headerWrapper"
       }, [createVNode("section", {
         "style": {
-          width: widthAppend(payload.column.renderWidth - (hasAnnotation ? 36 : 20))
+          width: widthAppend(payload.column.renderWidth - (hasAnnotation ? 36 : 20) - (props.field.sortable ? 24 : 0))
         }
       }, [[...arrayed(customHeader != null ? customHeader : createVNode(NEllipsis, {
         "style": {

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

@@ -57,6 +57,12 @@ export declare enum IHO_TABLE_STRING_STATUS {
     NEGATIVE = "0",
     POSITIVE = "1"
 }
+export declare enum IHO_TABLE_TREE_TYPE {
+    NOT_TREE = 0,
+    UNKNOWN = 1,
+    UNKNOWN2 = 2,
+    TRANSFORM_TREE_TYPE = 3
+}
 export declare const IhoTableCustomEventNameTuple: readonly ["formChange", "settingClick", "formClick", "keyboard"];
 export declare const IhoTableEventNameTuple: readonly ["formChange", "settingClick", "formClick", "keyboard", ...("toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "sortChange" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd")[]];
 export declare const InjectionIhoTableConfig: InjectionKey<Ref<IhoTableConfig>>;

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

@@ -128,12 +128,14 @@ var IHO_TABLE_STRING_STATUS = /* @__PURE__ */ ((IHO_TABLE_STRING_STATUS2) => {
   IHO_TABLE_STRING_STATUS2["POSITIVE"] = "1";
   return IHO_TABLE_STRING_STATUS2;
 })(IHO_TABLE_STRING_STATUS || {});
-const IhoTableCustomEventNameTuple = [
-  "formChange",
-  "settingClick",
-  "formClick",
-  "keyboard"
-];
+var IHO_TABLE_TREE_TYPE = /* @__PURE__ */ ((IHO_TABLE_TREE_TYPE2) => {
+  IHO_TABLE_TREE_TYPE2[IHO_TABLE_TREE_TYPE2["NOT_TREE"] = 0] = "NOT_TREE";
+  IHO_TABLE_TREE_TYPE2[IHO_TABLE_TREE_TYPE2["UNKNOWN"] = 1] = "UNKNOWN";
+  IHO_TABLE_TREE_TYPE2[IHO_TABLE_TREE_TYPE2["UNKNOWN2"] = 2] = "UNKNOWN2";
+  IHO_TABLE_TREE_TYPE2[IHO_TABLE_TREE_TYPE2["TRANSFORM_TREE_TYPE"] = 3] = "TRANSFORM_TREE_TYPE";
+  return IHO_TABLE_TREE_TYPE2;
+})(IHO_TABLE_TREE_TYPE || {});
+const IhoTableCustomEventNameTuple = ["formChange", "settingClick", "formClick", "keyboard"];
 const IhoTableEventNameTuple = [...IhoTableCustomEventNameTuple, ...VxeTableEventNameList];
 const InjectionIhoTableConfig = Symbol("injectionIhoTableConfig");
 const InjectionIhoTableFieldList = Symbol("injectionIhoTableFieldList");
@@ -145,4 +147,4 @@ const InjectionIhoTableEventListener = Symbol(
   "InjectionIhoTableEventListener"
 );
 
-export { EDITABLE_WIDGET_TYPE, HIGHEST_PRIORITY, IHO_TABLE_NUMBER_STATUS, IHO_TABLE_STRING_STATUS, IhoTableCustomEventNameTuple, IhoTableEventNameTuple, IhoTableRowGroupSequence, InjectionIhoTableConfig, InjectionIhoTableEmits, InjectionIhoTableEventListener, InjectionIhoTableFieldList, InjectionIhoTableHandler, InjectionIhoTableInstance, InjectionIhoTableUUID, VxeEventListenerNameList, VxeTableEventNameList, WIDGET_TYPE };
+export { EDITABLE_WIDGET_TYPE, HIGHEST_PRIORITY, IHO_TABLE_NUMBER_STATUS, IHO_TABLE_STRING_STATUS, IHO_TABLE_TREE_TYPE, IhoTableCustomEventNameTuple, IhoTableEventNameTuple, IhoTableRowGroupSequence, InjectionIhoTableConfig, InjectionIhoTableEmits, InjectionIhoTableEventListener, InjectionIhoTableFieldList, InjectionIhoTableHandler, InjectionIhoTableInstance, InjectionIhoTableUUID, VxeEventListenerNameList, VxeTableEventNameList, WIDGET_TYPE };

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

@@ -1,5 +1,5 @@
 import { mergeWith } from 'lodash-es';
-import { HIGHEST_PRIORITY } from '../../constants/index.js';
+import { HIGHEST_PRIORITY, IHO_TABLE_TREE_TYPE } from '../../constants/index.js';
 import { defineTablePlugin } from '../../hooks/useTablePlugin.js';
 
 function defaultConfigPlugin() {
@@ -8,7 +8,7 @@ function defaultConfigPlugin() {
     name: pluginName,
     apply(hooks) {
       hooks.configHooks.config.tap({ name: pluginName, stage: HIGHEST_PRIORITY }, (config) => {
-        return mergeWith(
+        const result = mergeWith(
           {
             height: "100%",
             border: true,
@@ -28,6 +28,10 @@ function defaultConfigPlugin() {
           },
           config
         );
+        if (config.isTree === IHO_TABLE_TREE_TYPE.TRANSFORM_TREE_TYPE) {
+          result.treeConfig = { ...config.treeConfig, transform: true };
+        }
+        return result;
       });
     }
   });

package/es/components/iho-table/src/plugins/filterPlugin/filter.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, inject, ref, onDeactivated, watch, computed, openBlock, createElementBlock, createVNode, unref, withCtx, createTextVNode, toDisplayString, normalizeClass, createElementVNode, Fragment, renderList, normalizeStyle } from 'vue';
+import { defineComponent, inject, ref, onDeactivated, watch, computed, openBlock, createElementBlock, createElementVNode, renderSlot, createVNode, unref, withCtx, createTextVNode, toDisplayString, normalizeClass, Fragment, renderList, normalizeStyle } from 'vue';
 import { widthAppend } from '../../../../../shared/utils/index.js';
 import { FunnelSharp } from '@vicons/ionicons5';
 import { useVModel, useVirtualList } from '@vueuse/core';
@@ -7,9 +7,10 @@ import { InjectionIhoTableUUID } from '../../constants/index.js';
 import _export_sfc from '../../../../../_virtual/plugin-vue_export-helper.js';
 
 const _hoisted_1 = { style: { "display": "flex", "align-items": "center" } };
-const _hoisted_2 = { class: "iho-table__filterWrapper" };
-const _hoisted_3 = ["onClick"];
-const _hoisted_4 = { class: "iho-table__filterFooter" };
+const _hoisted_2 = { style: { "max-width": "calc(100% - 22px)" } };
+const _hoisted_3 = { class: "iho-table__filterWrapper" };
+const _hoisted_4 = ["onClick"];
+const _hoisted_5 = { class: "iho-table__filterFooter" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "filter",
   props: {
@@ -77,12 +78,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("section", _hoisted_1, [
-        createVNode(unref(NEllipsis), { style: { "max-width": "calc(100% - 22px)" } }, {
-          default: withCtx(() => [
-            createTextVNode(toDisplayString(__props.payload.column.title), 1)
-          ]),
-          _: 1
-        }),
+        createElementVNode("section", _hoisted_2, [
+          renderSlot(_ctx.$slots, "header", {}, () => [
+            createVNode(unref(NEllipsis), null, {
+              default: withCtx(() => [
+                createTextVNode(toDisplayString(__props.payload.column.title), 1)
+              ]),
+              _: 1
+            })
+          ])
+        ]),
         createVNode(unref(NPopover), {
           to: `#${unref(uuid)}`,
           show: filterVisible.value
@@ -95,13 +100,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }, null, 8, ["class", "component"])
           ]),
           default: withCtx(() => [
-            createElementVNode("section", _hoisted_2, [
+            createElementVNode("section", _hoisted_3, [
               (openBlock(), createElementBlock(Fragment, null, renderList(sortStatusList, (item) => {
                 return createElementVNode("div", {
                   key: item.status,
                   class: normalizeClass(["iho-table__filterButton", { "iho-table__filterButton--active": unref(sortStatusRef) === item.status }]),
                   onClick: ($event) => setSort(item.status)
-                }, toDisplayString(item.text), 11, _hoisted_3);
+                }, toDisplayString(item.text), 11, _hoisted_4);
               }), 64)),
               createVNode(unref(NInput), {
                 value: searchFilterText.value,
@@ -137,7 +142,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }, 8, ["value"]),
-              createElementVNode("footer", _hoisted_4, [
+              createElementVNode("footer", _hoisted_5, [
                 createElementVNode("section", null, toDisplayString(`\u5DF2\u9009\u62E9${checkedCacheRef.value.length}\u9879`), 1),
                 createVNode(unref(NButtonGroup), { size: "tiny" }, {
                   default: withCtx(() => [

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

@@ -1,4 +1,5 @@
 import { computed, createVNode, onBeforeUnmount, reactive } from 'vue';
+import { jsonParse } from '../../../../../shared/utils/index.js';
 import { isObject, isArray } from 'lodash-es';
 import '../../../index.js';
 import { IHO_TABLE_NUMBER_STATUS, IHO_TABLE_STRING_STATUS } from '../../constants/index.js';
@@ -121,62 +122,60 @@ function filterPlugin() {
           const lowCodeField = (_a = fieldItem.editRender) == null ? void 0 : _a.props;
           if (!isObject(lowCodeField))
             return;
-          try {
-            const fieldSetting = JSON.parse(lowCodeField.fieldSetting || "");
-            if (!isFieldSetting(fieldSetting) || !showFilter(fieldSetting))
-              return;
-            let options = (_d = (_c = (_b = fieldSetting.mapping) == null ? void 0 : _b.mappingFiled) == null ? void 0 : _c.map((item) => item.value[0])) != null ? _d : [];
-            if (isCompatibleColumn(lowCodeField)) {
-              options = (_f = (_e = lowCodeField.options) == null ? void 0 : _e.map((option) => ({
-                ...option,
-                key: option.label
-              }))) != null ? _f : [];
-            }
-            const {
-              filterState,
-              setChecked,
-              setSort
-            } = initFilterState(uuid, fieldItem.field, lowCodeField.filterDefaultValue);
-            filterState.options = options;
-            const oldHeader = (_g = fieldItem.slots) == null ? void 0 : _g.header;
-            const sortStatusRef = computed({
-              get: () => {
-                return filterState.sortStatus;
-              },
-              set: (value) => setSort({
-                field: fieldItem.field,
-                value,
-                $table: $table.value,
-                emits
-              })
-            });
-            const checkedRef = computed({
-              get: () => filterState.checked,
-              set: (value) => setChecked({
-                field: fieldItem.field,
-                value,
-                $table: $table.value,
-                emits
-              })
-            });
-            const optionsRef = computed(() => filterState.options);
-            fieldItem.slots = {
-              ...fieldItem.slots,
-              header(payload) {
-                return createVNode(FilterComponent, {
-                  "payload": payload,
-                  "options": optionsRef.value,
-                  "checked": checkedRef.value,
-                  "onUpdate:checked": ($event) => checkedRef.value = $event,
-                  "sortStatus": sortStatusRef.value,
-                  "onUpdate:sortStatus": ($event) => sortStatusRef.value = $event
-                }, {
-                  header: oldHeader
-                });
-              }
-            };
-          } catch (e) {
+          const fieldSetting = jsonParse(lowCodeField.fieldSetting || "");
+          if (!isFieldSetting(fieldSetting) || !showFilter(fieldSetting))
+            return;
+          fieldItem.sortable = false;
+          let options = (_d = (_c = (_b = fieldSetting.mapping) == null ? void 0 : _b.mappingFiled) == null ? void 0 : _c.map((item) => item.value[0])) != null ? _d : [];
+          if (isCompatibleColumn(lowCodeField)) {
+            options = (_f = (_e = lowCodeField.options) == null ? void 0 : _e.map((option) => ({
+              ...option,
+              key: option.label
+            }))) != null ? _f : [];
           }
+          const {
+            filterState,
+            setChecked,
+            setSort
+          } = initFilterState(uuid, fieldItem.field, lowCodeField.filterDefaultValue);
+          filterState.options = options;
+          const oldHeader = (_g = fieldItem.slots) == null ? void 0 : _g.header;
+          const sortStatusRef = computed({
+            get: () => {
+              return filterState.sortStatus;
+            },
+            set: (value) => setSort({
+              field: fieldItem.field,
+              value,
+              $table: $table.value,
+              emits
+            })
+          });
+          const checkedRef = computed({
+            get: () => filterState.checked,
+            set: (value) => setChecked({
+              field: fieldItem.field,
+              value,
+              $table: $table.value,
+              emits
+            })
+          });
+          const optionsRef = computed(() => filterState.options);
+          fieldItem.slots = {
+            ...fieldItem.slots,
+            header(payload) {
+              return createVNode(FilterComponent, {
+                "payload": payload,
+                "options": optionsRef.value,
+                "checked": checkedRef.value,
+                "onUpdate:checked": ($event) => checkedRef.value = $event,
+                "sortStatus": sortStatusRef.value,
+                "onUpdate:sortStatus": ($event) => sortStatusRef.value = $event
+              }, {
+                header: oldHeader
+              });
+            }
+          };
         });
         return fieldList;
       });

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

@@ -1,4 +1,4 @@
-import { pick, cloneDeep } from 'lodash-es';
+import { pick, cloneDeep, isObject } from 'lodash-es';
 import { toRaw } from 'vue';
 import { HIGHEST_PRIORITY, IHO_TABLE_NUMBER_STATUS, WIDGET_TYPE, IHO_TABLE_STRING_STATUS } from '../../constants/index.js';
 import { defineTablePlugin } from '../../hooks/useTablePlugin.js';
@@ -17,6 +17,7 @@ function lowCodeFieldAdaptorPlugin() {
           showOverflow: Reflect.has(_field, "showOverflow") ? _field.showOverflow : "tooltip",
           visible: _field.isShow !== IHO_TABLE_NUMBER_STATUS.NEGATIVE,
           minWidth: _field.colWidth,
+          sortable: _field.isSort === IHO_TABLE_NUMBER_STATUS.POSITIVE,
           slots: { ..._field.slots, default: _field.slotFn, header: _field.headerSlotFn },
           ...pick(_field, ["title", "treeNode", "resizable"])
         };
@@ -27,7 +28,6 @@ function lowCodeFieldAdaptorPlugin() {
   });
 }
 function settingObjAdaptor(fieldItem, lowCodeField, config) {
-  var _a;
   const props = cloneDeep(toRaw(lowCodeField));
   props.componentProps = { size: config.size === "mini" ? "small" : config.size, ...props.componentProps };
   fieldItem.editRender = {
@@ -36,7 +36,11 @@ function settingObjAdaptor(fieldItem, lowCodeField, config) {
     props
   };
   fieldItem.editRender.enabled = !Reflect.get(WIDGET_TYPE, fieldItem.editRender.name);
-  fieldItem.visible = ((_a = lowCodeField.settingObj) == null ? void 0 : _a.isHide) !== IHO_TABLE_STRING_STATUS.POSITIVE;
+  if (!isObject(lowCodeField.settingObj))
+    return;
+  if (Reflect.has(lowCodeField.settingObj, "isHide")) {
+    fieldItem.visible = fieldItem.visible && lowCodeField.settingObj.isHide !== IHO_TABLE_STRING_STATUS.POSITIVE;
+  }
 }
 
 export { lowCodeFieldAdaptorPlugin };

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

@@ -41,12 +41,19 @@ function virtualTreePlugin() {
       hooks.fieldHooks.fieldList.tap(pluginName, (fieldList, config) => {
         const { transform } = config.treeConfig || DMZ;
         if (transform && config.uuid) {
-          const treeNodeColumnIndex = fieldList.findIndex((field) => field.treeNode);
+          let treeNodeColumnIndex = fieldList.findIndex((field) => field.treeNode);
+          if (!~treeNodeColumnIndex) {
+            fieldList.some((field, index) => {
+              if (field.type)
+                return;
+              treeNodeColumnIndex = index;
+              return field.treeNode = true;
+            });
+          }
           treeNodeColumnIndexMap.set(config.uuid, {
-            index: ~treeNodeColumnIndex ? treeNodeColumnIndex : 0,
+            index: treeNodeColumnIndex,
             length: fieldList.length
           });
-          !~treeNodeColumnIndex && Reflect.set(fieldList[0], "treeNode", true);
         }
         return fieldList;
       });

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

@@ -13,6 +13,8 @@ export declare type IhoTableConfig = VxeTableProps & Partial<{
     [K in typeof VxeEventListenerNameList[number]]: (...payload: IhoTableEmitPayload<EventListenerToEventName<K>>) => void;
 }> & Partial<{
     uuid: string;
+    isTree: 0 | 1 | 2 | 3;
+    isSort: 0 | 1;
     showSeq: boolean;
     selectType: Exclude<VxeTableDefines.ColumnInfo['type'], 'seq' | 'expand' | 'html'>;
     rowGroupSetting: Partial<Record<TupleToUnion<typeof IhoTableRowGroupSequence>, IhoTableRowGroupItem[]>>;
@@ -55,6 +57,7 @@ export declare type LowCodeTableFieldItem = {
     settingObj: IhoTableLowCodeField.SettingObj;
     treeNode: boolean;
     isShow: 0 | 1;
+    isSort: 0 | 1;
     formType: string;
     fieldSetting: string;
     componentProps: AnyObject;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.1.34-beta.3",
+	"version": "3.1.34-beta.5",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "468e5a0562680804ee4abd3a5be59568c24835a5"
+	"gitHead": "a8d46e9ee25e00f378e72e0e30ca668efb1fb9ff"
 }