cnhis-design-vue 3.1.34-beta.4 → 3.1.34-beta.6

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

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

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

@@ -2076,6 +2076,8 @@ declare const _default: import("vue").DefineComponent<{
         onActiveCellChangeEnd?: ((params: import("vxe-table").VxeTableProDefines.ActiveCellChangeEndEventParams) => void) | undefined;
         uuid?: string | undefined;
         isTree?: 0 | 2 | 1 | 3 | undefined;
+        isSort?: 0 | 1 | undefined;
+        isBatchSelect?: 0 | 1 | undefined;
         showSeq?: boolean | undefined;
         selectType?: "checkbox" | "radio" | null | undefined;
         rowGroupSetting?: {
@@ -4465,6 +4467,8 @@ declare const _default: import("vue").DefineComponent<{
         params?: any;
         uuid?: string | undefined;
         isTree?: 0 | 2 | 1 | 3 | undefined;
+        isSort?: 0 | 1 | undefined;
+        isBatchSelect?: 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/plugins/defaultConfigPlugin/index.js

@@ -1,5 +1,5 @@
-import { mergeWith } from 'lodash-es';
-import { HIGHEST_PRIORITY, IHO_TABLE_TREE_TYPE } from '../../constants/index.js';
+import { mergeWith, isObject } from 'lodash-es';
+import { HIGHEST_PRIORITY, IHO_TABLE_TREE_TYPE, IHO_TABLE_NUMBER_STATUS } from '../../constants/index.js';
 import { defineTablePlugin } from '../../hooks/useTablePlugin.js';
 
 function defaultConfigPlugin() {
@@ -13,7 +13,6 @@ function defaultConfigPlugin() {
             height: "100%",
             border: true,
             showSeq: true,
-            selectType: "checkbox",
             columnConfig: { resizable: true },
             rowConfig: { height: 36, isHover: true, isCurrent: true, keyField: "theUniqueKey" },
             mouseConfig: { selected: true },
@@ -29,7 +28,13 @@ function defaultConfigPlugin() {
           config
         );
         if (config.isTree === IHO_TABLE_TREE_TYPE.TRANSFORM_TREE_TYPE) {
-          result.treeConfig = { ...config.treeConfig, transform: true };
+          result.treeConfig = Object.assign({}, { transform: true }, result.treeConfig);
+        }
+        if (config.isBatchSelect === IHO_TABLE_NUMBER_STATUS.POSITIVE || config.selectType) {
+          result.selectType = config.selectType || "checkbox";
+        }
+        if (isObject(config.keyboardConfig)) {
+          result.mouseConfig = Object.assign({}, { selected: config.keyboardConfig.isEdit }, result.mouseConfig);
         }
         return result;
       });

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

@@ -125,6 +125,7 @@ function filterPlugin() {
           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) => ({

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,9 +36,11 @@ function settingObjAdaptor(fieldItem, lowCodeField, config) {
     props
   };
   fieldItem.editRender.enabled = !Reflect.get(WIDGET_TYPE, fieldItem.editRender.name);
-  if (!lowCodeField.settingObj)
+  if (!isObject(lowCodeField.settingObj))
     return;
-  fieldItem.visible = ((_a = lowCodeField.settingObj) == null ? void 0 : _a.isHide) !== IHO_TABLE_STRING_STATUS.POSITIVE;
+  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/types/index.d.ts

@@ -14,6 +14,8 @@ export declare type IhoTableConfig = VxeTableProps & Partial<{
 }> & Partial<{
     uuid: string;
     isTree: 0 | 1 | 2 | 3;
+    isSort: 0 | 1;
+    isBatchSelect: 0 | 1;
     showSeq: boolean;
     selectType: Exclude<VxeTableDefines.ColumnInfo['type'], 'seq' | 'expand' | 'html'>;
     rowGroupSetting: Partial<Record<TupleToUnion<typeof IhoTableRowGroupSequence>, IhoTableRowGroupItem[]>>;
@@ -56,6 +58,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.4",
+	"version": "3.1.34-beta.6",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -61,5 +61,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "bb84ad766b4ccadc69da5beb8979c3fa1b2816b3"
+	"gitHead": "67795a79ebf11c9ca6a3f6f511d012786eb2199a"
 }