cnhis-design-vue 3.1.34-beta.1 → 3.1.34-beta.11

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

@@ -647,6 +647,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         sysImageSize: unknown[];
     }>;
     treeConfig: import("vue").ComputedRef<any>;
+    keyboardConfig: import("vue").ComputedRef<any>;
     hideAllWrap: (e: any) => void;
     bindDocumentClick: () => void;
     unBindDocumentClick: () => void;

package/es/components/big-table/src/BigTable.vue.d.ts

@@ -646,6 +646,7 @@ declare const _default: import("vue").DefineComponent<{
         sysImageSize: unknown[];
     }>;
     treeConfig: import("vue").ComputedRef<any>;
+    keyboardConfig: import("vue").ComputedRef<any>;
     hideAllWrap: (e: any) => void;
     bindDocumentClick: () => void;
     unBindDocumentClick: () => void;

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,17 +157,29 @@ 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;
     });
+    const keyboardConfig = computed(() => {
+      return {
+        editMethod({
+          row,
+          column
+        }) {
+          const $table = xGrid.value;
+          $table.setEditCell(row, column);
+        },
+        ...props.columnConfig.keyboardConfig || {}
+      };
+    });
     const hideAllWrap = (e) => {
       const path = e.path || e.composedPath && e.composedPath();
       const noWrap = (className) => {
@@ -2361,7 +2373,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           iconClose: "iconfont icon-a-xitongtubiaotianjia",
           ...unref(getAttr)("expand-config")
         },
-        "keyboard-config": _ctx.columnConfig.keyboardConfig || {},
+        "keyboard-config": unref(keyboardConfig),
         "edit-rules": _ctx.columnConfig.editRules || {},
         "menu-config": _ctx.menuConfig,
         onCellDblclick: rowdblclick,

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/big-table/src/components/edit-form/edit-select.js

@@ -35,6 +35,7 @@ var EditSelect = defineComponent({
       isShow
     } = useCommon(props, attrs, true);
     const state = reactive({
+      keyupValue: attrs.value,
       options: [],
       loading: false,
       keyword: "",
@@ -46,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 = {
@@ -66,6 +70,7 @@ var EditSelect = defineComponent({
     };
     selectSearch = XEUtils.debounce(selectSearch, 800);
     const onUpdateValue = (value) => {
+      state.keyupValue = value;
       emit("formChange", {
         value,
         row: props.row,
@@ -82,6 +87,25 @@ var EditSelect = defineComponent({
         selectSearch("");
       }
     };
+    function onKeyup(event) {
+      const {
+        key
+      } = event;
+      if (state.config.multiple || !["ArrowUp", "ArrowDown"].includes(key))
+        return;
+      if (!state.keyupValue)
+        state.keyupValue = state.options[0].value;
+      let index = state.options.findIndex((item) => item.value === state.keyupValue);
+      const length = state.options.length;
+      if (key === "ArrowUp") {
+        index = index - 1 === -1 ? length - 1 : index - 1;
+      }
+      if (key === "ArrowDown") {
+        index = index + 1 === length ? 0 : index + 1;
+      }
+      state.keyupValue = state.options[index].value;
+      onUpdateValue(state.keyupValue);
+    }
     init();
     return () => createVNode(NSelect, mergeProps({
       "ref": formRef,
@@ -94,7 +118,8 @@ var EditSelect = defineComponent({
       "filterable": true,
       "placeholder": props.col.placeholder || "\u8BF7\u9009\u62E9",
       "loading": state.loading,
-      "onUpdateValue": onUpdateValue
+      "onUpdateValue": onUpdateValue,
+      "onKeyup": onKeyup
     }), null);
   }
 });

package/es/components/big-table/src/hooks/useEvent.js

@@ -17,12 +17,11 @@ const useEvent = (props, state, emit, xGrid, anchorEvent) => {
     if (!activeRow && !isEdit)
       return;
     if (isEdit) {
-      const { row, $rowIndex, rowIndex, column } = xGridRef.getEditRecord() || {};
+      const data = xGridRef.getEditRecord() || xGridRef.getSelectedCell() || {};
       emit("keyboard", {
         key: $event.key,
-        index: $rowIndex != null ? $rowIndex : rowIndex,
-        row,
-        column
+        ...data,
+        index: data.rowIndex
       });
       return;
     }