cnhis-design-vue 3.1.16-beta.8 → 3.1.16-beta.9

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

@@ -2868,7 +2868,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     loadExpandMethod: ({ row, rowIndex }: any) => Promise<void>;
     nestHandleClickRow: (table: any, data: any) => void;
     initAnchor: () => void;
-    updateAnchor: (field: string) => void;
+    updateAnchor: (field: string) => Promise<void>;
     anchorEvent: ({ scrollLeft }: {
         scrollLeft: number;
     }) => void;

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

@@ -1127,12 +1127,6 @@ declare const _default: import("vue").DefineComponent<{
                 textColorGhostPressedWarning: string;
                 textColorGhostFocusWarning: string;
                 textColorGhostDisabledWarning: string;
-                /**
-                 * 判断是否渲染EditForm
-                 * @param {*} row
-                 * @param {*} column
-                 * @returns
-                 */
                 borderWarning: string;
                 borderHoverWarning: string;
                 borderPressedWarning: string;
@@ -1684,22 +1678,7 @@ declare const _default: import("vue").DefineComponent<{
             onClick: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: MouseEvent) => void>>;
             onChange: import("vue").PropType<import("naive-ui/es/input/src/interface").OnUpdateValue>;
             onClear: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: MouseEvent) => void>>;
-            status: import("vue").PropType<import("naive-ui/es/form/src/interface").FormValidationStatus>; /**
-             * 针对 bigTable 的设置列
-             * type: 列的类型
-             * field: 列字段名（注：属性层级越深，渲染性能将直线下降）
-             * title: 列标题（支持开启国际化）
-             * width: 列宽度（如果为空则均匀分配剩余宽度，如果全部列固定了，可能会存在宽屏下不会铺满，可以配合 "%" 或者 "min-width" 布局）
-             * minWidth: 最小列宽度；会自动将剩余空间按比例分配
-             * resizable: 列是否允许拖动列宽调整大小
-             * visible: 列是否显示
-             * fixed: 将列固定在左侧或者右侧（注意：固定列应该放在左右两侧的位置）
-             * align: 列对齐方式
-             * headerAlign: 表头列的对齐方式
-             * footerAlign: 表尾列的对齐方式
-             * formatter: 格式化显示内容 Function({cellValue, row, column})
-             * sortable: 是否允许列排序
-             */
+            status: import("vue").PropType<import("naive-ui/es/form/src/interface").FormValidationStatus>;
             'onUpdate:value': import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<import("naive-ui/es/input/src/interface").OnUpdateValue>>;
             onUpdateValue: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<import("naive-ui/es/input/src/interface").OnUpdateValue>>;
             textDecoration: import("vue").PropType<string | [string, string]>;
@@ -2888,7 +2867,7 @@ declare const _default: import("vue").DefineComponent<{
     loadExpandMethod: ({ row, rowIndex }: any) => Promise<void>;
     nestHandleClickRow: (table: any, data: any) => void;
     initAnchor: () => void;
-    updateAnchor: (field: string) => void;
+    updateAnchor: (field: string) => Promise<void>;
     anchorEvent: ({ scrollLeft }: {
         scrollLeft: number;
     }) => void;

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, reactive, useAttrs, computed, onMounted, onUnmounted, onActivated, createVNode, h, resolveComponent, Teleport, createTextVNode, nextTick, watch, openBlock, createElementBlock, Fragment, createBlock, unref, withCtx, renderList, createCommentVNode, createElementVNode, normalizeClass, normalizeStyle, mergeProps, renderSlot, toDisplayString, withDirectives, vShow, isVNode } from 'vue';
+import { defineComponent, ref, reactive, useAttrs, computed, onMounted, onUnmounted, onActivated, nextTick, createVNode, h, resolveComponent, Teleport, createTextVNode, watch, openBlock, createElementBlock, Fragment, createBlock, unref, withCtx, renderList, createCommentVNode, createElementVNode, normalizeClass, normalizeStyle, mergeProps, renderSlot, toDisplayString, withDirectives, vShow, isVNode } from 'vue';
 import { isArray, isFunction } from 'lodash-es';
 import bigTableState from './bigTableState.js';
 import bigTableProps from './bigTableProps.js';
@@ -243,7 +243,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       let columns = formatColumns(config);
       columns = handleGroupColums(columns, props);
       xGrid.value && xGrid.value.reloadColumn(columns);
-      initAnchor();
+      nextTick(() => {
+        initAnchor();
+      });
       setGroupTreeExpand();
       resetTableInlineEditStatus();
     };

package/es/packages/big-table/src/hooks/useAnchor.d.ts

@@ -1,6 +1,6 @@
 export declare const useAnchor: (props: any, state: any, emit: any, xGrid: any) => {
     initAnchor: () => void;
-    updateAnchor: (field: string) => void;
+    updateAnchor: (field: string) => Promise<void>;
     anchorEvent: ({ scrollLeft }: {
         scrollLeft: number;
     }) => void;

package/es/packages/big-table/src/hooks/useAnchor.js

@@ -1,29 +1,37 @@
 import { useThrottleFn } from '@vueuse/core';
 
 const useAnchor = (props, state, emit, xGrid) => {
+  let setAnchorStatus = true;
   function initAnchor() {
-    var _a;
+    var _a, _b, _c;
     if ((_a = props.anchor) == null ? void 0 : _a.length) {
       const columns = xGrid.value.getColumns();
       let left = 0;
       columns.forEach((column) => {
-        const { field, minWidth, width } = column;
+        const { field, minWidth, width, fixed } = column;
         const colWidth = +(minWidth || width);
-        left += colWidth;
-        const anchorObj = props.anchor.find((v) => v.field === field);
-        anchorObj && state.anchorList.push({
-          ...anchorObj,
-          left: left - colWidth
-        });
+        if (fixed == "left") ; else {
+          left += colWidth;
+          const anchorObj = props.anchor.find((v) => v.field === field);
+          anchorObj && state.anchorList.push({
+            ...anchorObj,
+            left: left - colWidth
+          });
+        }
       });
-      state.anchorValue = state.anchorList[0].field;
+      state.anchorValue = ((_c = (_b = state.anchorList) == null ? void 0 : _b[0]) == null ? void 0 : _c.field) || "";
     }
   }
-  function updateAnchor(field) {
-    xGrid.value.scrollToColumn(field);
+  async function updateAnchor(field) {
+    setAnchorStatus = false;
+    const anchorObj = state.anchorList.find((v) => v.field === field);
+    await xGrid.value.scrollTo(anchorObj.left);
+    setTimeout(() => {
+      setAnchorStatus = true;
+    });
   }
   function setAnchorValue({ scrollLeft }) {
-    if (state.anchorList.length) {
+    if (state.anchorList.length && setAnchorStatus) {
       const anchorObj = state.anchorList.find((v) => scrollLeft < v.left);
       if (anchorObj) {
         state.anchorValue = anchorObj.field;