cnhis-design-vue 3.1.14-beta.1 → 3.1.14-beta.4

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

@@ -2952,15 +2952,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     }) => Promise<any>;
     getAsyncTableData: (params: any) => Promise<void>;
     setChecklist: (list: any) => any;
-    colspanMethod: ({ row, column, _rowIndex, _columnIndex }: {
-        row: any;
-        column: any;
-        _rowIndex: any;
-        _columnIndex: any;
-    }) => {
-        rowspan: number;
-        colspan: number;
-    } | undefined;
+    colspanMethod: (payload: any) => any;
     footerRowspanMethod: (obj: any) => {
         rowspan: number;
         colspan: number;

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

@@ -1084,15 +1084,16 @@ declare const _default: import("vue").DefineComponent<{
                 textColorDisabledSuccess: string;
                 textColorTextSuccess: string;
                 textColorTextHoverSuccess: string;
-                textColorTextPressedSuccess: string; /**
-                 * 删除选中scan数据
-                 */
+                textColorTextPressedSuccess: string;
                 textColorTextFocusSuccess: string;
                 textColorTextDisabledSuccess: string;
                 textColorGhostSuccess: string;
                 textColorGhostHoverSuccess: string;
                 textColorGhostPressedSuccess: string;
                 textColorGhostFocusSuccess: string;
+                /**
+                 * 删除选中scan数据
+                 */
                 textColorGhostDisabledSuccess: string;
                 borderSuccess: string;
                 borderHoverSuccess: string;
@@ -1135,7 +1136,14 @@ declare const _default: import("vue").DefineComponent<{
                 textColorHoverError: string;
                 textColorPressedError: string;
                 textColorFocusError: string;
-                textColorDisabledError: string;
+                textColorDisabledError: string; /**
+                 * 初始化props
+                 * @param {*} unionItem
+                 * @param {*} row
+                 * @param {*} column
+                 * @param {*} $rowIndex
+                 * @returns
+                 */
                 textColorTextError: string;
                 textColorTextHoverError: string;
                 textColorTextPressedError: string;
@@ -1670,7 +1678,22 @@ declare const _default: import("vue").DefineComponent<{
             onBlur: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: FocusEvent) => void>>;
             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>>;
+            onClear: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: MouseEvent) => void>>; /**
+             * 针对 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>>;
@@ -2952,15 +2975,7 @@ declare const _default: import("vue").DefineComponent<{
     }) => Promise<any>;
     getAsyncTableData: (params: any) => Promise<void>;
     setChecklist: (list: any) => any;
-    colspanMethod: ({ row, column, _rowIndex, _columnIndex }: {
-        row: any;
-        column: any;
-        _rowIndex: any;
-        _columnIndex: any;
-    }) => {
-        rowspan: number;
-        colspan: number;
-    } | undefined;
+    colspanMethod: (payload: any) => any;
     footerRowspanMethod: (obj: any) => {
         rowspan: number;
         colspan: number;
@@ -4042,9 +4057,6 @@ declare const _default: import("vue").DefineComponent<{
         readonly color: StringConstructor;
         readonly component: import("vue").PropType<import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>>;
         readonly theme: import("vue").PropType<import("naive-ui/es/_mixins").Theme<"Icon", {
-            /**
-             * computed
-             */
             color: string;
             opacity1Depth: string;
             opacity2Depth: string;

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

@@ -1,4 +1,5 @@
 import { defineComponent, ref, reactive, useAttrs, computed, onMounted, onUnmounted, onActivated, createVNode, h, resolveComponent, Teleport, createTextVNode, nextTick, watch, openBlock, createElementBlock, Fragment, createCommentVNode, createElementVNode, normalizeClass, normalizeStyle, unref, mergeProps, withCtx, renderSlot, createBlock, toDisplayString, withDirectives, vShow, isVNode } from 'vue';
+import { isFunction } from 'lodash-es';
 import { useSeparateRow } from '../../../packages/big-table/src/hooks/useSeparateRow';
 import bigTableState from './bigTableState.js';
 import bigTableProps from './bigTableProps.js';
@@ -517,6 +518,7 @@ var script = /* @__PURE__ */ defineComponent({
       return columns;
     };
     const formatterEdit = (params, col) => {
+      console.log(params, col);
       let {
         row,
         column,
@@ -1121,13 +1123,18 @@ var script = /* @__PURE__ */ defineComponent({
         };
       });
     };
-    const colspanMethod = ({
-      row,
-      column,
-      _rowIndex,
-      _columnIndex
-    }) => {
+    const colspanMethod = (payload) => {
       var _a;
+      const {
+        row,
+        column,
+        _rowIndex,
+        _columnIndex
+      } = payload;
+      if (isFunction(attr.spanMethod))
+        return attr.spanMethod(payload);
+      if (isFunction(attr["span-method"]))
+        return attr["span-method"](payload);
       if (state.isTree != 3) {
         return {
           rowspan: 1,

package/es/packages/big-table/style/index.css

@@ -139,6 +139,9 @@ body > .vxe-table--tooltip-wrapper {
   /* 行内表单样式 */
   /* 行内表单样式 */
 }
+.custom-big-table .n-input {
+  width: fit-content;
+}
 .custom-big-table .img-wrap {
   padding: 2px 0;
   line-height: 1;

package/es/packages/index.css

@@ -139,6 +139,9 @@ body > .vxe-table--tooltip-wrapper {
   /* 行内表单样式 */
   /* 行内表单样式 */
 }
+.custom-big-table .n-input {
+  width: fit-content;
+}
 .custom-big-table .img-wrap {
   padding: 2px 0;
   line-height: 1;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.14-beta.1",
+  "version": "3.1.14-beta.4",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",