cnhis-design-vue 3.1.34 → 3.1.35-beta.10

package/es/components/big-table/src/components/edit-form/edit-separate.vue.d.ts

@@ -40,18 +40,21 @@ declare const _default: import("vue").DefineComponent<{
         index: number;
         rawRow: AnyObject;
         row: AnyObject;
+        colspans?: Record<string, number> | undefined;
     } | undefined;
     onShow: (target: {
         separateData: Record<string, string>;
         index: number;
         rawRow: AnyObject;
         row: AnyObject;
+        colspans?: Record<string, number> | undefined;
     } | undefined) => Promise<void>;
     onClose: (target: {
         separateData: Record<string, string>;
         index: number;
         rawRow: AnyObject;
         row: AnyObject;
+        colspans?: Record<string, number> | undefined;
     } | undefined) => Promise<void>;
     updateShow: (show: boolean) => void;
     style: CSSProperties;
@@ -99,6 +102,7 @@ declare const _default: import("vue").DefineComponent<{
             index: number;
             rawRow: AnyObject;
             row: AnyObject;
+            colspans?: Record<string, number> | undefined;
         }>>;
         displayContent: import("vue").ComputedRef<string>;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/components/big-table/src/components/separate.vue.d.ts

@@ -25,6 +25,7 @@ declare const _default: import("vue").DefineComponent<{
         index: number;
         rawRow: AnyObject;
         row: AnyObject;
+        colspans?: Record<string, number> | undefined;
     }>>;
     displayContent: import("vue").ComputedRef<string>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/components/big-table/src/hooks/useEdit.d.ts

@@ -232,18 +232,21 @@ export declare const comps: {
             index: number;
             rawRow: import("../../../../shared/types").AnyObject;
             row: import("../../../../shared/types").AnyObject;
+            colspans?: Record<string, number> | undefined;
         } | undefined;
         onShow: (target: {
             separateData: Record<string, string>;
             index: number;
             rawRow: import("../../../../shared/types").AnyObject;
             row: import("../../../../shared/types").AnyObject;
+            colspans?: Record<string, number> | undefined;
         } | undefined) => Promise<void>;
         onClose: (target: {
             separateData: Record<string, string>;
             index: number;
             rawRow: import("../../../../shared/types").AnyObject;
             row: import("../../../../shared/types").AnyObject;
+            colspans?: Record<string, number> | undefined;
         } | undefined) => Promise<void>;
         updateShow: (show: boolean) => void;
         style: import("vue").CSSProperties;
@@ -291,6 +294,7 @@ export declare const comps: {
                 index: number;
                 rawRow: import("../../../../shared/types").AnyObject;
                 row: import("../../../../shared/types").AnyObject;
+                colspans?: Record<string, number> | undefined;
             }>>;
             displayContent: import("vue").ComputedRef<string>;
         }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{

package/es/components/big-table/src/hooks/useSeparateRow.d.ts

@@ -1,6 +1,7 @@
 import { AnyObject, Func } from '../../../../../es/shared/types';
 import { Ref } from 'vue';
 import { VxeTableEvents, VxeTableInstance } from 'vxe-table';
+import { VxeTablePropTypes } from 'vxe-table/types/table';
 export declare class SeparateHandle {
     callbacks: Set<Func<any[], any>>;
     add(cb: Func): void;
@@ -14,17 +15,26 @@ export declare function useSeparateMap(): {
         index: number;
         rawRow: AnyObject;
         row: AnyObject;
+        colspans?: Record<string, number> | undefined;
     }>>;
     getRowData: (row: AnyObject) => {
         separateData: Record<string, string>;
         index: number;
         rawRow: AnyObject;
         row: AnyObject;
+        colspans?: Record<string, number> | undefined;
     } | undefined;
 };
-export declare function useSeparateRow(getColumnConfig: () => AnyObject[], getFieldItem: (columnName: string) => AnyObject, $VXETable: Ref<undefined | VxeTableInstance>): {
+export declare function useSeparateRow(getColumnConfig: () => AnyObject[], spanMethod: VxeTablePropTypes.SpanMethod, getFieldItem: (columnName: string) => AnyObject, $VXETable: Ref<undefined | VxeTableInstance>): {
     onColumnResize: VxeTableEvents.ResizableChange;
     needSeparateColumn: import("vue").ComputedRef<AnyObject[]>;
     separate: (data: AnyObject[], rawData: AnyObject[]) => Promise<AnyObject[]>;
     separateHandle: SeparateHandle;
+    separateDataMap: Ref<WeakMap<AnyObject, {
+        separateData: Record<string, string>;
+        index: number;
+        rawRow: AnyObject;
+        row: AnyObject;
+        colspans?: Record<string, number> | undefined;
+    }>>;
 };

package/es/components/big-table/src/hooks/useSeparateRow.js

@@ -1,5 +1,5 @@
 import { getStringWidth } from '../../../../shared/utils/index.js';
-import { isNumber, isArray, cloneDeep, isString } from 'lodash-es';
+import { isFunction, isNumber, isArray, cloneDeep, isString } from 'lodash-es';
 import { ref, computed, provide, watch, nextTick } from 'vue';
 import { InjectionSeparateHandle } from '../constants/index.js';
 
@@ -29,22 +29,32 @@ function useSeparateMap() {
   }
   return { separateDataMap, getRowData };
 }
-function useSeparateRow(getColumnConfig, getFieldItem, $VXETable) {
+function useSeparateRow(getColumnConfig, spanMethod, getFieldItem, $VXETable) {
   const needSeparateColumn = computed(() => {
     return getColumnConfig().filter((column) => column.formType === "separate");
   });
+  const columnWidthCacheMap = /* @__PURE__ */ new Map();
   async function separate(data, rawData) {
+    var _a, _b;
     if (!needSeparateColumn.value.length) {
       return data;
     }
+    columnWidthCacheMap.clear();
+    const visibleColumn = (_b = (_a = $VXETable.value) == null ? void 0 : _a.getColumns()) != null ? _b : [];
     return data.reduce(async (res, row, dataIndex) => {
       const parsedRowData = [];
       for (const column of needSeparateColumn.value) {
+        const { width, colspan } = await getColumnRenderWidth(column, row, dataIndex);
         parsedRowData.push({
           columnName: column.columnName,
-          data: contentSeparate(row[column.columnName], column.columnName, await getColumnRenderWidth(column))
+          colspan,
+          data: contentSeparate(row[column.columnName], column.columnName, width)
         });
       }
+      const separateColspans = visibleColumn.reduce((res2, column) => {
+        res2[column.field] = getColspanInfo(column.field, row, dataIndex).colspan;
+        return res2;
+      }, {});
       (await res).push(
         ...Array.from({ length: getColumnInfoMaxLength(parsedRowData) }).map((_, index) => {
           const separateData = getSeparateRowData(parsedRowData, index);
@@ -53,7 +63,8 @@ function useSeparateRow(getColumnConfig, getFieldItem, $VXETable) {
               row,
               rawRow: rawData[dataIndex],
               index: dataIndex,
-              separateData
+              separateData,
+              colspans: separateColspans
             });
             row.$__SEPARATE_DATA = [separateData];
             return row;
@@ -77,21 +88,54 @@ function useSeparateRow(getColumnConfig, getFieldItem, $VXETable) {
         return res;
       }, {});
     }
-    function getColumnInfoMaxLength(parsedRowData) {
-      return Math.max(...parsedRowData.map((r) => r.data.length), 1);
-    }
-    async function getColumnRenderWidth(column) {
+  }
+  function getColumnInfoMaxLength(parsedRowData) {
+    return Math.max(...parsedRowData.map((r) => r.data.length), 1);
+  }
+  function getColspanInfo(field, row, rowIndex) {
+    if (!$VXETable.value)
+      return { colspan: 1, columnIndex: 0 };
+    const columnInfo = $VXETable.value.getColumnByField(field);
+    const columnIndex = $VXETable.value.getColumnIndex(columnInfo);
+    const visibleColumn = $VXETable.value.getColumns() || [];
+    const _columnIndex = visibleColumn.findIndex((column) => column.field === field);
+    const { colspan = 1 } = spanMethod({
+      column: columnInfo,
+      row,
+      rowIndex,
+      $rowIndex: rowIndex,
+      _rowIndex: rowIndex,
+      columnIndex,
+      $columnIndex: columnIndex,
+      _columnIndex
+    }) || {};
+    return { colspan, columnIndex };
+  }
+  async function getColumnRenderWidth(column, row, rowIndex) {
+    if (!isFunction(spanMethod) || !$VXETable.value)
+      return { width: await getWidth(column), colspan: 1 };
+    const { colspan, columnIndex } = getColspanInfo(column.columnName, row, rowIndex);
+    const width = colspan <= 0 ? 0 : colspan === 1 ? await getWidth(column) : await $VXETable.value.getColumns().slice(columnIndex, columnIndex + colspan).reduce(async (res, columnInfo) => {
+      return await res + await getWidth({ columnName: columnInfo.field });
+    }, Promise.resolve(0));
+    return { width, colspan };
+    async function getWidth(column2) {
+      let width2 = columnWidthCacheMap.get(column2.columnName);
+      if (width2)
+        return width2;
       const prev = getRenderWidth();
       if (!prev) {
         await nextTick();
       }
-      return getRenderWidth() || getColumnWidth();
+      width2 = getRenderWidth() || getColumnWidth();
+      columnWidthCacheMap.set(column2.columnName, width2);
+      return width2;
       function getRenderWidth() {
         var _a, _b;
-        return (_b = (_a = $VXETable.value) == null ? void 0 : _a.getColumnByField(column.columnName)) == null ? void 0 : _b.renderWidth;
+        return (_b = (_a = $VXETable.value) == null ? void 0 : _a.getColumnByField(column2.columnName)) == null ? void 0 : _b.renderWidth;
       }
       function getColumnWidth() {
-        return isNumber(column.width) ? column.width : 64;
+        return isNumber(column2.width) ? column2.width : 64;
       }
     }
   }
@@ -126,7 +170,7 @@ function useSeparateRow(getColumnConfig, getFieldItem, $VXETable) {
   const separateHandle = new SeparateHandle();
   provide(InjectionSeparateHandle, separateHandle);
   watch(needSeparateColumn, separateHandle.trigger.bind(separateHandle));
-  return { onColumnResize, needSeparateColumn, separate, separateHandle };
+  return { onColumnResize, needSeparateColumn, separate, separateHandle, separateDataMap };
 }
 
 export { SeparateHandle, useSeparateMap, useSeparateRow };

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

@@ -1 +1 @@
-.big-table-filter-wrap{background-color:#fff;border-radius:4px;box-shadow:0 2px 8px rgba(0,0,0,.2);display:flex;flex-flow:column wrap;margin-top:-6px;min-width:280px;overflow:hidden;position:fixed;transform:translateX(-2%);transition:width 2s;z-index:99998}.big-table-filter-wrap .sort-list{margin-top:6px}.big-table-filter-wrap .sort-item{align-items:center;background:#f7f7f7;display:flex;height:32px;padding:0 13px}.big-table-filter-wrap .sort-item.active,.big-table-filter-wrap .sort-item:hover{background:#f2f2f2}.big-table-filter-wrap .sort-icon{background-size:contain;display:inline-block;height:16px;width:16px}.big-table-filter-wrap .sort-text{color:rgba(0,0,0,.8);font-size:14px;line-height:32px;margin-left:11px}.big-table-filter-wrap .sort-icon-desc{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABT0lEQVRYR+3WvSuGYRTH8c9TykpJSimLMvgHpLyUCQsmg/wBMss/ILvdJgspNnkbZFYGk7JQSAaLwUuX7uFxu3E/nvvqSd3XeHW6zvec65zfORUNPpUG+1cClBnIysABhiMV5y4mqt/OAliPCHCImd8AIgWf/WzMIhzFK/Z/iigWQAtuE4A2PH0HEQugG5eJ005clwBlBmrJwDwGcorBNjYybOsqwit05QQ4R1/RAB3oqQHgoWiAnL5/NKvrC/4tQBNacYesDAR5fkxHV6QU72EQczhNSfE4VpOOmY01jsOyMYYXLGElcbSIZT4W4C1MxQIIUy9sU1ltGXyeYQSfuua7L2jOWYnPKbt2HKE3dR/0Iqx593lq4AT9OQE2MZ2yDTpyXKUlF0lthP3gy8nKwBqGcgLsYCHDNuwAAe4Nk7ipZRbk9F2MWZFt+CeiEuAdAU5CIQxYYdUAAAAASUVORK5CYII=")}.big-table-filter-wrap .filter-header{cursor:auto;padding:5px 13px}.big-table-filter-wrap .filter-header-icon{border-right-color:#333;border-top-color:#333}.big-table-filter-wrap .filter-header-text{margin-left:11px}.big-table-filter-wrap .check-search-wrap{background:#f7f7f7;display:flex;justify-content:center;padding:8px 0;width:100%}.big-table-filter-wrap .check-seach-input{line-height:32px}.big-table-filter-wrap .checkbox-box{padding-right:3px;width:100%}.big-table-filter-wrap .checkbox-wrap{background:#fff;display:flex;flex-direction:column;overflow-y:auto;padding:0 3px 0 13px}.big-table-filter-wrap .checkbox-wrap::-webkit-scrollbar{height:4px;width:4px}.big-table-filter-wrap .checkbox-wrap::-webkit-scrollbar-thumb{background-color:#d5d5d5;border-radius:4px}.big-table-filter-wrap .checkbox-wrap::-webkit-scrollbar-track{background-color:#fff;border-radius:4px}.big-table-filter-wrap .checkbox-wrap::-webkit-scrollbar-corner{background-color:#000;border-radius:4px;width:4px}.big-table-filter-wrap .checkbox-wrap--search{padding-right:10px}.big-table-filter-wrap .checkbox-btn-wrap{display:flex;padding:9px 10px 9px 14px}.big-table-filter-wrap .checkbox-btn-wrap .checkbox-btn{padding:0;width:56px}.big-table-filter-wrap .checkbox-btn-wrap .checkbox-btn+.checkbox-btn{margin-left:8px}.big-table-filter-wrap .checkbox-btn-wrap .checkbox-btn-status .checkbox-btn{border:0;border-radius:0;margin:0 13px;position:relative;width:auto}.big-table-filter-wrap .checkbox-btn-wrap .checkbox-btn-status .checkbox-btn:hover:after{background-color:#5585f5;bottom:5px;content:"";display:block;height:1px;position:absolute;width:100%}.big-table-filter-wrap .arrows-icon{bottom:-1px;cursor:nw-resize;font-size:15px;height:20px;position:absolute;right:-1px;width:25px}.big-table__separate{padding:4px}.big-table__separatePlaceholder{display:inline-block;max-width:0;visibility:hidden;width:0;word-break:keep-all}.custom-big-table{position:relative}.custom-big-table .n-input{width:fit-content}.custom-big-table .img-wrap{align-items:center;display:flex;height:100%;line-height:1;padding:2px 0}.custom-big-table .img-wrap img{cursor:pointer;max-height:100%;object-fit:contain}.custom-big-table .img-wrap.img-circle img{border-radius:50%;object-fit:contain;width:28px}.custom-big-table .bigTable-qr-span{display:inline-block;height:100%;position:relative}.custom-big-table .bigTable-qr-span .bigTable-qr-img{max-height:96%}.custom-big-table .bigTable-qr-span>span{align-items:center;background:rgba(0,0,0,.7);color:#fff;cursor:pointer;display:none;height:100%;justify-content:center;left:0;position:absolute;top:0;width:100%}.custom-big-table .bigTable-qr-span:hover>span{display:inline-flex}.custom-big-table .base-form{align-items:center;display:flex;overflow:hidden!important;width:100%}.custom-big-table .base-form-content{width:100%}.custom-big-table textarea{height:32px;margin-bottom:0;resize:none}.custom-big-table .formItem-select-multiple{align-items:center;display:flex;line-height:40px;width:100%}.custom-big-table.mt{height:calc(100% - 78px)!important;margin-top:26px}.custom-big-table.expand-padding .vxe-table .vxe-body--expanded-cell{padding-left:66px!important;padding-right:66px!important}.custom-big-table th.vxe-header--column{cursor:pointer}.custom-big-table .row-btn{margin-right:10px}.custom-big-table .vxe-table{transform:translateZ(0)}.custom-big-table .vxe-table .vxe-table--empty-content,.custom-big-table .vxe-table .vxe-table--empty-content>div{height:100%;width:100%}.custom-big-table .vxe-table .vxe-table--empty-content>div .no-data-tip{display:inline-flex}.custom-big-table .vxe-table .col--checkbox .vxe-cell,.custom-big-table .vxe-table .col--seq .vxe-cell{padding:0}.custom-big-table .vxe-table .col--checkbox .vxe-cell .vxe-checkbox--label,.custom-big-table .vxe-table .col--seq .vxe-cell .vxe-checkbox--label{padding-left:0}.custom-big-table .vxe-table .vxe-cell .vxe-tree-cell{height:100%}.custom-big-table .vxe-table .scan-multi-delete{color:#f06f64}.custom-big-table .vxe-table .vxe-table--header{background-color:#f2f2f2}.custom-big-table .vxe-table .vxe-table--header .vxe-header--column .vxe-cell--title{color:#35393c;height:100%;line-height:unset}.custom-big-table .vxe-table .vxe-table--header .vxe-header--column .vxe-cell--title .header-title-span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.custom-big-table .vxe-table .vxe-table--header .col--checkbox .vxe-cell--title,.custom-big-table .vxe-table .vxe-table--header .col--seq .vxe-cell--title{display:inline-block}.custom-big-table .vxe-table .vxe-table--body-wrapper::-webkit-scrollbar,.custom-big-table .vxe-table .vxe-table--footer-wrapper.body--wrapper::-webkit-scrollbar{background-color:transparent;height:10px;width:10px}.custom-big-table .vxe-table .vxe-table--body-wrapper::-webkit-scrollbar-thumb,.custom-big-table .vxe-table .vxe-table--footer-wrapper.body--wrapper::-webkit-scrollbar-thumb{background-clip:padding-box;background-color:#f2f2f2;border:3px dashed transparent;border-radius:0}.custom-big-table .vxe-table .vxe-table--body-wrapper::-webkit-scrollbar-thumb:hover,.custom-big-table .vxe-table .vxe-table--footer-wrapper.body--wrapper::-webkit-scrollbar-thumb:hover{background:#b2b2b2}.custom-big-table .vxe-table .vxe-footer--row .vxe-footer--column>.vxe-cell .vxe-cell--item{height:30px;line-height:30px}.custom-big-table .vxe-table .vxe-cell--checkbox .vxe-checkbox--label{display:none}.custom-big-table .filter-box{align-items:center;display:flex;width:100%}.custom-big-table .filter-box .text-over-tooltip-components{max-width:calc(100% - 40px)}.custom-big-table .filter-box .vxe-filter--btn{border-right-color:#c0c4cc;border-top-color:#c0c4cc}.custom-big-table .filter-box .vxe-filter--btn.active{border-right-color:#35393c;border-top-color:#35393c}.custom-big-table .filter-box .vxe-filter--btn.checked{border-right-color:#5585f5;border-top-color:#5585f5}.custom-big-table .disabled-checked-tips{background:#fff;border:2px solid #ff1818;border-radius:50%;bottom:0;box-sizing:border-box;height:16px;margin-top:-8px;overflow:hidden;position:absolute;right:0;top:50%;width:16px}.custom-big-table .disabled-checked-tips:after{background-color:#ff1818;content:"";height:2px;left:0;position:absolute;top:0;transform:rotate(45deg);transform-origin:0 2px;width:16px}.custom-big-table .form-select-table .n-base-select-menu__empty{display:none}.custom-big-table .percent-wrap{align-items:center;display:flex;flex-direction:column;justify-content:center;text-align:center}.custom-big-table .percent-wrap .percent-value{line-height:1;margin-bottom:-4px;margin-top:4px}.custom-big-table .refresh{align-items:center;background-color:#fff;border-bottom-left-radius:14px;border-top-left-radius:14px;box-shadow:0 2px 4px 0 hsla(0,0%,42%,.13);color:#5585f5;cursor:pointer;display:flex;font-size:12px;height:27px;padding-left:14px;padding-right:14px;position:absolute;right:0;top:6px;z-index:1}.custom-big-table .refresh-row{margin-bottom:0;margin-left:3px}.custom-big-table .check-wrap{background:#ffffe9;display:flex;justify-content:center;line-height:26px;margin-top:-26px;position:absolute;width:100%}.custom-big-table .check-wrap .check-wrap-btn,.custom-big-table .check-wrap .check-wrap-title{color:#000;cursor:pointer;font-size:12px;margin-bottom:0}.custom-big-table .check-wrap .check-wrap-btn{color:#5585f5}.custom-big-table .domPropsInnerHTML-span{height:100%}.custom-big-table .domPropsInnerHTML-span img{display:inline-block;height:var(--table-image-height);width:var(--table-image-width)}.custom-big-table .domPropsInnerHTML-span .icon-dot-custom{background:var(--table-icon-color);border-radius:50%;box-shadow:0 2px 4px 0 var(--table-icon-shadow);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-red{background:red;border-radius:50%;box-shadow:0 2px 4px 0 rgba(255,0,0,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-blue{background:blue;border-radius:50%;box-shadow:0 2px 4px 0 rgba(0,0,255,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-green{background:green;border-radius:50%;box-shadow:0 2px 4px 0 rgba(0,128,0,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-gray{background:gray;border-radius:50%;box-shadow:0 2px 4px 0 hsla(0,0%,50%,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-yellow{background:#ff0;border-radius:50%;box-shadow:0 2px 4px 0 rgba(255,255,0,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-resolved{background:#36be8c;border-radius:50%;box-shadow:0 2px 4px 0 rgba(54,190,140,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-huifu{background:#42d0f6;border-radius:50%;box-shadow:0 2px 4px 0 rgba(66,208,246,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-close{background:#718391;border-radius:50%;box-shadow:0 2px 4px 0 rgba(113,131,145,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-audit{background:#f4ba32;border-radius:50%;box-shadow:0 2px 4px 0 rgba(244,186,50,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-design{background:#927ce1;border-radius:50%;box-shadow:0 2px 4px 0 rgba(146,124,225,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-develop{background:#4eb0ef;border-radius:50%;box-shadow:0 2px 4px 0 rgba(78,176,239,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-develop-complete{background:#6381f9;border-radius:50%;box-shadow:0 2px 4px 0 rgba(99,129,249,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .vxe-table--render-default .vxe-table--fixed-left-wrapper.scrolling--middle{box-shadow:7px 0 8px -3px rgba(0,0,0,.15)}.custom-big-table .vxe-table--render-default .vxe-table--fixed-right-wrapper.scrolling--middle{box-shadow:-7px 0 8px -3px rgba(0,0,0,.15)}.custom-big-table .vxe-table--render-default.size--mini{font-size:14px}.custom-big-table .vxe-table--render-default .vxe-body--expanded-column,.custom-big-table .vxe-table--render-default .vxe-table--border-line{border-color:#d5d5d599}.custom-big-table .vxe-table--render-default .vxe-table--footer-wrapper{border-top-color:#d5d5d599}.custom-big-table .vxe-table--render-default.border--default .vxe-body--column,.custom-big-table .vxe-table--render-default.border--default .vxe-footer--column,.custom-big-table .vxe-table--render-default.border--default .vxe-header--column,.custom-big-table .vxe-table--render-default.border--inner .vxe-body--column,.custom-big-table .vxe-table--render-default.border--inner .vxe-footer--column,.custom-big-table .vxe-table--render-default.border--inner .vxe-header--column{background-image:linear-gradient(#d5d5d599,#d5d5d599)}.custom-big-table .vxe-table--render-default.border--full .vxe-body--column,.custom-big-table .vxe-table--render-default.border--full .vxe-footer--column,.custom-big-table .vxe-table--render-default.border--full .vxe-header--column{background-image:linear-gradient(#d5d5d599,#d5d5d599),linear-gradient(#d5d5d599,#d5d5d599)}.custom-big-table .vxe-table--render-default.border--full .vxe-table--fixed-left-wrapper .vxe-body--column{border-right-color:#d5d5d599}.custom-big-table .vxe-table--render-default.border--default .vxe-table--header-wrapper .vxe-header--row:last-child .vxe-header--gutter,.custom-big-table .vxe-table--render-default.border--full .vxe-table--header-wrapper .vxe-header--row:last-child .vxe-header--gutter,.custom-big-table .vxe-table--render-default.border--inner .vxe-table--header-wrapper .vxe-header--row:last-child .vxe-header--gutter,.custom-big-table .vxe-table--render-default.border--outer .vxe-table--header-wrapper .vxe-header--row:last-child .vxe-header--gutter{background-image:linear-gradient(#d5d5d599,#d5d5d599)}.custom-big-table .vxe-table--render-default.border--default .vxe-table--header-wrapper .vxe-table--header-border-line,.custom-big-table .vxe-table--render-default.border--full .vxe-table--header-wrapper .vxe-table--header-border-line,.custom-big-table .vxe-table--render-default.border--inner .vxe-table--header-wrapper .vxe-table--header-border-line,.custom-big-table .vxe-table--render-default.border--outer .vxe-table--header-wrapper .vxe-table--header-border-line{border-bottom-color:#d5d5d599}.custom-big-table .vxe-table--render-default .vxe-cell--checkbox .vxe-checkbox--icon{color:#d5d5d5;font-weight:400}.annotation-edit{align-items:center;color:#0067ee;cursor:pointer;display:inline-flex;font-size:16px;user-select:none}.annotation-edit.is-active{color:#ff9828}.annotation-edit__icon{align-items:center;display:inline-flex}.no-data-tip{align-items:center;color:#333;display:flex;flex-direction:column;font-size:22px;height:100%;justify-content:center;width:100%}.no-data-tip>img{max-width:70%;width:260px}.no-data-tip>p{color:rgba(0,0,0,.8);font-size:16px;margin-bottom:0;margin-top:12px}.no-data-tip>span{color:rgba(0,0,0,.4);font-size:14px;margin-top:6px}.text-over-tooltip-components{display:inline-block;max-width:98%}.text-over-tooltip-components .ellipsis{color:#35393c;font-size:14px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-over-tooltip-components .ellipsis i{font-style:normal;white-space:nowrap;word-break:keep-all}.text-over-tooltip-components .fs20{color:green;font-size:20px;font-weight:600;line-height:22px}.text-over-tooltip-components .fs12{color:orange;font-size:12px;font-weight:400;line-height:14px}.svg-icon{fill:currentcolor;height:1em;overflow:hidden;vertical-align:-.15em;width:1em}.vxe-header--column [annotation-hover-show=true]{visibility:hidden}.vxe-header--column:hover [annotation-hover-show=true]{visibility:visible}.big-table__annotationWrapper{align-items:center;display:inline-flex;width:20px}.big-table__annotationWrapper .is-active{position:relative;top:3px}.big-table__boldCell{font-weight:700}
+.big-table-filter-wrap{background-color:#fff;border-radius:4px;box-shadow:0 2px 8px rgba(0,0,0,.2);display:flex;flex-flow:column wrap;margin-top:-6px;min-width:280px;overflow:hidden;position:fixed;transform:translateX(-2%);transition:width 2s;z-index:99998}.big-table-filter-wrap .sort-list{margin-top:6px}.big-table-filter-wrap .sort-item{align-items:center;background:#f7f7f7;display:flex;height:32px;padding:0 13px}.big-table-filter-wrap .sort-item.active,.big-table-filter-wrap .sort-item:hover{background:#f2f2f2}.big-table-filter-wrap .sort-icon{background-size:contain;display:inline-block;height:16px;width:16px}.big-table-filter-wrap .sort-text{color:rgba(0,0,0,.8);font-size:14px;line-height:32px;margin-left:11px}.big-table-filter-wrap .sort-icon-desc{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAABT0lEQVRYR+3WvSuGYRTH8c9TykpJSimLMvgHpLyUCQsmg/wBMss/ILvdJgspNnkbZFYGk7JQSAaLwUuX7uFxu3E/nvvqSd3XeHW6zvec65zfORUNPpUG+1cClBnIysABhiMV5y4mqt/OAliPCHCImd8AIgWf/WzMIhzFK/Z/iigWQAtuE4A2PH0HEQugG5eJ005clwBlBmrJwDwGcorBNjYybOsqwit05QQ4R1/RAB3oqQHgoWiAnL5/NKvrC/4tQBNacYesDAR5fkxHV6QU72EQczhNSfE4VpOOmY01jsOyMYYXLGElcbSIZT4W4C1MxQIIUy9sU1ltGXyeYQSfuua7L2jOWYnPKbt2HKE3dR/0Iqx593lq4AT9OQE2MZ2yDTpyXKUlF0lthP3gy8nKwBqGcgLsYCHDNuwAAe4Nk7ipZRbk9F2MWZFt+CeiEuAdAU5CIQxYYdUAAAAASUVORK5CYII=")}.big-table-filter-wrap .filter-header{cursor:auto;padding:5px 13px}.big-table-filter-wrap .filter-header-icon{border-right-color:#333;border-top-color:#333}.big-table-filter-wrap .filter-header-text{margin-left:11px}.big-table-filter-wrap .check-search-wrap{background:#f7f7f7;display:flex;justify-content:center;padding:8px 0;width:100%}.big-table-filter-wrap .check-seach-input{line-height:32px}.big-table-filter-wrap .checkbox-box{padding-right:3px;width:100%}.big-table-filter-wrap .checkbox-wrap{background:#fff;display:flex;flex-direction:column;overflow-y:auto;padding:0 3px 0 13px}.big-table-filter-wrap .checkbox-wrap::-webkit-scrollbar{height:4px;width:4px}.big-table-filter-wrap .checkbox-wrap::-webkit-scrollbar-thumb{background-color:#d5d5d5;border-radius:4px}.big-table-filter-wrap .checkbox-wrap::-webkit-scrollbar-track{background-color:#fff;border-radius:4px}.big-table-filter-wrap .checkbox-wrap::-webkit-scrollbar-corner{background-color:#000;border-radius:4px;width:4px}.big-table-filter-wrap .checkbox-wrap--search{padding-right:10px}.big-table-filter-wrap .checkbox-btn-wrap{display:flex;padding:9px 10px 9px 14px}.big-table-filter-wrap .checkbox-btn-wrap .checkbox-btn{padding:0;width:56px}.big-table-filter-wrap .checkbox-btn-wrap .checkbox-btn+.checkbox-btn{margin-left:8px}.big-table-filter-wrap .checkbox-btn-wrap .checkbox-btn-status .checkbox-btn{border:0;border-radius:0;margin:0 13px;position:relative;width:auto}.big-table-filter-wrap .checkbox-btn-wrap .checkbox-btn-status .checkbox-btn:hover:after{background-color:#5585f5;bottom:5px;content:"";display:block;height:1px;position:absolute;width:100%}.big-table-filter-wrap .arrows-icon{bottom:-1px;cursor:nw-resize;font-size:15px;height:20px;position:absolute;right:-1px;width:25px}.big-table__separate{padding:4px}.big-table__separatePlaceholder{display:inline-block;max-width:0;visibility:hidden;width:0;word-break:keep-all}.custom-big-table{position:relative}.custom-big-table .n-input{width:fit-content}.custom-big-table .img-wrap{align-items:center;display:flex;height:100%;line-height:1;padding:2px 0}.custom-big-table .img-wrap img{cursor:pointer;max-height:100%;object-fit:contain}.custom-big-table .img-wrap.img-circle img{border-radius:50%;object-fit:contain;width:28px}.custom-big-table .bigTable-qr-span{display:inline-block;height:100%;position:relative}.custom-big-table .bigTable-qr-span .bigTable-qr-img{max-height:96%}.custom-big-table .bigTable-qr-span>span{align-items:center;background:rgba(0,0,0,.7);color:#fff;cursor:pointer;display:none;height:100%;justify-content:center;left:0;position:absolute;top:0;width:100%}.custom-big-table .bigTable-qr-span:hover>span{display:inline-flex}.custom-big-table .base-form{align-items:center;display:flex;overflow:hidden!important;width:100%}.custom-big-table .base-form-content{width:100%}.custom-big-table textarea{height:32px;margin-bottom:0;resize:none}.custom-big-table .formItem-select-multiple{align-items:center;display:flex;line-height:40px;width:100%}.custom-big-table.mt{height:calc(100% - 78px)!important;margin-top:26px}.custom-big-table.expand-padding .vxe-table .vxe-body--expanded-cell{padding-left:66px!important;padding-right:66px!important}.custom-big-table th.vxe-header--column{cursor:pointer}.custom-big-table .row-btn{margin-right:10px}.custom-big-table .vxe-table{transform:translateZ(0)}.custom-big-table .vxe-table .vxe-table--empty-content,.custom-big-table .vxe-table .vxe-table--empty-content>div{height:100%;width:100%}.custom-big-table .vxe-table .vxe-table--empty-content>div .no-data-tip{display:inline-flex}.custom-big-table .vxe-table .col--checkbox .vxe-cell,.custom-big-table .vxe-table .col--seq .vxe-cell{padding:0}.custom-big-table .vxe-table .col--checkbox .vxe-cell .vxe-checkbox--label,.custom-big-table .vxe-table .col--seq .vxe-cell .vxe-checkbox--label{padding-left:0}.custom-big-table .vxe-table .vxe-cell .vxe-tree-cell{height:100%}.custom-big-table .vxe-table .scan-multi-delete{color:#f06f64}.custom-big-table .vxe-table .vxe-table--header{background-color:#f2f2f2}.custom-big-table .vxe-table .vxe-table--header .vxe-header--column .vxe-cell--title{color:#35393c;height:100%;line-height:unset}.custom-big-table .vxe-table .vxe-table--header .vxe-header--column .vxe-cell--title .is-edit{margin-top:-3px;vertical-align:middle}.custom-big-table .vxe-table .vxe-table--header .vxe-header--column .vxe-cell--title .header-title-span{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.custom-big-table .vxe-table .vxe-table--header .col--checkbox .vxe-cell--title,.custom-big-table .vxe-table .vxe-table--header .col--seq .vxe-cell--title{display:inline-block}.custom-big-table .vxe-table .vxe-table--body-wrapper::-webkit-scrollbar,.custom-big-table .vxe-table .vxe-table--footer-wrapper.body--wrapper::-webkit-scrollbar{background-color:transparent;height:10px;width:10px}.custom-big-table .vxe-table .vxe-table--body-wrapper::-webkit-scrollbar-thumb,.custom-big-table .vxe-table .vxe-table--footer-wrapper.body--wrapper::-webkit-scrollbar-thumb{background-clip:padding-box;background-color:#f2f2f2;border:3px dashed transparent;border-radius:0}.custom-big-table .vxe-table .vxe-table--body-wrapper::-webkit-scrollbar-thumb:hover,.custom-big-table .vxe-table .vxe-table--footer-wrapper.body--wrapper::-webkit-scrollbar-thumb:hover{background:#b2b2b2}.custom-big-table .vxe-table .vxe-footer--row .vxe-footer--column>.vxe-cell .vxe-cell--item{height:30px;line-height:30px}.custom-big-table .vxe-table .vxe-cell--checkbox .vxe-checkbox--label{display:none}.custom-big-table .filter-box{align-items:center;display:flex;width:100%}.custom-big-table .filter-box .text-over-tooltip-components{max-width:calc(100% - 40px)}.custom-big-table .filter-box .vxe-filter--btn{border-right-color:#c0c4cc;border-top-color:#c0c4cc}.custom-big-table .filter-box .vxe-filter--btn.active{border-right-color:#35393c;border-top-color:#35393c}.custom-big-table .filter-box .vxe-filter--btn.checked{border-right-color:#5585f5;border-top-color:#5585f5}.custom-big-table .disabled-checked-tips{background:#fff;border:2px solid #ff1818;border-radius:50%;bottom:0;box-sizing:border-box;height:16px;margin-top:-8px;overflow:hidden;position:absolute;right:0;top:50%;width:16px}.custom-big-table .disabled-checked-tips:after{background-color:#ff1818;content:"";height:2px;left:0;position:absolute;top:0;transform:rotate(45deg);transform-origin:0 2px;width:16px}.custom-big-table .form-select-table .n-base-select-menu__empty{display:none}.custom-big-table .percent-wrap{align-items:center;display:flex;flex-direction:column;justify-content:center;text-align:center}.custom-big-table .percent-wrap .percent-value{line-height:1;margin-bottom:-4px;margin-top:4px}.custom-big-table .refresh{align-items:center;background-color:#fff;border-bottom-left-radius:14px;border-top-left-radius:14px;box-shadow:0 2px 4px 0 hsla(0,0%,42%,.13);color:#5585f5;cursor:pointer;display:flex;font-size:12px;height:27px;padding-left:14px;padding-right:14px;position:absolute;right:0;top:6px;z-index:1}.custom-big-table .refresh-row{margin-bottom:0;margin-left:3px}.custom-big-table .check-wrap{background:#ffffe9;display:flex;justify-content:center;line-height:26px;margin-top:-26px;position:absolute;width:100%}.custom-big-table .check-wrap .check-wrap-btn,.custom-big-table .check-wrap .check-wrap-title{color:#000;cursor:pointer;font-size:12px;margin-bottom:0}.custom-big-table .check-wrap .check-wrap-btn{color:#5585f5}.custom-big-table .domPropsInnerHTML-span{height:100%}.custom-big-table .domPropsInnerHTML-span img{display:inline-block;height:var(--table-image-height);width:var(--table-image-width)}.custom-big-table .domPropsInnerHTML-span .icon-dot-custom{background:var(--table-icon-color);border-radius:50%;box-shadow:0 2px 4px 0 var(--table-icon-shadow);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-red{background:red;border-radius:50%;box-shadow:0 2px 4px 0 rgba(255,0,0,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-blue{background:blue;border-radius:50%;box-shadow:0 2px 4px 0 rgba(0,0,255,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-green{background:green;border-radius:50%;box-shadow:0 2px 4px 0 rgba(0,128,0,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-gray{background:gray;border-radius:50%;box-shadow:0 2px 4px 0 hsla(0,0%,50%,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-yellow{background:#ff0;border-radius:50%;box-shadow:0 2px 4px 0 rgba(255,255,0,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-resolved{background:#36be8c;border-radius:50%;box-shadow:0 2px 4px 0 rgba(54,190,140,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-huifu{background:#42d0f6;border-radius:50%;box-shadow:0 2px 4px 0 rgba(66,208,246,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-close{background:#718391;border-radius:50%;box-shadow:0 2px 4px 0 rgba(113,131,145,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-audit{background:#f4ba32;border-radius:50%;box-shadow:0 2px 4px 0 rgba(244,186,50,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-design{background:#927ce1;border-radius:50%;box-shadow:0 2px 4px 0 rgba(146,124,225,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-develop{background:#4eb0ef;border-radius:50%;box-shadow:0 2px 4px 0 rgba(78,176,239,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .domPropsInnerHTML-span .icon-dot-develop-complete{background:#6381f9;border-radius:50%;box-shadow:0 2px 4px 0 rgba(99,129,249,.5);display:inline-block;height:8px;margin-right:6px;width:8px}.custom-big-table .vxe-table--render-default .vxe-table--fixed-left-wrapper.scrolling--middle{box-shadow:7px 0 8px -3px rgba(0,0,0,.15)}.custom-big-table .vxe-table--render-default .vxe-table--fixed-right-wrapper.scrolling--middle{box-shadow:-7px 0 8px -3px rgba(0,0,0,.15)}.custom-big-table .vxe-table--render-default.size--mini{font-size:14px}.custom-big-table .vxe-table--render-default .vxe-body--expanded-column,.custom-big-table .vxe-table--render-default .vxe-table--border-line{border-color:#d5d5d599}.custom-big-table .vxe-table--render-default .vxe-table--footer-wrapper{border-top-color:#d5d5d599}.custom-big-table .vxe-table--render-default.border--default .vxe-body--column,.custom-big-table .vxe-table--render-default.border--default .vxe-footer--column,.custom-big-table .vxe-table--render-default.border--default .vxe-header--column,.custom-big-table .vxe-table--render-default.border--inner .vxe-body--column,.custom-big-table .vxe-table--render-default.border--inner .vxe-footer--column,.custom-big-table .vxe-table--render-default.border--inner .vxe-header--column{background-image:linear-gradient(#d5d5d599,#d5d5d599)}.custom-big-table .vxe-table--render-default.border--full .vxe-body--column,.custom-big-table .vxe-table--render-default.border--full .vxe-footer--column,.custom-big-table .vxe-table--render-default.border--full .vxe-header--column{background-image:linear-gradient(#d5d5d599,#d5d5d599),linear-gradient(#d5d5d599,#d5d5d599)}.custom-big-table .vxe-table--render-default.border--full .vxe-table--fixed-left-wrapper .vxe-body--column{border-right-color:#d5d5d599}.custom-big-table .vxe-table--render-default.border--default .vxe-table--header-wrapper .vxe-header--row:last-child .vxe-header--gutter,.custom-big-table .vxe-table--render-default.border--full .vxe-table--header-wrapper .vxe-header--row:last-child .vxe-header--gutter,.custom-big-table .vxe-table--render-default.border--inner .vxe-table--header-wrapper .vxe-header--row:last-child .vxe-header--gutter,.custom-big-table .vxe-table--render-default.border--outer .vxe-table--header-wrapper .vxe-header--row:last-child .vxe-header--gutter{background-image:linear-gradient(#d5d5d599,#d5d5d599)}.custom-big-table .vxe-table--render-default.border--default .vxe-table--header-wrapper .vxe-table--header-border-line,.custom-big-table .vxe-table--render-default.border--full .vxe-table--header-wrapper .vxe-table--header-border-line,.custom-big-table .vxe-table--render-default.border--inner .vxe-table--header-wrapper .vxe-table--header-border-line,.custom-big-table .vxe-table--render-default.border--outer .vxe-table--header-wrapper .vxe-table--header-border-line{border-bottom-color:#d5d5d599}.custom-big-table .vxe-table--render-default .vxe-cell--checkbox .vxe-checkbox--icon{color:#d5d5d5;font-weight:400}.annotation-edit{align-items:center;color:#0067ee;cursor:pointer;display:inline-flex;font-size:16px;user-select:none}.annotation-edit.is-active{color:#ff9828}.annotation-edit__icon{align-items:center;display:inline-flex}.no-data-tip{align-items:center;color:#333;display:flex;flex-direction:column;font-size:22px;height:100%;justify-content:center;width:100%}.no-data-tip>img{max-width:70%;width:260px}.no-data-tip>p{color:rgba(0,0,0,.8);font-size:16px;margin-bottom:0;margin-top:12px}.no-data-tip>span{color:rgba(0,0,0,.4);font-size:14px;margin-top:6px}.text-over-tooltip-components{display:inline-block;max-width:98%}.text-over-tooltip-components .ellipsis{color:#35393c;font-size:14px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-over-tooltip-components .ellipsis i{font-style:normal;white-space:nowrap;word-break:keep-all}.text-over-tooltip-components .fs20{color:green;font-size:20px;font-weight:600;line-height:22px}.text-over-tooltip-components .fs12{color:orange;font-size:12px;font-weight:400;line-height:14px}.svg-icon{fill:currentcolor;height:1em;overflow:hidden;vertical-align:-.15em;width:1em}.vxe-header--column [annotation-hover-show=true]{visibility:hidden}.vxe-header--column:hover [annotation-hover-show=true]{visibility:visible}.big-table__annotationWrapper{align-items:center;display:inline-flex;width:20px}.big-table__annotationWrapper .is-active{position:relative;top:3px}.big-table__boldCell{font-weight:700}

package/es/components/fabric-chart/src/hooks/useCenter.js

@@ -4,7 +4,7 @@ import useGrid from './useGrid.js';
 import { useShadow } from './useShadow.js';
 import { TEMPERATURE_MENU, PAIN_MENU, OVERLAP } from './constant.js';
 import { cloneDeep } from 'lodash-es';
-import { isOneLine, isEffectiveNode, getIndex, deleteProperty } from '../utils/utils.js';
+import { isOneLine, getType, setOtherType, isEffectiveNode, getIndex, deleteProperty } from '../utils/utils.js';
 
 function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, getYValue, addRenderItem, pointTipProps, pointMenuProps, useCommon) {
   useGrid(canvas, propItems);
@@ -201,7 +201,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
                     origin: {
                       title: v.title,
                       unit: v.unit,
-                      type: v.bigType.includes("_other") ? v.bigType.split("_")[0] : v.bigType,
+                      type: getType(v.bigType),
                       dataIndex: v.dataIndex,
                       key: v.key
                     },
@@ -493,7 +493,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
           key: key || "",
           unit: scaleValue.unit,
           type,
-          _type: title.includes("\u5FC3\u7387") ? "pulse_other" : type,
+          _type: setOtherType(title, type),
           dataIndex,
           index
         },

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

@@ -1,6 +1,6 @@
 import { fabric } from '../utils/index.js';
 import { defaultBorderStyle, defaultTextStyle, defaultStyle, defaultRectStyle, drawPoint, drawTextGroup } from './useDraw.js';
-import { isOneLine } from '../utils/utils.js';
+import { getType, isOneLine } from '../utils/utils.js';
 
 function useLeft(canvas, propItems, emits, setPopup, pointTipProps, cumputedX, cumputedY, getXValue, getYValue, isAddPoint, updateData, useCommon) {
   var _a, _b;
@@ -231,7 +231,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, cumputedX, c
         origin: {
           title: item.title,
           unit: item.unit,
-          type: item.bigType.includes("_other") ? item.bigType.split("_")[0] : item.bigType,
+          type: getType(item.bigType),
           _type: item.bigType,
           dataIndex: item.dataIndex,
           key: item.key,
@@ -275,7 +275,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, cumputedX, c
       pointTipProps.show = false;
       if (event.e.button === 0) {
         if (isLimit(point)) {
-          const isRepeat = getEqualXTypes(point.left, "_type", xCellWidth).includes(point.origin.type);
+          const isRepeat = getEqualXTypes(point.left, "_type", xCellWidth).includes(point.origin._type);
           const isLimitAdd = isAddPoint(point.left);
           if (!isLimitAdd || isRepeat) {
             isRepeat && isLimitAdd && repeatTip();

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

@@ -9,6 +9,7 @@ import { useBottom } from './useBottom.js';
 import { useOther } from './useOther.js';
 import { useEvent, useCanvasEvent } from './useEvent.js';
 import '../utils/index.js';
+import { setOtherType } from '../utils/utils.js';
 import { useCommon } from './useCommon.js';
 import 'lodash-es';
 
@@ -156,7 +157,7 @@ function useTemperatureChart(canvas, props, emits, canvasRef) {
       return item.dataList.map((v, dataIndex) => {
         return {
           ...v,
-          bigType: v.title.includes("\u5FC3\u7387") ? "pulse_other" : item.type,
+          bigType: setOtherType(v.title, item.type),
           unit: item.unit,
           dataIndex
         };

package/es/components/fabric-chart/src/utils/utils.d.ts

@@ -9,3 +9,5 @@ export declare function getIndex(time: string, list: AnyObject[]): number;
  * @return {*}
  */
 export declare function isOneLine(type: string): boolean;
+export declare function setOtherType(title: string, type: string): string;
+export declare function getType(type: string): string;

package/es/components/fabric-chart/src/utils/utils.js

@@ -14,5 +14,11 @@ function getIndex(time, list) {
 function isOneLine(type) {
   return ["temperature", "pulse"].includes(type);
 }
+function setOtherType(title, type) {
+  return title.includes("\u5FC3\u7387") ? "pulse_other" : type;
+}
+function getType(type) {
+  return type.includes("_other") ? type.split("_")[0] : type;
+}
 
-export { deleteProperty, getIndex, isEffectiveNode, isOneLine };
+export { deleteProperty, getIndex, getType, isEffectiveNode, isOneLine, setOtherType };

package/es/components/form-config/src/components/FormConfigCreator.vue.js

@@ -16,6 +16,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const linebarField = useConfigurationField().generateFieldListByKeys(null, [
       EditAbleField.NAME,
       EditAbleField.LAYOUT_WIDTH_ENUM,
+      EditAbleField.NOTES,
       EditAbleField.DEFAULT_EXPAND,
       EditAbleField.FOLD
     ]);

package/es/components/form-config/src/hooks/useConfigurationField.js

@@ -60,7 +60,13 @@ function useConfigurationField() {
     const htmlMap = new Map([
       [
         "LINE_BAR",
-        [EditAbleField.NAME, EditAbleField.LAYOUT_WIDTH_ENUM, EditAbleField.DEFAULT_EXPAND, EditAbleField.FOLD]
+        [
+          EditAbleField.NAME,
+          EditAbleField.LAYOUT_WIDTH_ENUM,
+          EditAbleField.NOTES,
+          EditAbleField.DEFAULT_EXPAND,
+          EditAbleField.FOLD
+        ]
       ],
       ...["NEWLINE", "COMPLEX", "COMBINATION"].map(
         (key) => [key, [EditAbleField.NAME, EditAbleField.LAYOUT_WIDTH_ENUM]]

package/es/components/form-render/src/components/renderer/combination.js

@@ -1,4 +1,5 @@
 import { defineComponent, ref, computed, watch, inject, createVNode } from 'vue';
+import { isObjectField } from '@formily/core';
 import { isNumber, isArray } from 'lodash-es';
 import '../../../index.js';
 import { useField, RecursionField, connect } from '@formily/vue';
@@ -55,8 +56,15 @@ const script = defineComponent({
       currentGroupNum.value++;
     }
     async function removeGroup(idx) {
-      currentGroupNum.value--;
-      await field.value.remove(idx);
+      if (currentGroupNum.value > 1) {
+        currentGroupNum.value--;
+        await field.value.remove(idx);
+      } else {
+        const currentField = field.value.query(`${field.value.path.toString()}.${idx}`).take();
+        if (!currentField || !isObjectField(currentField))
+          return;
+        await currentField.reset();
+      }
     }
     const collector = inject(InjectionBusinessCollector);
     const {
@@ -86,7 +94,7 @@ const script = defineComponent({
       }, [createVNode(RecursionField, {
         "schema": createObjSchema(schemaAdaptor(props.getProperties())),
         "name": idx
-      }, null), idx === 0 ? null : createVNode(NButton, {
+      }, null), createVNode(NButton, {
         "text": true,
         "type": "error",
         "class": "form-render__combinationClose",

package/es/components/form-render/src/components/renderer/formItem.d.ts

@@ -1,12 +1,14 @@
 export declare const FORM_ITEM: import("vue").DefineComponent<{
     label: StringConstructor;
     propertyKey: StringConstructor;
+    remark: StringConstructor;
     span: NumberConstructor;
     annotation: {};
     fieldItem: {};
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     label: StringConstructor;
     propertyKey: StringConstructor;
+    remark: StringConstructor;
     span: NumberConstructor;
     annotation: {};
     fieldItem: {};

package/es/components/form-render/src/components/renderer/formItem.js

@@ -1,10 +1,12 @@
 import { defineComponent, inject, computed, createVNode, mergeProps } from 'vue';
+import { widthAppend } from '../../../../../shared/utils/index.js';
 import { isVoidField } from '@formily/core';
 import { useField, connect, mapProps } from '@formily/vue';
 import { isString } from 'lodash-es';
 import { NFormItem } from 'naive-ui';
 import Annotation from '../../../../annotation-edit/index.js';
 import '../../../index.js';
+import TooltipMessage from '../tooltipMessage.vue.js';
 import { InjectionAnnotation, InjectionFormUUID } from '../../constants/index.js';
 import { dotEscape } from '../../utils/schema.js';
 import { validateMessageParser } from '../../utils/index.js';
@@ -13,6 +15,7 @@ const script = defineComponent({
   props: {
     label: String,
     propertyKey: String,
+    remark: String,
     span: Number,
     annotation: {},
     fieldItem: {}
@@ -49,14 +52,27 @@ const script = defineComponent({
     const id = computed(() => {
       return dotEscape(`${uuid}-${field.value.path.toString()}`);
     });
+    const marginRight = computed(() => {
+      let result = 0;
+      showAnnotation.value && (result += 18);
+      props.remark && (result += 18);
+      return result;
+    });
     function renderLabel() {
       return showLabel.value ? createVNode("section", {
         "class": "form-render__formItemLabel"
       }, [createVNode("span", {
-        "class": ["form-render__formItemLabel--text", {
-          "has-annotation": showAnnotation.value
-        }]
-      }, [props.label]), showAnnotation.value ? renderAnnotation() : null]) : null;
+        "class": "form-render__formItemLabel--text",
+        "style": {
+          marginRight: widthAppend(marginRight.value)
+        }
+      }, [props.label]), marginRight.value ? createVNode("section", {
+        "class": "form-render__formItemLabel--operation"
+      }, [props.remark ? createVNode("div", {
+        "class": "form-render__formItemLabel--tooltip"
+      }, [createVNode(TooltipMessage, {
+        "message": props.remark
+      }, null)]) : null, showAnnotation.value ? renderAnnotation() : null]) : null]) : null;
     }
     return () => createVNode(NFormItem, mergeProps({
       "class": "form-render__formItem",

package/es/components/form-render/src/components/renderer/jsonCombination/index.js

@@ -101,8 +101,12 @@ const script = defineComponent({
       emitChange();
     }
     function removeGroup(idx) {
-      combinationData.value.splice(idx, 1);
-      formRenderRefs.value.splice(idx, 1);
+      if (combinationData.value.length > 1) {
+        combinationData.value.splice(idx, 1);
+        formRenderRefs.value.splice(idx, 1);
+      } else {
+        combinationData.value.splice(idx, 1, {});
+      }
       emitChange();
     }
     const maxGroupNum = computed(() => {
@@ -155,7 +159,7 @@ const script = defineComponent({
         "ref": (_ref) => setFormRenderRef(idx, _ref),
         "fieldList": props.getProperties(),
         "onFormChange": (payload) => onChange(idx, payload)
-      }, null), idx === 0 ? null : createVNode(NButton, {
+      }, null), createVNode(NButton, {
         "text": true,
         "class": "form-render__combinationClose",
         "type": "error",

package/es/components/form-render/src/components/renderer/lineBar/FormCollapse.vue.d.ts

@@ -32,11 +32,21 @@ declare const _default: import("vue").DefineComponent<{
     toggleShow: () => void;
     fieldKey: import("vue").ComputedRef<string>;
     formItemDepsCollector: import("../../../../../../../es/components/form-render").FormItemDepsCollector;
+    TooltipMessage: import("vue").DefineComponent<{
+        message: StringConstructor;
+    }, {
+        props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
+            message: StringConstructor;
+        }>> & {}>>;
+        parsedMessages: import("vue").ComputedRef<string[]>;
+        HelpCircleOutline: 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<{}>>, {}>;
+        NTooltip: any;
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        message: StringConstructor;
+    }>>, {}>;
     ChevronDown: 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<{}>>, {}>;
     ChevronUp: 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<{}>>, {}>;
-    HelpCircleOutline: 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<{}>>, {}>;
     NCollapseTransition: any;
-    NTooltip: any;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     show: {
         type: BooleanConstructor;

package/es/components/form-render/src/components/renderer/lineBar/FormCollapse.vue.js

@@ -1,8 +1,9 @@
-import { defineComponent, ref, inject, openBlock, createElementBlock, createElementVNode, createTextVNode, toDisplayString, createBlock, unref, withCtx, createVNode, createCommentVNode, renderSlot } from 'vue';
+import { defineComponent, ref, inject, openBlock, createElementBlock, createElementVNode, createTextVNode, toDisplayString, createBlock, createCommentVNode, unref, createVNode, withCtx, renderSlot } from 'vue';
 import '../../../../index.js';
+import TooltipMessage from '../../tooltipMessage.vue.js';
 import { InjectionFormItemDepsCollector, FormItemLineBarDepKeyPrepend } from '../../../constants/index.js';
-import { HelpCircleOutline, ChevronDown, ChevronUp } from '@vicons/ionicons5';
-import { NTooltip, NCollapseTransition } from 'naive-ui';
+import { ChevronDown, ChevronUp } from '@vicons/ionicons5';
+import { NCollapseTransition } from 'naive-ui';
 import _export_sfc from '../../../../../../_virtual/plugin-vue_export-helper.js';
 import { useFormField } from '../../../hooks/useFormField.js';
 
@@ -40,18 +41,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }, [
           createElementVNode("div", _hoisted_2, [
             createTextVNode(toDisplayString(__props.title) + " ", 1),
-            __props.remark ? (openBlock(), createBlock(unref(NTooltip), {
+            __props.remark ? (openBlock(), createBlock(TooltipMessage, {
               key: 0,
-              trigger: "hover"
-            }, {
-              trigger: withCtx(() => [
-                createVNode(unref(HelpCircleOutline))
-              ]),
-              default: withCtx(() => [
-                createTextVNode(" " + toDisplayString(__props.remark), 1)
-              ]),
-              _: 1
-            })) : createCommentVNode("v-if", true)
+              message: __props.remark
+            }, null, 8, ["message"])) : createCommentVNode("v-if", true)
           ]),
           _show.value ? (openBlock(), createBlock(unref(ChevronDown), { key: 0 })) : (openBlock(), createBlock(unref(ChevronUp), { key: 1 }))
         ]),