cnhis-design-vue 3.1.11-beta.8 → 3.1.12-beta.1

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

@@ -2500,12 +2500,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         fieldLength: number;
         originFormatList: never[];
         isSaveForm: boolean;
-        editConfig: {
-            trigger: string;
-            mode: string;
-            autoClear: boolean;
-            showIcon: boolean;
-        };
+        editConfig: import("vxe-table").VxeTablePropTypes.EditConfig;
         rowConfig: {
             height: number;
         };
@@ -2558,10 +2553,32 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         originFormatList: never[];
         isSaveForm: boolean;
         editConfig: {
-            trigger: string;
-            mode: string;
-            autoClear: boolean;
-            showIcon: boolean;
+            trigger?: "click" | "manual" | "dblclick" | undefined;
+            enabled?: boolean | undefined;
+            mode?: string | undefined;
+            icon?: string | undefined;
+            showIcon?: boolean | undefined;
+            showStatus?: boolean | undefined;
+            showUpdateStatus?: boolean | undefined;
+            showInsertStatus?: boolean | undefined;
+            showAsterisk?: boolean | undefined;
+            autoClear?: boolean | undefined;
+            beforeEditMethod?: ((params: {
+                row: any;
+                rowIndex: number;
+                column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                columnIndex: number;
+                $table: import("vxe-table").VxeTableConstructor & import("vxe-table").VxeTablePrivateMethods;
+                $grid: import("vxe-table").VxeGridConstructor | null | undefined;
+            }) => boolean) | undefined;
+            activeMethod?: ((params: {
+                row: any;
+                rowIndex: number;
+                column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                columnIndex: number;
+                $table: import("vxe-table").VxeTableConstructor & import("vxe-table").VxeTablePrivateMethods;
+                $grid: import("vxe-table").VxeGridConstructor | null | undefined;
+            }) => boolean) | undefined;
         };
         rowConfig: {
             height: number;
@@ -2860,6 +2877,9 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     unBindDocumentClick: () => void;
     removeInsert: () => Promise<false | undefined>;
     loadColumn: (config: any) => void;
+    separate: (data: import("../../../es/src/types").AnyObject[], rawData: import("../../../es/src/types").AnyObject[]) => Promise<import("../../../es/src/types").AnyObject[]>;
+    onColumnResize: import("vxe-table").VxeTableEvents.ResizableChange;
+    separateHandle: import("./src/hooks/useSeparateRow").SeparateHandle;
     loadData: (data: any) => Promise<void>;
     setGroupTitleToFristColumnFieldData: (formatList: any) => void;
     setCurrentPageRowChecked: () => void;
@@ -4053,6 +4073,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     checkMethod: ({ row }: {
         row: any;
     }) => boolean;
+    visibleMethod: ({ row }: any) => boolean;
     getRowStyle: ({ row }: any) => string | null;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, string[], string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     data: {

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

@@ -1138,10 +1138,7 @@ declare const _default: import("vue").DefineComponent<{
                 textColorTextHoverError: string;
                 textColorTextPressedError: string;
                 textColorTextFocusError: string;
-                textColorTextDisabledError: string; /**
-                 * 避免每次点击都查询
-                 * 初始化查一次 行编辑 表单search用
-                 */
+                textColorTextDisabledError: string;
                 textColorGhostError: string;
                 textColorGhostHoverError: string;
                 textColorGhostPressedError: string;
@@ -1150,7 +1147,10 @@ declare const _default: import("vue").DefineComponent<{
                 borderError: string;
                 borderHoverError: string;
                 borderPressedError: string;
-                borderFocusError: string;
+                borderFocusError: string; /**
+                 * 单个form提交失败
+                 * @param {*} obj
+                 */
                 borderDisabledError: string;
                 rippleColorError: string;
                 waveOpacity: string;
@@ -1247,7 +1247,7 @@ declare const _default: import("vue").DefineComponent<{
                 textColorGhostPressedPrimary: string;
                 textColorGhostFocusPrimary: string;
                 textColorGhostDisabledPrimary: string;
-                borderPrimary: string; /** string */
+                borderPrimary: string;
                 borderHoverPrimary: string;
                 borderPressedPrimary: string;
                 borderFocusPrimary: string;
@@ -2502,12 +2502,7 @@ declare const _default: import("vue").DefineComponent<{
         fieldLength: number;
         originFormatList: never[];
         isSaveForm: boolean;
-        editConfig: {
-            trigger: string;
-            mode: string;
-            autoClear: boolean;
-            showIcon: boolean;
-        };
+        editConfig: import("vxe-table").VxeTablePropTypes.EditConfig;
         rowConfig: {
             height: number;
         };
@@ -2560,10 +2555,32 @@ declare const _default: import("vue").DefineComponent<{
         originFormatList: never[];
         isSaveForm: boolean;
         editConfig: {
-            trigger: string;
-            mode: string;
-            autoClear: boolean;
-            showIcon: boolean;
+            trigger?: "click" | "manual" | "dblclick" | undefined;
+            enabled?: boolean | undefined;
+            mode?: string | undefined;
+            icon?: string | undefined;
+            showIcon?: boolean | undefined;
+            showStatus?: boolean | undefined;
+            showUpdateStatus?: boolean | undefined;
+            showInsertStatus?: boolean | undefined;
+            showAsterisk?: boolean | undefined;
+            autoClear?: boolean | undefined;
+            beforeEditMethod?: ((params: {
+                row: any;
+                rowIndex: number;
+                column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                columnIndex: number;
+                $table: import("vxe-table").VxeTableConstructor & import("vxe-table").VxeTablePrivateMethods;
+                $grid: import("vxe-table").VxeGridConstructor | null | undefined;
+            }) => boolean) | undefined;
+            activeMethod?: ((params: {
+                row: any;
+                rowIndex: number;
+                column: import("vxe-table").VxeTableDefines.ColumnInfo;
+                columnIndex: number;
+                $table: import("vxe-table").VxeTableConstructor & import("vxe-table").VxeTablePrivateMethods;
+                $grid: import("vxe-table").VxeGridConstructor | null | undefined;
+            }) => boolean) | undefined;
         };
         rowConfig: {
             height: number;
@@ -2862,6 +2879,9 @@ declare const _default: import("vue").DefineComponent<{
     unBindDocumentClick: () => void;
     removeInsert: () => Promise<false | undefined>;
     loadColumn: (config: any) => void;
+    separate: (data: import("../../../src/types").AnyObject[], rawData: import("../../../src/types").AnyObject[]) => Promise<import("../../../src/types").AnyObject[]>;
+    onColumnResize: import("vxe-table").VxeTableEvents.ResizableChange;
+    separateHandle: import("../../../../es/packages/big-table/src/hooks/useSeparateRow").SeparateHandle;
     loadData: (data: any) => Promise<void>;
     setGroupTitleToFristColumnFieldData: (formatList: any) => void;
     setCurrentPageRowChecked: () => void;
@@ -3248,22 +3268,7 @@ declare const _default: import("vue").DefineComponent<{
                 clearColorHover: string;
                 clearColorPressed: string;
                 scrollbarColor: string;
-                scrollbarColorHover: string; /**
-                 * 针对 bigTable 的设置列
-                 * type: 列的类型
-                 * field: 列字段名（注：属性层级越深，渲染性能将直线下降）
-                 * title: 列标题（支持开启国际化）
-                 * width: 列宽度（如果为空则均匀分配剩余宽度，如果全部列固定了，可能会存在宽屏下不会铺满，可以配合 "%" 或者 "min-width" 布局）
-                 * minWidth: 最小列宽度；会自动将剩余空间按比例分配
-                 * resizable: 列是否允许拖动列宽调整大小
-                 * visible: 列是否显示
-                 * fixed: 将列固定在左侧或者右侧（注意：固定列应该放在左右两侧的位置）
-                 * align: 列对齐方式
-                 * headerAlign: 表头列的对齐方式
-                 * footerAlign: 表尾列的对齐方式
-                 * formatter: 格式化显示内容 Function({cellValue, row, column})
-                 * sortable: 是否允许列排序
-                 */
+                scrollbarColorHover: string;
                 scrollbarWidth: string;
                 scrollbarHeight: string;
                 scrollbarBorderRadius: string;
@@ -4070,6 +4075,7 @@ declare const _default: import("vue").DefineComponent<{
     checkMethod: ({ row }: {
         row: any;
     }) => boolean;
+    visibleMethod: ({ row }: any) => boolean;
     getRowStyle: ({ row }: any) => string | null;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, string[], string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     data: {

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, isVNode, nextTick, watch, openBlock, createElementBlock, Fragment, createCommentVNode, createElementVNode, normalizeClass, normalizeStyle, unref, mergeProps, withCtx, renderSlot, createBlock, toDisplayString, withDirectives, vShow } from 'vue';
+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 { useSeparateRow } from '../../../packages/big-table/src/hooks/useSeparateRow';
 import bigTableState from './bigTableState.js';
 import bigTableProps from './bigTableProps.js';
 import bigTableEmits from './bigTableEmits.js';
@@ -12,15 +13,17 @@ import { SettingsSharp, CaretDown, CaretForward, CopyOutline, SyncOutline } from
 import './components/NoData.js';
 import TextOverTooltip from '../../../src/components/TextOverTooltip';
 import SvgIcon from '../../../src/components/SvgIcon';
-import { useMessage, NIcon, NTooltip, NPopconfirm, NButton, NCheckbox, NCheckboxGroup, NSpace, NProgress, NDropdown, NSwitch, NPopover } from 'naive-ui';
+import { useMessage, NIcon, NTooltip, NCheckbox, NCheckboxGroup, NSpace, NButton, NPopconfirm, NProgress, NDropdown, NSwitch, NPopover } from 'naive-ui';
 import CGrid from '../../../packages/grid';
 import vexutils from '../../../src/utils/vexutils';
-import { handleTableHeight, setTableConfig, handleGroupColums, checkMethod, setTreeGroupTitle, handleName, generateEditRender, handlerInitSearchItem, getEvaluate, getMapVal, getCandidateComponents, getageShowType, isLink, showFilter, reScrollFilterWrap, hideFilterWrap, mergeConObjFn, setDefaultFormData, handleImgArr, handleImgSrc, modalDetailImage, handleQrCodeContent, getInlineEditBtn, isCopy, setVisibleCheckAllWrap, setFilterStatus, handleTableImageSize, getRowStyle, getFooterGroup, flattenRow, intersectRow, removeCheckedDisabledRows } from './utils.js';
+import { handleTableHeight, setTableConfig, handleGroupColums, checkMethod, setTreeGroupTitle, handleName, generateEditRender, handlerInitSearchItem, getEvaluate, getMapVal, getCandidateComponents, getageShowType, isLink, showFilter, reScrollFilterWrap, hideFilterWrap, mergeConObjFn, setDefaultFormData, handleImgArr, handleImgSrc, modalDetailImage, handleQrCodeContent, getInlineEditBtn, isCopy, setVisibleCheckAllWrap, setFilterStatus, handleTableImageSize, visibleMethod, getRowStyle, getFooterGroup, flattenRow, intersectRow, removeCheckedDisabledRows } from './utils.js';
 import './components/input-button.js';
+import './components/separate.js';
 import xb_big from '../../../src/assets/img/xb_big';
 import qr from '../../../src/assets/img/qr';
 import script$1 from './components/NoData.vue_vue_type_script_setup_true_lang.js';
 import script$2 from './components/input-button.vue_vue_type_script_setup_true_lang.js';
+import script$3 from './components/separate.vue_vue_type_script_setup_true_lang.js';
 
 const _hoisted_1 = {
   key: 0,
@@ -236,6 +239,14 @@ var script = /* @__PURE__ */ defineComponent({
       setGroupTreeExpand();
       resetTableInlineEditStatus();
     };
+    const {
+      separate,
+      onColumnResize,
+      separateHandle
+    } = useSeparateRow(() => {
+      var _a, _b;
+      return (_b = (_a = props.columnConfig) == null ? void 0 : _a.fieldList) != null ? _b : [];
+    }, xGrid);
     const loadData = async (data) => {
       state.isShowEmpty = !(data == null ? void 0 : data.length);
       const list = JSON.parse(JSON.stringify(data));
@@ -259,12 +270,14 @@ var script = /* @__PURE__ */ defineComponent({
           selectTableDisable: false
         };
       });
-      await table.loadData(formatList);
+      await table.loadData(await separate(formatList, data));
       table.setCurrentRow({});
       setCurrentPageRowChecked();
       setGroupTreeExpand();
       resetTableInlineEditStatus();
     };
+    separateHandle.clear();
+    separateHandle.add(() => loadData(props.data));
     const setGroupTitleToFristColumnFieldData = (formatList) => {
       var _a;
       if (state.isTree != 3)
@@ -430,6 +443,12 @@ var script = /* @__PURE__ */ defineComponent({
             default: (params) => {
               if (!isEdit || item.columnName === "operatorColumn" || !item.isEdit) {
                 return formatter(params, item);
+              } else if (item.formType === "separate") {
+                const SeparateComponent = script$3;
+                return createVNode(SeparateComponent, {
+                  "row": params.row,
+                  "col": item
+                }, null);
               } else if (isEdit && item.isEdit && item.checkEditStatus && item.checkEditStatus(params)) {
                 return formatterEdit(params, item);
               } else {
@@ -1252,7 +1271,7 @@ var script = /* @__PURE__ */ defineComponent({
         return;
       }
       let forbiddenBatchSelect = !checkMethod(data);
-      if (state.selectType == "checkbox" && forbiddenBatchSelect) {
+      if (state.selectType == "checkbox" && (forbiddenBatchSelect || data.row.$__SEPARATE)) {
         table == null ? void 0 : table.setAllCheckboxRow(false);
         const checked2 = getRowClassName({
           row
@@ -2226,6 +2245,7 @@ var script = /* @__PURE__ */ defineComponent({
           checkField: "checked",
           labelField: "checked",
           checkMethod: unref(checkMethod),
+          visibleMethod: unref(visibleMethod),
           trigger: "cell",
           reserve: true,
           highlight: true
@@ -2261,7 +2281,8 @@ var script = /* @__PURE__ */ defineComponent({
         onScroll: unref(scroll),
         onCellMouseenter: handleCellMouseenter,
         onKeydown: unref(keyDown),
-        onMenuClick: handleMenuClickEvent
+        onMenuClick: handleMenuClickEvent,
+        onResizableChange: unref(onColumnResize)
       }), {
         empty: withCtx(() => [state.isShowEmpty ? renderSlot(_ctx.$slots, "empty", {
           key: 0
@@ -2316,7 +2337,7 @@ var script = /* @__PURE__ */ defineComponent({
           }
         })]),
         _: 3
-      }, 16, ["seq-config", "tree-config", "row-id", "cell-class-name", "row-config", "show-footer", "checkbox-config", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules", "menu-config", "onScroll", "onKeydown"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
+      }, 16, ["seq-config", "tree-config", "row-id", "cell-class-name", "row-config", "show-footer", "checkbox-config", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules", "menu-config", "onScroll", "onKeydown", "onResizableChange"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
         class: "refresh",
         onClick: hanldeClickRefresh
       }, [createVNode(unref(NIcon), {

package/es/packages/big-table/src/bigTableState.d.ts

@@ -1,3 +1,4 @@
+import { VxeTablePropTypes } from 'vxe-table/types/table';
 declare const bigTableState: {
     curAbleCheckedLen: number;
     showButtonTop: number;
@@ -45,12 +46,7 @@ declare const bigTableState: {
     fieldLength: number;
     originFormatList: never[];
     isSaveForm: boolean;
-    editConfig: {
-        trigger: string;
-        mode: string;
-        autoClear: boolean;
-        showIcon: boolean;
-    };
+    editConfig: VxeTablePropTypes.EditConfig;
     rowConfig: {
         height: number;
     };

package/es/packages/big-table/src/bigTableState.js

@@ -45,7 +45,15 @@ const bigTableState = {
   fieldLength: 0,
   originFormatList: [],
   isSaveForm: false,
-  editConfig: { trigger: "manual", mode: "cell", autoClear: false, showIcon: false },
+  editConfig: {
+    trigger: "click",
+    mode: "cell",
+    autoClear: false,
+    showIcon: false,
+    activeMethod({ row, column }) {
+      return !row.$__SEPARATE;
+    }
+  },
   rowConfig: { height: 32 }
 };
 

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

@@ -0,0 +1,4 @@
+import script from './edit-separate.vue_vue_type_script_setup_true_lang.js';
+export { default } from './edit-separate.vue_vue_type_script_setup_true_lang.js';
+
+script.__file = "packages/big-table/src/components/edit-form/edit-separate.vue";