cnhis-design-vue 3.1.18-beta.9 → 3.1.18

package/es/components/annotation-edit/style/index.css

@@ -1,15 +1 @@
-.annotation-edit {
-  cursor: pointer;
-  color: #0067ee;
-  font-size: 16px;
-  user-select: none;
-  display: inline-flex;
-  align-items: center;
-}
-.annotation-edit.is-active {
-  color: rgba(255, 152, 40);
-}
-.annotation-edit__icon {
-  display: inline-flex;
-  align-items: center;
-}
+.annotation-edit{align-items:center;color:#0067ee;cursor:pointer;display:inline-flex;font-size:16px;user-select:none}.annotation-edit.is-active{color:#ff9828}.annotation-edit__icon{align-items:center;display:inline-flex}

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

@@ -1317,13 +1317,17 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       updateAddCheckedRows(row);
     };
     const handlerClickRow = (data) => {
-      var _a;
+      var _a, _b;
       let {
         row,
         $event = {},
-        $rowIndex
+        $rowIndex,
+        triggerCheckbox
       } = data;
-      if (((_a = attr.checkboxConfig) == null ? void 0 : _a.trigger) === "default") {
+      if (((_a = attr.checkboxConfig) == null ? void 0 : _a.noTriggerCellClick) && triggerCheckbox) {
+        return false;
+      }
+      if (((_b = attr.checkboxConfig) == null ? void 0 : _b.trigger) === "default") {
         emit("handlerClickRow", row, $rowIndex);
         return false;
       }
@@ -2277,6 +2281,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       loadData
     });
     return (_ctx, _cache) => {
+      var _a;
       return openBlock(), createElementBlock(Fragment, null, [state.anchorList.length ? (openBlock(), createBlock(unref(NTabs), {
         key: 0,
         type: "line",
@@ -2317,6 +2322,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         "auto-resize": "",
         height: props.height ? "auto" : void 0
       }, _ctx.$attrs, {
+        "mouse-config": {
+          selected: ((_a = _ctx.columnConfig.keyboardConfig) == null ? void 0 : _a.isEdit) ? true : false
+        },
         "seq-config": unref(handleSeqConfig),
         "tree-config": unref(treeConfig),
         "row-class-name": getRowClassName,
@@ -2418,7 +2426,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           }
         })]),
         _: 3
-      }, 16, ["height", "seq-config", "tree-config", "cell-class-name", "row-config", "show-footer", "tooltip-config", "checkbox-config", "radio-config", "scroll-y", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules", "menu-config", "onScroll", "onKeydown"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
+      }, 16, ["height", "mouse-config", "seq-config", "tree-config", "cell-class-name", "row-config", "show-footer", "tooltip-config", "checkbox-config", "radio-config", "scroll-y", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules", "menu-config", "onScroll", "onKeydown"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
         class: "refresh",
         onClick: hanldeClickRefresh
       }, [createVNode(unref(NIcon), {

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, createVNode, mergeProps } from 'vue';
+import { defineComponent, ref, watch, createVNode, mergeProps } from 'vue';
 import { NInput, NInputNumber } from 'naive-ui';
 import { useCommon } from './useCommon2.js';
 
@@ -56,6 +56,9 @@ var EditInput = defineComponent({
       placeholder: props.col.placeholder || "\u8BF7\u8F93\u5165",
       ...props.col.componentProps || {}
     };
+    watch(() => attrs.value, (value) => {
+      __value.value = value;
+    });
     return () => props.type === "input" ? createVNode(NInput, mergeProps({
       "ref": formRef
     }, attrs, config, {

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

@@ -5,6 +5,7 @@ import { hideFilterWrap } from '../utils2.js';
 const useEvent = (props, state, emit, xGrid, anchorEvent) => {
   function keyDown({ $event }) {
     var _a, _b;
+    const { isArrow, isEnter, isChecked, isTab, isEdit } = ((_a = props.columnConfig) == null ? void 0 : _a.keyboardConfig) || {};
     let activeRow = null;
     let index = 0;
     const xGridRef = xGrid.value;
@@ -13,9 +14,8 @@ const useEvent = (props, state, emit, xGrid, anchorEvent) => {
       index = xGridRef.getRowIndex(activeRow);
     }
     let activeIndex = index || 0;
-    if (!activeRow)
+    if (!activeRow && !isEdit)
       return;
-    const { isArrow, isEnter, isChecked } = ((_a = props.columnConfig) == null ? void 0 : _a.keyboardConfig) || {};
     function emitKeyBoard() {
       emit("keyboard", {
         key: $event.key,
@@ -31,19 +31,34 @@ const useEvent = (props, state, emit, xGrid, anchorEvent) => {
         activeIndex = index + 1;
       }
       const row = xGridRef.getData(activeIndex);
-      xGridRef.setCurrentRow(row);
       xGridRef.scrollToRow(row);
+      xGridRef.setCurrentRow(row);
       emitKeyBoard();
-    }
-    if (isEnter && $event.key === "Enter") {
-      emitKeyBoard();
+      return;
     }
     if (isChecked && $event.key === " ") {
       $event.preventDefault();
+      xGridRef.scrollToRow(activeRow);
       xGridRef.setCheckboxRow(activeRow, true);
       emitKeyBoard();
-      xGridRef.scrollToRow(activeRow);
+      return;
+    }
+    if (isEdit && (isTab && $event.key === "Tab" || isEnter && $event.key === "Enter")) {
+      $event.preventDefault();
+      setTimeout(() => {
+        const { row, column, $rowIndex } = xGridRef.getSelectedCell();
+        emit("keyboard", {
+          key: $event.key,
+          index: $rowIndex,
+          row,
+          column
+        });
+        xGridRef.scrollToRow(row);
+        xGridRef.setEditCell(row, column);
+      });
+      return;
     }
+    emitKeyBoard();
   }
   let scrollEvent = (params) => {
     emit("scroll", params);