cnhis-design-vue 3.1.12-beta.6 → 3.1.13-beta.0

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

@@ -2503,6 +2503,8 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         editConfig: import("vxe-table").VxeTablePropTypes.EditConfig;
         rowConfig: {
             height: number;
+            isHover: boolean;
+            isCurrent: boolean;
         };
     };
     state: {
@@ -2574,6 +2576,8 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         };
         rowConfig: {
             height: number;
+            isHover: boolean;
+            isCurrent: boolean;
         };
     };
     emit: (event: string, ...args: any[]) => void;
@@ -2859,7 +2863,6 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         userInfo: Record<string, any>;
         sysImageSize: unknown[];
     }>;
-    handlePrimaryKey: import("vue").ComputedRef<string>;
     handleSeqConfig: import("vue").ComputedRef<{
         startIndex: number;
     }>;

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

@@ -1115,6 +1115,14 @@ declare const _default: import("vue").DefineComponent<{
                 textColorTextDisabledWarning: string;
                 textColorGhostWarning: string;
                 textColorGhostHoverWarning: string;
+                /**
+                 * 初始化props
+                 * @param {*} unionItem
+                 * @param {*} row
+                 * @param {*} column
+                 * @param {*} $rowIndex
+                 * @returns
+                 */
                 textColorGhostPressedWarning: string;
                 textColorGhostFocusWarning: string;
                 textColorGhostDisabledWarning: string;
@@ -1184,7 +1192,10 @@ declare const _default: import("vue").DefineComponent<{
                 fontSizeSmall: string;
                 fontSizeMedium: string;
                 fontSizeLarge: string;
-                opacityDisabled: string;
+                opacityDisabled: string; /**
+                 * 避免每次点击都查询
+                 * 初始化查一次 行编辑 表单search用
+                 */
                 colorOpacitySecondary: string;
                 colorOpacitySecondaryHover: string;
                 colorOpacitySecondaryPressed: string;
@@ -1207,7 +1218,9 @@ declare const _default: import("vue").DefineComponent<{
                 textColorHover: string;
                 textColorPressed: string;
                 textColorFocus: string;
-                textColorDisabled: string;
+                textColorDisabled: string; /**
+                 * tsx渲染表格
+                 */
                 textColorText: string;
                 textColorTextHover: string;
                 textColorTextPressed: string;
@@ -2502,6 +2515,8 @@ declare const _default: import("vue").DefineComponent<{
         editConfig: import("vxe-table").VxeTablePropTypes.EditConfig;
         rowConfig: {
             height: number;
+            isHover: boolean;
+            isCurrent: boolean;
         };
     };
     state: {
@@ -2573,6 +2588,8 @@ declare const _default: import("vue").DefineComponent<{
         };
         rowConfig: {
             height: number;
+            isHover: boolean;
+            isCurrent: boolean;
         };
     };
     emit: (event: string, ...args: any[]) => void;
@@ -2858,7 +2875,6 @@ declare const _default: import("vue").DefineComponent<{
         userInfo: Record<string, any>;
         sysImageSize: unknown[];
     }>;
-    handlePrimaryKey: import("vue").ComputedRef<string>;
     handleSeqConfig: import("vue").ComputedRef<{
         startIndex: number;
     }>;
@@ -4037,6 +4053,9 @@ 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

@@ -16,7 +16,7 @@ import SvgIcon from '../../../src/components/SvgIcon';
 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, visibleMethod, getRowStyle, getFooterGroup, flattenRow, intersectRow, removeCheckedDisabledRows } from './utils.js';
+import { handleTableHeight, setTableConfig, handleGroupColums, treeToList, 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';
@@ -136,9 +136,6 @@ var script = /* @__PURE__ */ defineComponent({
         sysImageSize: props.sysImageSize || {}
       };
     });
-    const handlePrimaryKey = computed(() => {
-      return state.isTree > 0 ? props.primaryKey || "theUniqueKey" : "theUniqueKey";
-    });
     const handleSeqConfig = computed(() => {
       if (props.isNestTable)
         return {
@@ -156,25 +153,33 @@ var script = /* @__PURE__ */ defineComponent({
     });
     const treeConfig = computed(() => {
       let result = null;
-      switch (Number(state.isTree)) {
-        case 1:
-        case 3:
-          result = {
-            children: "childrenList",
-            accordion: state.openOnly > 0,
-            reserve: true
-          };
-          break;
-        case 2:
-          result = {
-            lazy: true,
-            reserve: true,
-            children: "childrenList",
-            hasChild: "hasChildren",
-            loadMethod: loadChildrenMethod,
-            accordion: state.openOnly > 0
-          };
-          break;
+      let {
+        isTransform
+      } = props.tableParams;
+      let statusNumber = Number(state.isTree);
+      if ([1, 3].includes(statusNumber)) {
+        result = {
+          children: "childrenList",
+          accordion: state.openOnly > 0,
+          reserve: true
+        };
+        if (isTransform) {
+          Reflect.deleteProperty(result, "children");
+          Object.assign(result, {
+            rowField: "qianduan_id",
+            parentField: "qianduan_parent_id",
+            transform: true
+          });
+        }
+      } else if (statusNumber == 2) {
+        result = {
+          lazy: true,
+          reserve: true,
+          children: "childrenList",
+          hasChild: "hasChildren",
+          loadMethod: loadChildrenMethod,
+          accordion: state.openOnly > 0
+        };
       }
       return result;
     });
@@ -253,7 +258,12 @@ var script = /* @__PURE__ */ defineComponent({
     };
     const loadData = async (data) => {
       state.isShowEmpty = !(data == null ? void 0 : data.length);
-      const list = JSON.parse(JSON.stringify(data));
+      let list = JSON.parse(JSON.stringify(data));
+      let {
+        isTransform
+      } = props.tableParams;
+      if (isTransform && [1, 3].includes(Number(state.isTree)))
+        list = treeToList(list);
       let table = xGrid.value;
       if (!table)
         return;
@@ -340,6 +350,7 @@ var script = /* @__PURE__ */ defineComponent({
         state.rowConfig.height = 48;
       }
       state.rowConfig.height = Object.assign(state.rowConfig.height, rowConfig);
+      state.rowConfig.keyField = handleRowId.value;
       if (selectType) {
         isBatchSelect = 1;
       }
@@ -433,6 +444,7 @@ var script = /* @__PURE__ */ defineComponent({
           fixed,
           sortable,
           headerClassName: "mycolumn",
+          resizable: true,
           showOverflow: "title",
           treeNode,
           type,
@@ -535,13 +547,17 @@ var script = /* @__PURE__ */ defineComponent({
           return createVNode(NPopconfirm, {
             "onPositiveClick": () => deleteRow(row, col, index)
           }, {
-            trigger: () => createVNode(NButton, {
-              "color": btn.settingObj[0].color || "#999",
-              "text": true
-            }, {
-              default: () => [btn.name]
-            }),
-            default: () => "\u662F\u5426\u786E\u8BA4\u5220\u9664\uFF1F"
+            trigger() {
+              return createVNode(NButton, {
+                "color": btn.settingObj[0].color || "#999",
+                "text": true
+              }, {
+                default: () => [btn.name]
+              });
+            },
+            default() {
+              return "\u662F\u5426\u786E\u8BA4\u5220\u9664\uFF1F";
+            }
           });
         } else {
           return null;
@@ -600,10 +616,14 @@ var script = /* @__PURE__ */ defineComponent({
       }
       if (attrType === "COUNTDOWN") {
         return createVNode(NTooltip, null, {
-          trigger: () => createVNode("span", {
-            "innerHTML": row[own.columnName + "_countdown"] || ""
-          }, null),
-          default: () => row[own.columnName + "_countdownTip"]
+          trigger() {
+            return createVNode("span", {
+              "innerHTML": row[own.columnName + "_countdown"] || ""
+            }, null);
+          },
+          default() {
+            return row[own.columnName + "_countdownTip"];
+          }
         });
       }
       if (attrType === "DURATION") {
@@ -1087,6 +1107,7 @@ var script = /* @__PURE__ */ defineComponent({
       _rowIndex,
       _columnIndex
     }) => {
+      var _a;
       if (state.isTree != 3) {
         return {
           rowspan: 1,
@@ -1098,22 +1119,26 @@ var script = /* @__PURE__ */ defineComponent({
         return !!column2.property;
       });
       let colspan = xTree.getTableColumn().tableColumn.length - fristKeyIndex;
-      if (row.childrenList && row.childrenList.length && xTree) {
-        if (column.treeNode) {
-          return {
-            rowspan: 1,
-            colspan
-          };
-        } else if (!column.property) {
-          return {
-            rowspan: 1,
-            colspan: 1
-          };
-        } else {
-          return {
-            rowspan: 0,
-            colspan: 0
-          };
+      if (xTree) {
+        const isOldVxeTree = row.childrenList && row.childrenList.length;
+        const isTransformVxeTree = ((_a = props.tableParams) == null ? void 0 : _a.isTransform) && !row.qianduan_parent_id;
+        if (isOldVxeTree || isTransformVxeTree) {
+          if (column.treeNode) {
+            return {
+              rowspan: 1,
+              colspan
+            };
+          } else if (!column.property) {
+            return {
+              rowspan: 1,
+              colspan: 1
+            };
+          } else {
+            return {
+              rowspan: 0,
+              colspan: 0
+            };
+          }
         }
       }
     };
@@ -1530,11 +1555,15 @@ var script = /* @__PURE__ */ defineComponent({
       return createVNode(NPopconfirm, {
         "onPositiveClick": () => confirmScanMulti(params)
       }, {
-        trigger: () => createVNode(SvgIcon, {
-          "class": "scan-multi-delete",
-          "iconClass": "shanchu"
-        }, null),
-        default: () => "\u662F\u5426\u786E\u8BA4\u5220\u9664\uFF1F"
+        trigger() {
+          return createVNode(SvgIcon, {
+            "class": "scan-multi-delete",
+            "iconClass": "shanchu"
+          }, null);
+        },
+        default() {
+          return "\u662F\u5426\u786E\u8BA4\u5220\u9664\uFF1F";
+        }
       });
     };
     const showEditForm = (row, column, $rowIndex) => {
@@ -1817,7 +1846,7 @@ var script = /* @__PURE__ */ defineComponent({
       recordClickBtnInfo(row, index);
       emit("setNestTableClick", props.isNestTable);
       emit("setCurRowIndex", index);
-      emit("clickBtn", row, btn, row[handlePrimaryKey.value], index);
+      emit("clickBtn", row, btn, row[handleRowId.value], index);
     };
     const getBtnIcon = (btn, mr = "8px") => {
       let icon;
@@ -1933,7 +1962,7 @@ var script = /* @__PURE__ */ defineComponent({
       vxeTable.setCurrentRow(row);
       emit("setNestTableClick", props.isNestTable);
       emit("setCurRowIndex", index);
-      emit("linkDetail", row, col, row[handlePrimaryKey.value], null, false, index);
+      emit("linkDetail", row, col, row[handleRowId.value], null, false, index);
     };
     const hanldeCopyContent = (e, value) => {
       e.preventDefault();
@@ -2219,17 +2248,13 @@ var script = /* @__PURE__ */ defineComponent({
         border: "",
         "show-overflow": "",
         "show-header-overflow": "",
-        "highlight-hover-row": "",
-        "highlight-current-row": "",
         "show-footer-overflow": "title",
         "keep-source": "",
-        resizable: "",
         "auto-resize": "",
         height: props.height ? "auto" : void 0
       }, _ctx.$attrs, {
         "seq-config": unref(handleSeqConfig),
         "tree-config": unref(treeConfig),
-        "row-id": unref(handleRowId),
         "row-class-name": getRowClassName,
         "cell-class-name": _ctx.columnConfig.cellClassName || null,
         "row-config": state.rowConfig,
@@ -2340,7 +2365,7 @@ var script = /* @__PURE__ */ defineComponent({
           }
         })]),
         _: 3
-      }, 16, ["height", "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, ["height", "seq-config", "tree-config", "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", {
         class: "refresh",
         onClick: hanldeClickRefresh
       }, [createVNode(unref(NIcon), {

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

@@ -49,6 +49,8 @@ declare const bigTableState: {
     editConfig: VxeTablePropTypes.EditConfig;
     rowConfig: {
         height: number;
+        isHover: boolean;
+        isCurrent: boolean;
     };
 };
 export default bigTableState;

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

@@ -54,7 +54,7 @@ const bigTableState = {
       return !row.$__SEPARATE;
     }
   },
-  rowConfig: { height: 32 }
+  rowConfig: { height: 32, isHover: true, isCurrent: true }
 };
 
 export { bigTableState as default };

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

@@ -24,7 +24,7 @@ const useFormat = (state) => {
     } = data;
     const { nobutton = false } = ((_a = state.options) == null ? void 0 : _a.config) || {};
     return tableList.map((_item, index) => {
-      let item = vexutils.clone(_item, true);
+      const item = vexutils.clone(_item, true);
       item.origin = vexutils.clone(_item, true);
       if (isNestTabel) {
         Object.assign(item, {

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

@@ -6,7 +6,7 @@ const useNestTable = (props, state, emit) => {
     return props.showNestTable || props.isNestTable;
   });
   const isExpandTable = computed(() => {
-    let { isBatchSelect } = props.columnConfig || {};
+    const { isBatchSelect } = props.columnConfig || {};
     return !props.isNestTable && isBatchSelect == 1;
   });
   const handleRowId = computed(() => {

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

@@ -16,6 +16,10 @@ export declare const checkMethod: ({ row }: {
     row: any;
 }) => boolean;
 export declare const visibleMethod: ({ row }: any) => boolean;
+/**
+ * 单选行数据 树形结构转列表
+ */
+export declare const treeToList: (treeData: any[]) => any[];
 /**
  * 单选行数据 树结构 扁平化处理
  */
@@ -29,7 +33,7 @@ export declare const setFilterStatus: (state: any, props: any) => false | undefi
 export declare const getRowStyle: ({ row }: any) => string | null;
 export declare const handleTableHeight: (state: any, props: any) => any;
 export declare const handleName: (item: any, key?: string) => any;
-export declare const handleImgArr: (imgs: any, type: any, imgs2imgArr: Function) => any;
+export declare const handleImgArr: (imgs: any, type: any, imgs2imgArr: (imgs: any) => any[]) => any[];
 export declare const handleImgSrc: (curSrc: any, imageArr: any, type: any) => any;
 export declare const modalDetailImage: (imageArr: any, type: any, defaultHeight: any) => any;
 /** 选人组件数据解析 */