cnhis-design-vue 3.1.34-beta.7 → 3.1.34-beta.8

package/es/components/big-table/src/BigTable.vue2.js

@@ -143,11 +143,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       } = props.tableParams;
       let statusNumber = Number(state.isTree);
       if ([1, 3].includes(statusNumber)) {
-        result = {
+        result = Object.assign({}, {
           children: "childrenList",
           accordion: state.openOnly > 0,
           reserve: true
-        };
+        }, result);
         if (isTransform) {
           Reflect.deleteProperty(result, "children");
           Object.assign(result, {
@@ -157,14 +157,14 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           });
         }
       } else if (statusNumber == 2) {
-        result = {
+        result = Object.assign({}, {
           lazy: true,
           reserve: true,
           children: "childrenList",
           hasChild: "hasChildren",
           loadMethod: loadChildrenMethod,
           accordion: state.openOnly > 0
-        };
+        }, result);
       }
       return result;
     });

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

@@ -47,6 +47,9 @@ var EditSelect = defineComponent({
     const setOptions = async () => {
       if (props.col.options) {
         state.options = JSON.parse(JSON.stringify(props.col.options));
+        if (!state.keyupValue && state.options.length) {
+          state.keyupValue = state.options[0].value;
+        }
       } else {
         `${props.col.columnName}_options`;
         const obj = {
@@ -90,6 +93,8 @@ var EditSelect = defineComponent({
       if (state.config.multiple || !["ArrowUp", "ArrowDown"].includes(key))
         return;
       let index = state.options.findIndex((item) => item.value === state.keyupValue);
+      if (!~index)
+        return;
       const length = state.options.length;
       if (key === "ArrowUp") {
         index = index === 0 ? length - 1 : index - 1;

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

@@ -2,8 +2,8 @@ import { COMPONENT_NAMESPACE } from '../../shared/global/variable.js';
 import { safeComponentRegister } from '../../shared/utils/index.js';
 import script from './src/IhoTable.vue.js';
 import PluginPresets from './src/plugins/index.js';
-import 'vue';
 import 'lodash-es';
+import 'vue';
 import './src/constants/index.js';
 import '../../shared/utils/tapable/SyncHook.js';
 import '../../shared/utils/tapable/SyncBailHook.js';

package/es/components/iho-table/src/IhoTable.vue.js

@@ -1,6 +1,7 @@
 import { defineComponent, provide, ref, computed, watch, resolveComponent, openBlock, createElementBlock, unref, createBlock, resolveDynamicComponent, createVNode, mergeProps, createSlots, withCtx, Fragment, renderList, renderSlot } from 'vue';
 import { uuidGenerator } from '../../../shared/utils/index.js';
 import { useDebounceFn } from '@vueuse/core';
+import { promiseTimeout } from '@vueuse/shared';
 import { VxeEventListenerNameList, InjectionIhoTableEmits, InjectionIhoTableUUID, InjectionIhoTableInstance, InjectionIhoTableConfig, InjectionIhoTableFieldList, InjectionIhoTableHandler } from './constants/index.js';
 import { createTableHooks, applyTableConfigHooks, applyTableFieldHooks, createTableEventHandlers, createDomInsertComponent, createDataTransfer } from './hooks/tapHooks/index.js';
 import 'lodash-es';
@@ -87,7 +88,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       },
       { deep: true }
     );
-    watch(() => props.tableData, updateTableDataRef);
+    watch([() => props.tableData, () => {
+      var _a2;
+      return (_a2 = props.tableData) == null ? void 0 : _a2.length;
+    }], async () => {
+      var _a2, _b2;
+      if (!((_a2 = configRef.value.treeConfig) == null ? void 0 : _a2.expandAll))
+        return;
+      await promiseTimeout(11);
+      (_b2 = $table.value) == null ? void 0 : _b2.setAllTreeExpand(true);
+    });
+    watch(() => [...props.tableData], updateTableDataRef);
     _updateConfigRef();
     _updateFieldListRef();
     _updateTableDataRef();

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

@@ -2,8 +2,8 @@ import { AnyObject, Nullable } from '../../../../../../es/shared/types';
 import { MaybeRef } from '@vueuse/core';
 import { Ref } from 'vue';
 import { VxeTableInstance } from 'vxe-table';
-import { IhoTableEventListener } from '../../../../../../es/components/iho-table/src/hooks/tapHooks/useEventHooks';
 import { IhoTableConfig, IhoTableEmits, IhoTableFieldItem, IhoTableHandler, TableHooks } from '../../../../../../es/components/iho-table/src/types';
+import { IhoTableEventListener } from './useEventHooks';
 export declare const createTableHooks: () => Readonly<{
     configHooks: import("../../../../../../es/components/iho-table/src/types").AbstractConfigHooks;
     fieldHooks: import("../../../../../../es/components/iho-table/src/types").AbstractFieldHooks;

package/es/components/iho-table/src/hooks/tapHooks/index.js

@@ -1,15 +1,15 @@
 import { arrayed } from '../../../../../shared/utils/index.js';
-import { unref, defineComponent } from 'vue';
 import { cloneDeep, isArray, isFunction } from 'lodash-es';
+import { unref, defineComponent } from 'vue';
 import { VxeEventListenerNameList } from '../../constants/index.js';
+import { getEventName } from '../../utils/index.js';
+import { useConfigHooks } from './useConfigHooks.js';
 import { useDataHooks } from './useDataHooks.js';
 import { useDomInsertHooks } from './useDomInsertHooks.js';
 import { useEventHooks } from './useEventHooks.js';
 import { useExposeHooks } from './useExposeHooks.js';
-import { useSetupHooks } from './useSetupHooks.js';
-import { getEventName } from '../../utils/index.js';
-import { useConfigHooks } from './useConfigHooks.js';
 import { useFieldHooks } from './useFieldHooks.js';
+import { useSetupHooks } from './useSetupHooks.js';
 
 const createTableHooks = (() => {
   let tapHooks = null;

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

@@ -16,20 +16,22 @@ function defaultConfigPlugin() {
             showSeq: true,
             columnConfig: { resizable: true },
             rowConfig: { height: 36, isHover: true, isCurrent: true, keyField: "theUniqueKey" },
-            mouseConfig: { selected: true },
             showOverflow: "tooltip",
             editConfig: {
               trigger: "click",
               mode: "cell",
               autoClear: false,
               showIcon: false
-            },
-            keyboardConfig: { isArrow: true, isDel: true, isEnter: true, isTab: true, isEdit: true, isChecked: true }
+            }
           },
           config
         );
         if (config.isTree === IHO_TABLE_TREE_TYPE.TRANSFORM_TREE_TYPE) {
-          result.treeConfig = Object.assign({}, { transform: true }, result.treeConfig);
+          result.treeConfig = Object.assign(
+            {},
+            { transform: true, expandAll: true, lazy: true, reserve: true },
+            result.treeConfig
+          );
         }
         if (IhoTableStatusHelper.isPositive(config.isBatchSelect) || config.selectType) {
           result.selectType = config.selectType || "checkbox";

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

@@ -6,6 +6,9 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<VxeColumnPropTypes.HeaderSlotParams>;
         required: true;
     };
+    sortable: {
+        type: BooleanConstructor;
+    };
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];
@@ -23,6 +26,9 @@ declare const _default: import("vue").DefineComponent<{
             type: PropType<VxeColumnPropTypes.HeaderSlotParams>;
             required: true;
         };
+        sortable: {
+            type: BooleanConstructor;
+        };
         options: {
             type: PropType<AnyObject[]>;
             default: () => never[];
@@ -62,6 +68,8 @@ declare const _default: import("vue").DefineComponent<{
             marginTop: string;
         };
     }>;
+    indeterminate: import("vue").ComputedRef<boolean>;
+    checkAll: import("vue").WritableComputedRef<boolean>;
     containerStyleWithHeight: import("vue").ComputedRef<CSSProperties>;
     confirmFilter: () => void;
     sortStatusList: {
@@ -134,6 +142,9 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<VxeColumnPropTypes.HeaderSlotParams>;
         required: true;
     };
+    sortable: {
+        type: BooleanConstructor;
+    };
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];
@@ -150,5 +161,6 @@ declare const _default: import("vue").DefineComponent<{
     "onUpdate:sortStatus"?: ((...args: any[]) => any) | undefined;
 }, {
     options: AnyObject[];
+    sortable: boolean;
 }>;
 export default _default;

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

@@ -1,16 +1,18 @@
-import { defineComponent, inject, ref, onDeactivated, watch, computed, openBlock, createElementBlock, createElementVNode, renderSlot, createVNode, unref, withCtx, createTextVNode, toDisplayString, normalizeClass, Fragment, renderList, normalizeStyle } from 'vue';
+import { defineComponent, inject, ref, onDeactivated, watch, computed, openBlock, createElementBlock, createElementVNode, renderSlot, createVNode, unref, withCtx, createTextVNode, toDisplayString, normalizeClass, createCommentVNode, Fragment, renderList, createBlock, isRef, normalizeStyle } from 'vue';
 import { widthAppend } from '../../../../../shared/utils/index.js';
 import { FunnelSharp } from '@vicons/ionicons5';
 import { useVModel, useVirtualList } from '@vueuse/core';
-import { NEllipsis, NPopover, NIcon, NInput, NCheckboxGroup, NCheckbox, NButtonGroup, NButton } from 'naive-ui';
+import { NEllipsis, NPopover, NIcon, NInput, NCheckbox, NCheckboxGroup, NButtonGroup, NButton } from 'naive-ui';
 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 = { 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 _hoisted_4 = { key: 0 };
+const _hoisted_5 = ["onClick"];
+const _hoisted_6 = { class: "iho-table__filterListItem" };
+const _hoisted_7 = { class: "iho-table__filterFooter" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "filter",
   props: {
@@ -18,6 +20,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       type: Object,
       required: true
     },
+    sortable: { type: Boolean },
     options: { type: Array, default: () => [] },
     checked: { type: Array, required: true },
     sortStatus: { type: String }
@@ -55,6 +58,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         overscan: 3
       }
     );
+    const indeterminate = computed(() => !!checkedCacheRef.value.length && checkedCacheRef.value.length !== props.options.length);
+    const checkAll = computed({
+      get() {
+        return checkedCacheRef.value.length === props.options.length;
+      },
+      set: (isCheck) => {
+        if (isCheck) {
+          checkedCacheRef.value = props.options.map((item) => item.value);
+          return;
+        }
+        checkedCacheRef.value = [];
+      }
+    });
     const containerStyleWithHeight = computed(() => {
       return {
         ...containerProps.style,
@@ -101,26 +117,38 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ]),
           default: withCtx(() => [
             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_4);
-              }), 64)),
-              createVNode(unref(NInput), {
+              createCommentVNode(' \u5224\u65AD\u662F\u5426\u663E\u793A\u5347\u5E8F\u964D\u5E8F\u6A21\u5757\u7684\u7EC4\u4EF6 v-if="sortable"'),
+              __props.sortable ? (openBlock(), createElementBlock("div", _hoisted_4, [
+                (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_5);
+                }), 64))
+              ])) : createCommentVNode("v-if", true),
+              __props.options.length > 5 ? (openBlock(), createBlock(unref(NInput), {
+                key: 1,
                 value: searchFilterText.value,
                 "onUpdate:value": _cache[0] || (_cache[0] = ($event) => searchFilterText.value = $event)
-              }, null, 8, ["value"]),
+              }, null, 8, ["value"])) : createCommentVNode("v-if", true),
+              createElementVNode("div", _hoisted_6, [
+                createVNode(unref(NCheckbox), {
+                  label: "\u5168\u9009",
+                  checked: unref(checkAll),
+                  "onUpdate:checked": _cache[1] || (_cache[1] = ($event) => isRef(checkAll) ? checkAll.value = $event : null),
+                  indeterminate: unref(indeterminate)
+                }, null, 8, ["checked", "indeterminate"])
+              ]),
               createVNode(unref(NCheckboxGroup), {
                 value: checkedCacheRef.value,
-                "onUpdate:value": _cache[2] || (_cache[2] = ($event) => checkedCacheRef.value = $event)
+                "onUpdate:value": _cache[3] || (_cache[3] = ($event) => checkedCacheRef.value = $event)
               }, {
                 default: withCtx(() => [
                   createElementVNode("section", {
                     ref: unref(containerProps).ref,
                     style: normalizeStyle(unref(containerStyleWithHeight)),
-                    onScroll: _cache[1] || (_cache[1] = (...args) => unref(containerProps).onScroll && unref(containerProps).onScroll(...args)),
+                    onScroll: _cache[2] || (_cache[2] = (...args) => unref(containerProps).onScroll && unref(containerProps).onScroll(...args)),
                     class: "iho-table__filterListWrapper"
                   }, [
                     createElementVNode("section", {
@@ -142,12 +170,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }, 8, ["value"]),
-              createElementVNode("footer", _hoisted_5, [
+              createElementVNode("footer", _hoisted_7, [
                 createElementVNode("section", null, toDisplayString(`\u5DF2\u9009\u62E9${checkedCacheRef.value.length}\u9879`), 1),
                 createVNode(unref(NButtonGroup), { size: "tiny" }, {
                   default: withCtx(() => [
                     createVNode(unref(NButton), {
-                      onClick: _cache[3] || (_cache[3] = ($event) => checkedCacheRef.value = [])
+                      onClick: _cache[4] || (_cache[4] = ($event) => checkedCacheRef.value = [])
                     }, {
                       default: withCtx(() => [
                         createTextVNode("\u6E05\u7A7A")

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;
+          const sortable = fieldItem.sortable;
           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)) {
@@ -167,6 +168,7 @@ function filterPlugin() {
               return createVNode(FilterComponent, {
                 "payload": payload,
                 "options": optionsRef.value,
+                "sortable": sortable,
                 "checked": checkedRef.value,
                 "onUpdate:checked": ($event) => checkedRef.value = $event,
                 "sortStatus": sortStatusRef.value,

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

@@ -19,7 +19,8 @@ function lowCodeFieldAdaptorPlugin() {
           minWidth: _field.colWidth,
           sortable: IhoTableStatusHelper.isPositive(_field.isSort),
           slots: { ..._field.slots, default: _field.slotFn, header: _field.headerSlotFn },
-          ...pick(_field, ["title", "treeNode", "resizable"])
+          title: _field.alias || _field.title,
+          ...pick(_field, ["treeNode", "resizable"])
         };
         settingObjAdaptor(result, _field, config);
         return result;

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

@@ -54,6 +54,7 @@ export declare type LowCodeTableFieldItem = {
 } & Partial<{
     id: number | string;
     title: string;
+    alias: string;
     colWidth: VxeTableDefines.ColumnInfo['width'];
     settingObj: IhoTableLowCodeField.SettingObj;
     treeNode: boolean;

package/package.json

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