cnhis-design-vue 3.3.3-beta.7 → 3.3.3-beta.72

package/es/components/fabric-chart/src/hooks/birthProcess/useBirthProcess.js

@@ -22,6 +22,8 @@ function getCurrentTime(lastTime, range2) {
   return lastTime + 1 > range2[1] ? range2[0] : lastTime + 1;
 }
 function isStartTimeHalfOrLater(startTime) {
+  if (!startTime)
+    return false;
   const startTimeDate = new Date(startTime);
   return getMinutes(startTimeDate) >= 30;
 }
@@ -784,7 +786,7 @@ function useBirthProcess(canvas, propItems, emits, pointTipProps, pointMenuProps
       const processTimeList = range(processTimeRange[0], processTimeRange[1] + 1);
       const timeTextList = [];
       const processTimeTextList = [];
-      const firstTime = getHours(new Date(startTime2));
+      const firstTime = startTime2 ? getHours(new Date(startTime2)) : 0;
       const halfYCellHeight = yCellHeight / 2;
       for (let i = 0; i < grid.mainXCell; i++) {
         if (show) {

package/es/components/fabric-chart/src/hooks/temperature/useLeft.js

@@ -50,7 +50,8 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, computedX, c
   function drwaPainScaleValue(item) {
     const {
       list: listItem = [],
-      spaceGridNumber = 5,
+      spaceGridNumber = 1,
+      numberVerticalPosition = "bottom",
       showScale,
       showNumber,
       position,
@@ -84,7 +85,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, computedX, c
       const listLen = listItem.length;
       listItem.forEach((v, i) => {
         let top = painOriginY.endY - i * yCellHeight * spaceGridNumber;
-        if (i === 0 && painSurplusCell[1] === 0) {
+        if (i === 0 && painSurplusCell[1] === 0 && (spaceGridNumber == 1 || numberVerticalPosition === "bottom")) {
           top = endY - 5;
         }
         const isMaxMinNumber = i === 0 || i === listLen - 1;

package/es/components/fabric-chart/src/hooks/temperature/useOther.d.ts

@@ -1,4 +1,4 @@
 import { Ref } from 'vue';
 import { fabric } from '../../../../../shared/utils/fabricjs';
 import { IPropItems, IObject } from '../../../../../components/fabric-chart/src/interface';
-export declare function useOther(canvas: Ref<fabric.Canvas>, propItems: IPropItems, emits: Function, computedX: Function, computedY: Function, fixedNoRisePoints: Set<IObject>): void;
+export declare function useOther(canvas: Ref<fabric.Canvas>, propItems: IPropItems, emits: Function, computedX: Function, computedY: Function, fixedNoRisePoints: Set<IObject>, getXValue: Function): void;

package/es/components/fabric-chart/src/hooks/temperature/useOther.js

@@ -1,7 +1,7 @@
 import { fabric } from '../../../../../shared/utils/fabricjs/index.js';
 import { drawLine, defaultStyle } from '../useDraw.js';
-import 'date-fns';
-import { cloneDeep, last } from 'lodash-es';
+import { parse, isBefore, addDays, getDate } from 'date-fns';
+import { last, cloneDeep } from 'lodash-es';
 import '../useEvent.js';
 import '../useShadow.js';
 import '../useCommon.js';
@@ -14,14 +14,15 @@ import '@vueuse/core';
 import '../surgicalAnesthesia/useOther.js';
 import '../../../../../shared/utils/index.js';
 
-function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoints) {
+function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoints, getXValue) {
   const {
     left: leftObj,
     other,
     vitalSignsOriginY,
     xCellWidth,
     yCellHeight,
-    endX
+    endX,
+    originX
   } = propItems;
   const getYCellHeight = () => {
     const fontSize = Math.min(...((other == null ? void 0 : other.list) || []).map((item) => {
@@ -32,11 +33,35 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
   };
   const _yCellHeight = getYCellHeight();
   let textDiff = 0;
-  function drawOther() {
-    var _a, _b;
+  function handleCrossDayLayout(currentTime, itemLeft, lastLeft, eventList) {
+    const newLeft = itemLeft + xCellWidth;
+    const nextTime = getXValue(newLeft);
+    if (isCrossDay(currentTime, nextTime)) {
+      adjustEventsForCrossDay(eventList);
+      return itemLeft;
+    } else {
+      return lastLeft + xCellWidth;
+    }
+  }
+  function adjustEventsForCrossDay(eventList) {
+    const currentColumnEvents = [...eventList];
+    const sortedEvents = currentColumnEvents.sort((a, b) => (b.trueLeft || 0) - (a.trueLeft || 0));
+    for (let i = 0; i < sortedEvents.length; i++) {
+      const event = sortedEvents[i];
+      const nextEvent = sortedEvents[i + 1];
+      const prevLeft = event.trueLeft - xCellWidth;
+      if (prevLeft >= originX) {
+        event.set("left", prevLeft);
+        event.trueLeft = prevLeft;
+      }
+      if (nextEvent && (event.trueLeft || 0) - (nextEvent.trueLeft || 0) > xCellWidth + 1) {
+        break;
+      }
+    }
+  }
+  function createOtherList() {
     if (!(other == null ? void 0 : other.list))
-      return false;
-    const list = [];
+      return [];
     const otherList = [];
     cloneDeep(other.list).forEach((item, index) => {
       item.value = item.value || "";
@@ -44,19 +69,29 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
       const left = computedX(item.time, true);
       if (left > endX)
         return;
-      const obj = otherList.find((v) => v.left == left);
-      if (obj) {
-        obj[align].push(item);
+      const existingGroup = otherList.find((v) => v.left === left);
+      if (existingGroup) {
+        existingGroup[align].push(item);
       } else {
-        const initObj = {
+        const newGroup = {
           left,
           vertical: [],
           horizontal: []
         };
-        initObj[align].push(item);
-        otherList.push(initObj);
+        newGroup[align].push(item);
+        otherList.push(newGroup);
       }
     });
+    return otherList;
+  }
+  function drawOther() {
+    var _a, _b;
+    if (!(other == null ? void 0 : other.list))
+      return;
+    const list = [];
+    const otherList = createOtherList();
+    if (otherList.length === 0)
+      return false;
     const scaleList = (_b = (_a = leftObj.yScaleValue) == null ? void 0 : _a.find((item) => item.type === "temperature")) == null ? void 0 : _b.list;
     const fixedTop = (scaleList == null ? void 0 : scaleList.length) ? computedY("temperature", 35) : 0;
     const isFixed = (v) => v.fixed && fixedTop && (v.fixedValue || v.value);
@@ -99,7 +134,7 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
         fixedTopY = fixedTop;
         const lastLeft = ((_a2 = last(list)) == null ? void 0 : _a2.left) || 0;
         if (item.left <= lastLeft + 0.1) {
-          leftX = lastLeft + xCellWidth;
+          leftX = handleCrossDayLayout(v.time, item.left, lastLeft, list);
         }
         if (String(v.value).length) {
           list.push(drawEventText(v, leftX, topY2));
@@ -197,5 +232,13 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
   }
   drawOther();
 }
+function isCrossDay(dateStr1, dateStr2) {
+  const date1 = parse(dateStr1, "yyyy-MM-dd HH:mm", new Date());
+  const date2 = parse(dateStr2, "yyyy-MM-dd HH:mm", new Date());
+  const earlierDate = isBefore(date1, date2) ? date1 : date2;
+  const laterDate = isBefore(date1, date2) ? date2 : date1;
+  const earlierDatePlusOneDay = addDays(earlierDate, 1);
+  return getDate(earlierDatePlusOneDay) === getDate(laterDate);
+}
 
 export { useOther };

package/es/components/fabric-chart/src/hooks/temperature/useTemperatureChart.js

@@ -227,9 +227,10 @@ function useTemperatureChart(canvas, props, emits, canvasRef, pointTipProps, poi
     if (!painItem)
       return 0;
     const {
-      numberVerticalPosition = "bottom"
+      numberVerticalPosition = "bottom",
+      spaceGridNumber = 1
     } = painItem;
-    return numberVerticalPosition === "center" ? yCellHeight.value / 2 : 0;
+    return numberVerticalPosition === "center" ? yCellHeight.value * spaceGridNumber / 2 : 0;
   });
   const painIndex = computed(() => {
     const {
@@ -398,7 +399,7 @@ function useTemperatureChart(canvas, props, emits, canvasRef, pointTipProps, poi
       } = useLeft(canvas, propItems, emits, setPopup, pointTipProps, computedX, computedY, getXValue, getYValue, isAddPoint, updateData, gridPoints);
       useRight(canvas, propItems, drawScaleValue);
       useBottom(canvas, propItems);
-      useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoints);
+      useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoints, getXValue);
       const {
         select: _select
       } = useCanvasEvent(canvas, propItems, emits);

package/es/components/field-editor/index.d.ts

@@ -39,6 +39,10 @@ declare const FieldEditor: SFCWithInstall<import("vue").DefineComponent<{}, {
         businessFormatter: {
             type: import("vue").PropType<import("..").FormBusinessFormatter>;
         };
+        nominalAge: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
         schema: {
             type: import("vue").PropType<import("@formily/json-schema").Stringify<{
                 [key: symbol]: any;
@@ -211,6 +215,7 @@ declare const FieldEditor: SFCWithInstall<import("vue").DefineComponent<{}, {
             type: BooleanConstructor;
         };
         lazyRender: BooleanConstructor;
+        linebreaksToTitle: BooleanConstructor;
         dialogFn: {};
     }, {
         props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
@@ -243,6 +248,10 @@ declare const FieldEditor: SFCWithInstall<import("vue").DefineComponent<{}, {
             businessFormatter: {
                 type: import("vue").PropType<import("..").FormBusinessFormatter>;
             };
+            nominalAge: {
+                type: BooleanConstructor;
+                default: boolean;
+            };
             schema: {
                 type: import("vue").PropType<import("@formily/json-schema").Stringify<{
                     [key: symbol]: any;
@@ -415,6 +424,7 @@ declare const FieldEditor: SFCWithInstall<import("vue").DefineComponent<{}, {
                 type: BooleanConstructor;
             };
             lazyRender: BooleanConstructor;
+            linebreaksToTitle: BooleanConstructor;
             dialogFn: {};
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
@@ -592,6 +602,7 @@ declare const FieldEditor: SFCWithInstall<import("vue").DefineComponent<{}, {
             feedbackType: "default" | "tooltip";
             fixMemoLeak: boolean;
             lazyRender: boolean;
+            linebreaksToTitle: boolean;
             dialogFn: any;
         }>) => Record<string, import("@formily/json-schema").Stringify<{
             [key: symbol]: any;
@@ -808,6 +819,10 @@ declare const FieldEditor: SFCWithInstall<import("vue").DefineComponent<{}, {
         businessFormatter: {
             type: import("vue").PropType<import("..").FormBusinessFormatter>;
         };
+        nominalAge: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
         schema: {
             type: import("vue").PropType<import("@formily/json-schema").Stringify<{
                 [key: symbol]: any;
@@ -980,6 +995,7 @@ declare const FieldEditor: SFCWithInstall<import("vue").DefineComponent<{}, {
             type: BooleanConstructor;
         };
         lazyRender: BooleanConstructor;
+        linebreaksToTitle: BooleanConstructor;
         dialogFn: {};
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
@@ -1014,6 +1030,8 @@ declare const FieldEditor: SFCWithInstall<import("vue").DefineComponent<{}, {
         feedbackType: "default" | "tooltip";
         fixMemoLeak: boolean;
         lazyRender: boolean;
+        linebreaksToTitle: boolean;
+        nominalAge: boolean;
         operationalFormInit: boolean;
         incrementalRender: boolean;
     }>;

package/es/components/field-editor/src/FieldEditor.vue.d.ts

@@ -40,6 +40,10 @@ declare const _default: import("vue").DefineComponent<{}, {
         businessFormatter: {
             type: import("vue").PropType<import("../../../components/form-render").FormBusinessFormatter>;
         };
+        nominalAge: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
         schema: {
             type: import("vue").PropType<import("@formily/json-schema").Stringify<{
                 [key: symbol]: any;
@@ -212,6 +216,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             type: BooleanConstructor;
         };
         lazyRender: BooleanConstructor;
+        linebreaksToTitle: BooleanConstructor;
         dialogFn: {};
     }, {
         props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
@@ -244,6 +249,10 @@ declare const _default: import("vue").DefineComponent<{}, {
             businessFormatter: {
                 type: import("vue").PropType<import("../../../components/form-render").FormBusinessFormatter>;
             };
+            nominalAge: {
+                type: BooleanConstructor;
+                default: boolean;
+            };
             schema: {
                 type: import("vue").PropType<import("@formily/json-schema").Stringify<{
                     [key: symbol]: any;
@@ -416,6 +425,7 @@ declare const _default: import("vue").DefineComponent<{}, {
                 type: BooleanConstructor;
             };
             lazyRender: BooleanConstructor;
+            linebreaksToTitle: BooleanConstructor;
             dialogFn: {};
         }>> & {
             onFormChange?: ((...args: any[]) => any) | undefined;
@@ -593,6 +603,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             feedbackType: "default" | "tooltip";
             fixMemoLeak: boolean;
             lazyRender: boolean;
+            linebreaksToTitle: boolean;
             dialogFn: any;
         }>) => Record<string, import("@formily/json-schema").Stringify<{
             [key: symbol]: any;
@@ -809,6 +820,10 @@ declare const _default: import("vue").DefineComponent<{}, {
         businessFormatter: {
             type: import("vue").PropType<import("../../../components/form-render").FormBusinessFormatter>;
         };
+        nominalAge: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
         schema: {
             type: import("vue").PropType<import("@formily/json-schema").Stringify<{
                 [key: symbol]: any;
@@ -981,6 +996,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             type: BooleanConstructor;
         };
         lazyRender: BooleanConstructor;
+        linebreaksToTitle: BooleanConstructor;
         dialogFn: {};
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
@@ -1015,6 +1031,8 @@ declare const _default: import("vue").DefineComponent<{}, {
         feedbackType: "default" | "tooltip";
         fixMemoLeak: boolean;
         lazyRender: boolean;
+        linebreaksToTitle: boolean;
+        nominalAge: boolean;
         operationalFormInit: boolean;
         incrementalRender: boolean;
     }>;

package/es/components/field-editor/src/FieldEditor.vue2.js

@@ -15,7 +15,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     function getFieldListByType(htmlType) {
       switch (htmlType) {
         case HtmlType.DIGITAL:
-          return [FIELD_EDITOR_FIELDS.DECIMAL_LENGTH_FIELD];
+          return [FIELD_EDITOR_FIELDS.DECIMAL_LENGTH_FIELD, FIELD_EDITOR_FIELDS.SUFFIX_FIELD];
         case HtmlType.DATE:
           return [FIELD_EDITOR_FIELDS.DATE_FORMAT_FIELD];
         case HtmlType.RADIO:
@@ -31,6 +31,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         case HtmlType.MULTI_SELECT:
           return [FIELD_EDITOR_FIELDS.OPTION_FIELD];
         case HtmlType.INPUT:
+          return [FIELD_EDITOR_FIELDS.SUFFIX_FIELD];
         case HtmlType.TEXTAREA:
         default:
           return [];

package/es/components/field-editor/src/fields.d.ts

@@ -15,5 +15,6 @@ export declare const FIELD_EDITOR_FIELDS: Readonly<{
     readonly DATE_FORMAT_FIELD: FieldItem;
     readonly DECIMAL_LENGTH_FIELD: FieldItem;
     readonly OPTION_FIELD: FieldItem;
+    readonly SUFFIX_FIELD: FieldItem;
     readonly DEFAULT_FIELD_LIST: FieldItem[];
 }>;

package/es/components/field-editor/src/fields.js

@@ -277,6 +277,11 @@ const DECIMAL_LENGTH_FIELD = {
   default_val: "0",
   remark: "\u5C0F\u6570\u4F4D\u6570,\u9ED8\u8BA4\u4E3A0"
 };
+const SUFFIX_FIELD = {
+  alias: "\u540E\u7F00",
+  val_key: "suffix",
+  html_type: "INPUT"
+};
 const OPTION_FIELD = {
   alias: "\u9009\u9879",
   val_key: "option",
@@ -396,6 +401,7 @@ const FIELD_EDITOR_FIELDS = Object.freeze({
   DATE_FORMAT_FIELD,
   DECIMAL_LENGTH_FIELD,
   OPTION_FIELD,
+  SUFFIX_FIELD,
   DEFAULT_FIELD_LIST
 });
 

package/es/components/field-set/src/FieldColor.vue.d.ts

@@ -49,8 +49,10 @@ declare const _default: import("vue").DefineComponent<{
         isHeadCheckHide?: boolean | undefined;
         isShow?: boolean | undefined;
         contentRender?: ((column: AnyObject, row: AnyObject) => import("vue").VNodeChild) | undefined;
+        titleRender?: ((column: AnyObject) => import("vue").VNodeChild) | undefined;
         hide?: boolean | undefined;
         positionField?: string | undefined;
+        showPrevFn?: ((column: FieldSetColumnItem, row: AnyObject) => boolean) | undefined;
     }[]>;
     rowProps: {
         columns: {
@@ -63,8 +65,10 @@ declare const _default: import("vue").DefineComponent<{
             isHeadCheckHide?: boolean | undefined;
             isShow?: boolean | undefined;
             contentRender?: ((column: AnyObject, row: AnyObject) => import("vue").VNodeChild) | undefined;
+            titleRender?: ((column: AnyObject) => import("vue").VNodeChild) | undefined;
             hide?: boolean | undefined;
             positionField?: string | undefined;
+            showPrevFn?: ((column: FieldSetColumnItem, row: AnyObject) => boolean) | undefined;
         }[];
         data: AnyObject[];
         onEdit: ({ row, readonly: _readonly, add }: AnyObject) => void;
@@ -356,12 +360,13 @@ declare const _default: import("vue").DefineComponent<{
         emit: (event: "edit" | "updateChecked", ...args: any[]) => void;
         onRemove: () => void;
         onEdit: (param?: AnyObject) => void;
+        prevFunc: (column: AnyObject) => any;
         isRenderTooltip: (field: string) => any;
         getTooltipContent: () => any;
         getTextValue: (field: string) => any;
         isMultiple: (field: string) => boolean;
         isRender: (field: string) => boolean;
-        isShow: (field: string) => any;
+        isShow: (column: AnyObject) => any;
         showRelation: (field: string) => boolean;
         getSortPriorityOptions: () => {
             label: string;
@@ -534,12 +539,12 @@ declare const _default: import("vue").DefineComponent<{
         }>;
         developMode: boolean;
         draggable: boolean;
-        fieldDescribeMode: "column" | "tooltip";
-        isFieldSet: boolean;
-        hideExpressionOption: AnyObject[];
+        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
-        isHighlightRow: boolean;
+        isFieldSet: boolean;
+        fieldDescribeMode: "column" | "tooltip";
+        hideExpressionOption: AnyObject[];
     }>;
     EditDialog: import("vue").DefineComponent<{
         visible: {

package/es/components/field-set/src/FieldFilter.vue.d.ts

@@ -45,8 +45,10 @@ declare const _default: import("vue").DefineComponent<{
         isHeadCheckHide?: boolean | undefined;
         isShow?: boolean | undefined;
         contentRender?: ((column: AnyObject, row: AnyObject) => import("vue").VNodeChild) | undefined;
+        titleRender?: ((column: AnyObject) => import("vue").VNodeChild) | undefined;
         hide?: boolean | undefined;
         positionField?: string | undefined;
+        showPrevFn?: ((column: FieldSetColumnItem, row: AnyObject) => boolean) | undefined;
     }[]>;
     data: import("vue").Ref<{
         [x: string]: any;
@@ -72,8 +74,10 @@ declare const _default: import("vue").DefineComponent<{
             isHeadCheckHide?: boolean | undefined;
             isShow?: boolean | undefined;
             contentRender?: ((column: AnyObject, row: AnyObject) => import("vue").VNodeChild) | undefined;
+            titleRender?: ((column: AnyObject) => import("vue").VNodeChild) | undefined;
             hide?: boolean | undefined;
             positionField?: string | undefined;
+            showPrevFn?: ((column: FieldSetColumnItem, row: AnyObject) => boolean) | undefined;
         }[];
         data: {
             [x: string]: any;
@@ -385,12 +389,13 @@ declare const _default: import("vue").DefineComponent<{
         emit: (event: "edit" | "updateChecked", ...args: any[]) => void;
         onRemove: () => void;
         onEdit: (param?: AnyObject) => void;
+        prevFunc: (column: AnyObject) => any;
         isRenderTooltip: (field: string) => any;
         getTooltipContent: () => any;
         getTextValue: (field: string) => any;
         isMultiple: (field: string) => boolean;
         isRender: (field: string) => boolean;
-        isShow: (field: string) => any;
+        isShow: (column: AnyObject) => any;
         showRelation: (field: string) => boolean;
         getSortPriorityOptions: () => {
             label: string;
@@ -563,12 +568,12 @@ declare const _default: import("vue").DefineComponent<{
         }>;
         developMode: boolean;
         draggable: boolean;
-        fieldDescribeMode: "column" | "tooltip";
-        isFieldSet: boolean;
-        hideExpressionOption: AnyObject[];
+        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
-        isHighlightRow: boolean;
+        isFieldSet: boolean;
+        fieldDescribeMode: "column" | "tooltip";
+        hideExpressionOption: AnyObject[];
     }>;
     setStyle: typeof setStyle;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("close" | "save" | "reset")[], "close" | "save" | "reset", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/components/field-set/src/FieldSet.vue.d.ts

@@ -95,8 +95,18 @@ declare const _default: import("vue").DefineComponent<{
     titleAlias: {
         type: StringConstructor;
     };
+    tableConfig: {
+        type: PropType<{
+            compositeSort: boolean;
+            sortType?: "SINGLE" | "MULTIPLE" | undefined;
+        } & AnyObject>;
+    };
 }, {
     fieldsMapping: Record<string, string>;
+    TABLESORT_OPTION: {
+        label: string;
+        value: string;
+    }[];
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         fields: {
             type: PropType<Partial<{
@@ -190,6 +200,12 @@ declare const _default: import("vue").DefineComponent<{
         titleAlias: {
             type: StringConstructor;
         };
+        tableConfig: {
+            type: PropType<{
+                compositeSort: boolean;
+                sortType?: "SINGLE" | "MULTIPLE" | undefined;
+            } & AnyObject>;
+        };
     }>> & {
         onSave?: ((...args: any[]) => any) | undefined;
         onClose?: ((...args: any[]) => any) | undefined;
@@ -201,6 +217,7 @@ declare const _default: import("vue").DefineComponent<{
     tableBodyRef: import("vue").Ref<HTMLDivElement | undefined>;
     tableRef: import("vue").Ref<any>;
     newFields: import("vue").Ref<AnyObject[]>;
+    compositeSort: import("vue").Ref<"SINGLE" | "MULTIPLE">;
     defaultColumns: FieldSetColumnItem[];
     columns: import("vue").Ref<{
         [x: string]: any;
@@ -212,12 +229,15 @@ declare const _default: import("vue").DefineComponent<{
         isHeadCheckHide?: boolean | undefined;
         isShow?: boolean | undefined;
         contentRender?: ((column: AnyObject, row: AnyObject) => VNodeChild) | undefined;
+        titleRender?: ((column: AnyObject) => VNodeChild) | undefined;
         hide?: boolean | undefined;
         positionField?: string | undefined;
+        showPrevFn?: ((column: FieldSetColumnItem, row: AnyObject) => boolean) | undefined;
     }[]>;
     itemWidth: import("vue").ComputedRef<string>;
     fieldList: import("vue").ComputedRef<AnyObject[]>;
     hasFieldDescribe: import("vue").ComputedRef<boolean>;
+    isShowCompositeSort: import("vue").ComputedRef<boolean | undefined>;
     rowProps: {
         columns: {
             [x: string]: any;
@@ -229,8 +249,10 @@ declare const _default: import("vue").DefineComponent<{
             isHeadCheckHide?: boolean | undefined;
             isShow?: boolean | undefined;
             contentRender?: ((column: AnyObject, row: AnyObject) => VNodeChild) | undefined;
+            titleRender?: ((column: AnyObject) => VNodeChild) | undefined;
             hide?: boolean | undefined;
             positionField?: string | undefined;
+            showPrevFn?: ((column: FieldSetColumnItem, row: AnyObject) => boolean) | undefined;
         }[];
         data: AnyObject[];
         onUpdateChecked: ({ checked, column }: {
@@ -269,12 +291,19 @@ declare const _default: import("vue").DefineComponent<{
     initColumns: () => void;
     isNoAllCheck: (field: string) => boolean;
     onMove: (e: any) => boolean;
+    getTableConfig: () => {
+        tableConfig: {
+            sortType?: "SINGLE" | "MULTIPLE" | undefined;
+            compositeSort: boolean;
+        };
+    } | undefined;
     NButton: any;
     NCheckbox: any;
     NPopconfirm: any;
     NIcon: any;
     NTooltip: any;
     NInput: any;
+    NSelect: any;
     Draggable: import("vue").DefineComponent<{
         list: {
             type: ArrayConstructor;
@@ -551,12 +580,13 @@ declare const _default: import("vue").DefineComponent<{
         emit: (event: "edit" | "updateChecked", ...args: any[]) => void;
         onRemove: () => void;
         onEdit: (param?: AnyObject) => void;
+        prevFunc: (column: AnyObject) => any;
         isRenderTooltip: (field: string) => any;
         getTooltipContent: () => any;
         getTextValue: (field: string) => any;
         isMultiple: (field: string) => boolean;
         isRender: (field: string) => boolean;
-        isShow: (field: string) => any;
+        isShow: (column: AnyObject) => any;
         showRelation: (field: string) => boolean;
         getSortPriorityOptions: () => {
             label: string;
@@ -729,17 +759,18 @@ declare const _default: import("vue").DefineComponent<{
         }>;
         developMode: boolean;
         draggable: boolean;
-        fieldDescribeMode: "column" | "tooltip";
-        isFieldSet: boolean;
-        hideExpressionOption: AnyObject[];
+        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
-        isHighlightRow: boolean;
+        isFieldSet: boolean;
+        fieldDescribeMode: "column" | "tooltip";
+        hideExpressionOption: AnyObject[];
     }>;
     isArray: {
         (value?: any): value is any[];
         <T>(value?: any): value is any[];
     };
+    isFunction: (value: any) => value is (...args: any[]) => any;
     setStyle: typeof setStyle;
     isDraggableItem: typeof isDraggableItem;
     HelpCircleSharp: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
@@ -836,6 +867,12 @@ declare const _default: import("vue").DefineComponent<{
     titleAlias: {
         type: StringConstructor;
     };
+    tableConfig: {
+        type: PropType<{
+            compositeSort: boolean;
+            sortType?: "SINGLE" | "MULTIPLE" | undefined;
+        } & AnyObject>;
+    };
 }>> & {
     onSave?: ((...args: any[]) => any) | undefined;
     onClose?: ((...args: any[]) => any) | undefined;
@@ -867,9 +904,9 @@ declare const _default: import("vue").DefineComponent<{
     showSeq: boolean;
     developMode: boolean;
     footerFlag: boolean;
+    fieldDescribeMode: "column" | "tooltip";
     customColumns: FieldSetColumnItem[];
     showSortPriority: boolean;
     showHeadFilter: boolean;
-    fieldDescribeMode: "column" | "tooltip";
 }>;
 export default _default;