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

package/es/components/field-set/src/FieldSet.vue2.js

@@ -1,8 +1,8 @@
-import { createElementVNode, defineComponent, ref, computed, reactive, toRef, watch, openBlock, createElementBlock, createBlock, unref, withKeys, withModifiers, createCommentVNode, Fragment, renderList, normalizeStyle, withCtx, createTextVNode, toDisplayString, createVNode, normalizeClass, mergeProps, renderSlot } from 'vue';
-import { NInput, NCheckbox, NTooltip, NIcon, NPopconfirm, NButton } from 'naive-ui';
+import { createElementVNode, defineComponent, ref, computed, reactive, toRef, watch, openBlock, createElementBlock, createBlock, unref, withKeys, withModifiers, createCommentVNode, Fragment, renderList, normalizeStyle, withCtx, createTextVNode, toDisplayString, resolveDynamicComponent, createVNode, normalizeClass, mergeProps, renderSlot } from 'vue';
+import { NInput, NCheckbox, NTooltip, NIcon, NSelect, NPopconfirm, NButton } from 'naive-ui';
 import draggableComponent from '../../../shared/components/VueDraggable/src/vuedraggable.js';
 import Row from './components/table-row.vue.js';
-import { isArray, cloneDeep, isString, omit } from 'lodash-es';
+import { isFunction, isArray, cloneDeep, isString, omit } from 'lodash-es';
 import { isDisable, setStyle, isDraggableItem, isDraggable, getGroupTree } from './utils/index.js';
 import { uuidGenerator } from '../../../shared/utils/index.js';
 import { HelpCircleSharp } from '@vicons/ionicons5';
@@ -24,6 +24,16 @@ const _hoisted_3 = /* @__PURE__ */ createElementVNode("span", null, function() {
 const _hoisted_4 = ["tabindex"];
 const _hoisted_5 = {
   key: 1,
+  class: "main-wrapper__other-config"
+};
+const _hoisted_6 = {
+  class: "item"
+};
+const _hoisted_7 = /* @__PURE__ */ createElementVNode("span", {
+  class: "label"
+}, "\u8868\u5934\u7EC4\u5408\u6392\u5E8F", -1);
+const _hoisted_8 = {
+  key: 2,
   class: "main-wrapper__table-footer"
 };
 var _sfc_main = /* @__PURE__ */ defineComponent({
@@ -100,6 +110,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     },
     titleAlias: {
       type: String
+    },
+    tableConfig: {
+      type: Object
     }
   },
   emits: [
@@ -111,6 +124,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     expose,
     emit
   }) {
+    var _a;
     const props = __props;
     const fieldsMapping = {
       sid: "id",
@@ -120,16 +134,24 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       isFixed: "fixedWay",
       colWidth: "columnWidth"
     };
+    const TABLESORT_OPTION = [{
+      label: "\u72EC\u7ACB\u6392\u5E8F",
+      value: "SINGLE"
+    }, {
+      label: "\u7EC4\u5408\u6392\u5E8F",
+      value: "MULTIPLE"
+    }];
     const resetKey = ref(Date.now());
     const keyword = ref("");
     const tableBodyRef = ref();
     const tableRef = ref();
     const newFields = ref([]);
+    const compositeSort = ref(((_a = props.tableConfig) == null ? void 0 : _a.sortType) || "SINGLE");
     const defaultColumns = [{
       title: function() {
-        var _a, _b, _c;
+        var _a2, _b, _c;
         try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.247")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.247")) || "\u6240\u6709\u5B57\u6BB5";
+          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.247")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.247")) || "\u6240\u6709\u5B57\u6BB5";
         } catch (e) {
           return "\u6240\u6709\u5B57\u6BB5";
         }
@@ -138,9 +160,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       field: "title"
     }, {
       title: function() {
-        var _a, _b, _c;
+        var _a2, _b, _c;
         try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.240")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.240")) || "\u663E\u793A";
+          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.240")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.240")) || "\u663E\u793A";
         } catch (e) {
           return "\u663E\u793A";
         }
@@ -152,9 +174,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       fieldShowMaxValue: props.fieldShowMaxValue
     }, {
       title: function() {
-        var _a, _b, _c;
+        var _a2, _b, _c;
         try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.284")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.284")) || "\u7F16\u8F91";
+          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.284")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.284")) || "\u7F16\u8F91";
         } catch (e) {
           return "\u7F16\u8F91";
         }
@@ -165,9 +187,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       field: "editable"
     }, {
       title: function() {
-        var _a, _b, _c;
+        var _a2, _b, _c;
         try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.248")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.248")) || "\u5FC5\u586B";
+          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.248")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.248")) || "\u5FC5\u586B";
         } catch (e) {
           return "\u5FC5\u586B";
         }
@@ -178,9 +200,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       field: "required"
     }, {
       title: function() {
-        var _a, _b, _c;
+        var _a2, _b, _c;
         try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.249")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.249")) || "\u6392\u5E8F";
+          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.249")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.249")) || "\u6392\u5E8F";
         } catch (e) {
           return "\u6392\u5E8F";
         }
@@ -191,9 +213,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       field: "sort"
     }, {
       title: function() {
-        var _a, _b, _c;
+        var _a2, _b, _c;
         try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.250")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.250")) || "\u52A0\u7C97";
+          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.250")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.250")) || "\u52A0\u7C97";
         } catch (e) {
           return "\u52A0\u7C97";
         }
@@ -204,9 +226,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       field: "bold"
     }, {
       title: function() {
-        var _a, _b, _c;
+        var _a2, _b, _c;
         try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.251")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.251")) || "\u9ED8\u8BA4\u6392\u5E8F";
+          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.251")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.251")) || "\u9ED8\u8BA4\u6392\u5E8F";
         } catch (e) {
           return "\u9ED8\u8BA4\u6392\u5E8F";
         }
@@ -215,9 +237,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       field: "sortDirection"
     }, {
       title: function() {
-        var _a, _b, _c;
+        var _a2, _b, _c;
         try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.252")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.252")) || "\u6392\u5E8F\u4F18\u5148\u7EA7";
+          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.252")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.252")) || "\u6392\u5E8F\u4F18\u5148\u7EA7";
         } catch (e) {
           return "\u6392\u5E8F\u4F18\u5148\u7EA7";
         }
@@ -226,9 +248,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       field: "sortPriority"
     }, {
       title: function() {
-        var _a, _b, _c;
+        var _a2, _b, _c;
         try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.253")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.253")) || "\u56FA\u5B9A";
+          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.253")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.253")) || "\u56FA\u5B9A";
         } catch (e) {
           return "\u56FA\u5B9A";
         }
@@ -237,9 +259,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       field: "fixedWay"
     }, {
       title: function() {
-        var _a, _b, _c;
+        var _a2, _b, _c;
         try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.254")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.254")) || "\u81EA\u5B9A\u4E49\u6807\u9898";
+          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.254")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.254")) || "\u81EA\u5B9A\u4E49\u6807\u9898";
         } catch (e) {
           return "\u81EA\u5B9A\u4E49\u6807\u9898";
         }
@@ -248,9 +270,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       field: "alias"
     }, {
       title: function() {
-        var _a, _b, _c;
+        var _a2, _b, _c;
         try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.255")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.255")) || "\u5217\u5BBD";
+          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.255")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.255")) || "\u5217\u5BBD";
         } catch (e) {
           return "\u5217\u5BBD";
         }
@@ -259,9 +281,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       field: "columnWidth"
     }, {
       title: function() {
-        var _a, _b, _c;
+        var _a2, _b, _c;
         try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.256")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.256")) || "\u8868\u5934\u7B5B\u9009";
+          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.256")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.256")) || "\u8868\u5934\u7B5B\u9009";
         } catch (e) {
           return "\u8868\u5934\u7B5B\u9009";
         }
@@ -271,9 +293,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       field: "isShowHeaderFilter"
     }, {
       title: function() {
-        var _a, _b, _c;
+        var _a2, _b, _c;
         try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.36")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.36")) || "\u641C\u7D22";
+          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.36")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.36")) || "\u641C\u7D22";
         } catch (e) {
           return "\u641C\u7D22";
         }
@@ -284,9 +306,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       hide: true
     }, {
       title: function() {
-        var _a, _b, _c;
+        var _a2, _b, _c;
         try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.257")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.257")) || "\u6C42\u548C";
+          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.257")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.257")) || "\u6C42\u548C";
         } catch (e) {
           return "\u6C42\u548C";
         }
@@ -297,9 +319,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       hide: true
     }, {
       title: function() {
-        var _a, _b, _c;
+        var _a2, _b, _c;
         try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.258")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.258")) || "\u5E73\u5747\u503C";
+          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.258")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.258")) || "\u5E73\u5747\u503C";
         } catch (e) {
           return "\u5E73\u5747\u503C";
         }
@@ -310,9 +332,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       hide: true
     }, {
       title: function() {
-        var _a, _b, _c;
+        var _a2, _b, _c;
         try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.259")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.259")) || "\u8131\u654F\u914D\u7F6E";
+          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.259")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.259")) || "\u8131\u654F\u914D\u7F6E";
         } catch (e) {
           return "\u8131\u654F\u914D\u7F6E";
         }
@@ -323,11 +345,15 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     }];
     const columns = ref([]);
     const itemWidth = computed(() => {
-      var _a;
-      return ((_a = tableRef.value) == null ? void 0 : _a.scrollWidth) ? tableRef.value.scrollWidth + "px" : "auto";
+      var _a2;
+      return ((_a2 = tableRef.value) == null ? void 0 : _a2.scrollWidth) ? tableRef.value.scrollWidth + "px" : "auto";
     });
     const fieldList = computed(() => newFields.value.flat());
     const hasFieldDescribe = computed(() => fieldList.value.some((item) => item.feildDescribe));
+    const isShowCompositeSort = computed(() => {
+      var _a2;
+      return (_a2 = props.tableConfig) == null ? void 0 : _a2.compositeSort;
+    });
     const rowProps = reactive({
       columns,
       data: fieldList,
@@ -355,17 +381,19 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       emit("close");
     };
     function reset() {
+      var _a2;
       newFields.value = initFields();
       initColumns();
       resetKey.value = Date.now();
+      compositeSort.value = ((_a2 = props.tableConfig) == null ? void 0 : _a2.sortType) || "SINGLE";
       emit("reset");
     }
     function getTitle(column) {
       return column.field === "title" && props.titleAlias ? props.titleAlias : column.title;
     }
     function getShowColumn(column) {
-      var _a, _b;
-      if (!((_a = props.showColumnNames) == null ? void 0 : _a.length)) {
+      var _a2, _b;
+      if (!((_a2 = props.showColumnNames) == null ? void 0 : _a2.length)) {
         const isEdit = ["editable", "required"].includes(column.field);
         if (isEdit && !props.isEdit || column.field === "sortPriority" && !props.showSortPriority || column.field === "isShowHeaderFilter" && !props.showHeadFilter || column.field === "hideExpression" && !((_b = props.hideExpressionConfig) == null ? void 0 : _b.show))
           return false;
@@ -380,7 +408,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }));
       Object.keys(fieldsMapping).forEach((key) => {
         cloneFields.forEach((item) => {
-          var _a;
+          var _a2;
           if (props.type == "old") {
             if (Reflect.has(item, key)) {
               if (key == "isFixed") {
@@ -401,7 +429,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             item.bold = false;
           }
           item.draggable = isDraggable(item) ? true : false;
-          if (isArray((_a = item.relation) == null ? void 0 : _a.fieldList)) {
+          if (isArray((_a2 = item.relation) == null ? void 0 : _a2.fieldList)) {
             item.relation.fieldList.forEach((v) => {
               if (v.isSearch == 1) {
                 v.checked = true;
@@ -459,8 +487,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     function handleSearch() {
       const keywordChanged = searchData.keyword !== keyword.value;
       let idx = !keyword.value ? 0 : fieldList.value.findIndex((field, i) => {
-        var _a;
-        if ((_a = field.title) == null ? void 0 : _a.includes(keyword.value)) {
+        var _a2;
+        if ((_a2 = field.title) == null ? void 0 : _a2.includes(keyword.value)) {
           if (!keywordChanged)
             return i > searchData.idx;
           return true;
@@ -477,8 +505,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       } : {});
     }
     function isHighlight(element) {
-      var _a;
-      return !!keyword.value && ((_a = element.title) == null ? void 0 : _a.includes(keyword.value));
+      var _a2;
+      return !!keyword.value && ((_a2 = element.title) == null ? void 0 : _a2.includes(keyword.value));
     }
     function handleAllCheck(checked, field) {
       fieldList.value.forEach((fieldItem) => {
@@ -495,12 +523,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       column.checkedAll = !noAllCheck;
     }
     function initColumns() {
-      var _a, _b;
+      var _a2, _b;
       columns.value = cloneDeep(defaultColumns);
-      if ((_a = props.showColumnNames) == null ? void 0 : _a.length) {
+      if ((_a2 = props.showColumnNames) == null ? void 0 : _a2.length) {
         columns.value = defaultColumns.filter((column) => {
-          var _a2, _b2;
-          return column.field === "title" || ((_b2 = (_a2 = props.showColumnNames) == null ? void 0 : _a2.includes) == null ? void 0 : _b2.call(_a2, column.field));
+          var _a3, _b2;
+          return column.field === "title" || ((_b2 = (_a3 = props.showColumnNames) == null ? void 0 : _a3.includes) == null ? void 0 : _b2.call(_a3, column.field));
         });
       }
       if ((_b = props.customColumns) == null ? void 0 : _b.length) {
@@ -519,9 +547,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       if (props.fieldDescribeMode === "column" && hasFieldDescribe.value) {
         columns.value.push({
           title: function() {
-            var _a2, _b2, _c;
+            var _a3, _b2, _c;
             try {
-              return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.260")) || ((_c = (_b2 = window.top) == null ? void 0 : _b2.getLanguageByCode) == null ? void 0 : _c.call(_b2, "10010.1.260")) || "\u5B57\u6BB5\u63CF\u8FF0";
+              return ((_a3 = window.getLanguageByCode) == null ? void 0 : _a3.call(window, "10010.1.260")) || ((_c = (_b2 = window.top) == null ? void 0 : _b2.getLanguageByCode) == null ? void 0 : _c.call(_b2, "10010.1.260")) || "\u5B57\u6BB5\u63CF\u8FF0";
             } catch (e) {
               return "\u5B57\u6BB5\u63CF\u8FF0";
             }
@@ -533,9 +561,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       if (props.showSeq) {
         columns.value.splice(1, 0, {
           title: function() {
-            var _a2, _b2, _c;
+            var _a3, _b2, _c;
             try {
-              return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.249")) || ((_c = (_b2 = window.top) == null ? void 0 : _b2.getLanguageByCode) == null ? void 0 : _c.call(_b2, "10010.1.249")) || "\u6392\u5E8F";
+              return ((_a3 = window.getLanguageByCode) == null ? void 0 : _a3.call(window, "10010.1.249")) || ((_c = (_b2 = window.top) == null ? void 0 : _b2.getLanguageByCode) == null ? void 0 : _c.call(_b2, "10010.1.249")) || "\u6392\u5E8F";
             } catch (e) {
               return "\u6392\u5E8F";
             }
@@ -560,9 +588,20 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         return false;
       return true;
     }
+    function getTableConfig() {
+      if (props.tableConfig)
+        return {
+          tableConfig: {
+            ...props.tableConfig,
+            ...isShowCompositeSort.value ? {
+              sortType: compositeSort.value
+            } : {}
+          }
+        };
+    }
     watch([() => props.fields, () => {
-      var _a;
-      return (_a = props.showColumnNames) == null ? void 0 : _a.length;
+      var _a2;
+      return (_a2 = props.showColumnNames) == null ? void 0 : _a2.length;
     }], ([fields, showColumnNames]) => {
       if (fields.length > 0) {
         newFields.value = initFields();
@@ -573,7 +612,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       deep: true
     });
     expose({
-      getTableFields
+      getTableFields,
+      getTableConfig
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1, [__props.showSearch ? (openBlock(), createBlock(unref(NInput), {
@@ -585,9 +625,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           trim: true
         },
         placeholder: function() {
-          var _a, _b, _c;
+          var _a2, _b, _c;
           try {
-            return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.245")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.245")) || "\u8BF7\u8F93\u5165\u5B57\u6BB5\u6807\u9898";
+            return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.245")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.245")) || "\u8BF7\u8F93\u5165\u5B57\u6BB5\u6807\u9898";
           } catch (e) {
             return "\u8BF7\u8F93\u5165\u5B57\u6BB5\u6807\u9898";
           }
@@ -612,10 +652,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         }, {
           default: withCtx(() => [createTextVNode(toDisplayString(column.title), 1)]),
           _: 2
-        }, 1032, ["checked", "onUpdate:checked", "disabled"])) : (openBlock(), createElementBlock(Fragment, {
+        }, 1032, ["checked", "onUpdate:checked", "disabled"])) : unref(isFunction)(column.titleRender) ? (openBlock(), createBlock(resolveDynamicComponent(() => column.titleRender(column)), {
           key: 1
+        })) : (openBlock(), createElementBlock(Fragment, {
+          key: 2
         }, [createTextVNode(toDisplayString(getTitle(column)), 1)], 64)), column.field === "sortPriority" ? (openBlock(), createBlock(unref(NTooltip), {
-          key: 2,
+          key: 3,
           trigger: "hover"
         }, {
           trigger: withCtx(() => [createVNode(unref(NIcon), {
@@ -669,7 +711,14 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           "is-highlight": isHighlight(element)
         }), null, 16, ["element", "idx", "is-highlight"]))], 14, _hoisted_4)) : createCommentVNode("v-if", true)]),
         _: 1
-      }, 8, ["modelValue", "disabled"]))], 512)], 512), __props.footerFlag ? (openBlock(), createElementBlock("div", _hoisted_5, [createCommentVNode(" \u5E95\u90E8\u6309\u94AE\u63D2\u69FD "), renderSlot(_ctx.$slots, "footer", {}, () => [createVNode(unref(NPopconfirm), {
+      }, 8, ["modelValue", "disabled"]))], 512)], 512), unref(isShowCompositeSort) ? (openBlock(), createElementBlock("div", _hoisted_5, [createElementVNode("div", _hoisted_6, [_hoisted_7, createVNode(unref(NSelect), {
+        style: {
+          "width": "200px"
+        },
+        value: compositeSort.value,
+        "onUpdate:value": _cache[2] || (_cache[2] = ($event) => compositeSort.value = $event),
+        options: TABLESORT_OPTION
+      }, null, 8, ["value"])])])) : createCommentVNode("v-if", true), __props.footerFlag ? (openBlock(), createElementBlock("div", _hoisted_8, [createCommentVNode(" \u5E95\u90E8\u6309\u94AE\u63D2\u69FD "), renderSlot(_ctx.$slots, "footer", {}, () => [createVNode(unref(NPopconfirm), {
         onPositiveClick: reset
       }, {
         trigger: withCtx(() => [createVNode(unref(NButton), {
@@ -678,9 +727,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           }
         }, {
           default: withCtx(() => [createTextVNode(function() {
-            var _a, _b, _c;
+            var _a2, _b, _c;
             try {
-              return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.242")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.242")) || "\u6062\u590D\u9ED8\u8BA4\u8BBE\u7F6E";
+              return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.242")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.242")) || "\u6062\u590D\u9ED8\u8BA4\u8BBE\u7F6E";
             } catch (e) {
               return "\u6062\u590D\u9ED8\u8BA4\u8BBE\u7F6E";
             }
@@ -688,9 +737,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           _: 1
         })]),
         default: withCtx(() => [createTextVNode(function() {
-          var _a, _b, _c;
+          var _a2, _b, _c;
           try {
-            return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.243")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.243")) || "\u786E\u8BA4\u8981\u6062\u590D\u7CFB\u7EDF\u9ED8\u8BA4\u8BBE\u7F6E\u5417\uFF1F";
+            return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.243")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.243")) || "\u786E\u8BA4\u8981\u6062\u590D\u7CFB\u7EDF\u9ED8\u8BA4\u8BBE\u7F6E\u5417\uFF1F";
           } catch (e) {
             return "\u786E\u8BA4\u8981\u6062\u590D\u7CFB\u7EDF\u9ED8\u8BA4\u8BBE\u7F6E\u5417\uFF1F";
           }
@@ -703,9 +752,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         onClick: onCancle
       }, {
         default: withCtx(() => [createTextVNode(function() {
-          var _a, _b, _c;
+          var _a2, _b, _c;
           try {
-            return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.28")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.28")) || "\u53D6\u6D88";
+            return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.28")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.28")) || "\u53D6\u6D88";
           } catch (e) {
             return "\u53D6\u6D88";
           }
@@ -716,9 +765,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         onClick: handleFieldSave
       }, {
         default: withCtx(() => [createTextVNode(function() {
-          var _a, _b, _c;
+          var _a2, _b, _c;
           try {
-            return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.244")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.244")) || "\u4FDD\u5B58";
+            return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.244")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.244")) || "\u4FDD\u5B58";
           } catch (e) {
             return "\u4FDD\u5B58";
           }

package/es/components/field-set/src/Index.vue2.js

@@ -144,13 +144,14 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       return list.filter((tabItem) => props.showTabNames.includes(tabItem.name));
     });
     function onSave() {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c, _d, _e, _f;
       emit("save", {
         tableFields: (_a = setRefs["field"]) == null ? void 0 : _a.getTableFields(),
         tableFieldColors: (_b = setRefs["fieldColor"]) == null ? void 0 : _b.getTableFields(),
         tableHighlightRows: (_c = setRefs["highlightRow"]) == null ? void 0 : _c.getTableFields(),
         tableStyle: (_d = setRefs["tableStyle"]) == null ? void 0 : _d.getTableFields(),
-        tableFilters: (_e = setRefs["fieldFilter"]) == null ? void 0 : _e.getTableFields()
+        tableFilters: (_e = setRefs["fieldFilter"]) == null ? void 0 : _e.getTableFields(),
+        ...(_f = setRefs["field"]) == null ? void 0 : _f.getTableConfig()
       });
     }
     function setRef(e, id) {
@@ -161,7 +162,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       return (_a = setRefs[type || "field"]) == null ? void 0 : _a.getTableFields();
     }
     expose({
-      getTableFields
+      getTableFields,
+      getTableConfig() {
+        var _a, _b;
+        return (_b = (_a = setRefs["field"]) == null ? void 0 : _a.getTableConfig()) == null ? void 0 : _b.tableConfig;
+      }
     });
     return (_ctx, _cache) => {
       return unref(dataLength) > 0 ? (openBlock(), createElementBlock("div", {

package/es/components/field-set/src/TableStyle.vue2.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, reactive, watch, openBlock, createElementBlock, createElementVNode, createVNode, unref, Fragment, renderList, toDisplayString, normalizeClass, withDirectives, vShow, withCtx, createTextVNode } from 'vue';
+import { defineComponent, ref, reactive, watch, openBlock, createElementBlock, createElementVNode, createVNode, unref, Fragment, renderList, toDisplayString, normalizeClass, withDirectives, vShow, withCtx, createTextVNode, toRaw } from 'vue';
 import { NSwitch, NIcon, NButton } from 'naive-ui';
 import { CheckmarkCircle } from '@vicons/ionicons5';
 import style1 from '../../../shared/assets/img/table_style_1.png.js';
@@ -112,7 +112,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       emit("save");
     }
     function getTableFields() {
-      return tableStyle;
+      return toRaw(tableStyle);
     }
     watch(() => props.tableStyleConfig, (config) => {
       const {

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

@@ -205,12 +205,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;

package/es/components/field-set/src/components/table-row.vue2.js

@@ -1,4 +1,4 @@
-import { createElementVNode, defineComponent, openBlock, createElementBlock, Fragment, renderList, normalizeStyle, unref, createBlock, withCtx, createVNode, createCommentVNode, toDisplayString, resolveDynamicComponent, normalizeClass, withDirectives, vShow, mergeProps, createTextVNode } from 'vue';
+import { createElementVNode, defineComponent, openBlock, createElementBlock, Fragment, renderList, normalizeStyle, unref, createBlock, withCtx, createVNode, createCommentVNode, toDisplayString, resolveDynamicComponent, normalizeClass, withDirectives, vShow, mergeProps, createTextVNode, toRaw } from 'vue';
 import { NTooltip, NIcon, NCheckbox, NPopover, NSpace, NSelect, NColorPicker, NInput, NInputNumber, NButton, NPopconfirm } from 'naive-ui';
 import { setStyle, setColorInfo, isShowExplicitRequired, isDisable } from '../utils/index.js';
 import { ReorderTwoOutline, HelpCircleOutline, CaretDownOutline, EyeOutline, CopyOutline, CreateOutline, TrashOutline } from '@vicons/ionicons5';
@@ -179,6 +179,14 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         ...param
       });
     }
+    function prevFunc(column) {
+      const {
+        showPrevFn
+      } = column;
+      if (isFunction(showPrevFn))
+        return showPrevFn(toRaw(column), toRaw(props.element));
+      return true;
+    }
     function isRenderTooltip(field) {
       var _a;
       return field === "title" && (props.fieldDescribeMode === "tooltip" && props.element.feildDescribe || props.developMode && ((_a = props.element.settingObj) == null ? void 0 : _a.fieldDescDev));
@@ -215,7 +223,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         return false;
       return true;
     }
-    function isShow(field) {
+    function isShow(column) {
+      const {
+        field
+      } = column;
       if (["explicitRequired", "defaultValue"].includes(field))
         return isShowExplicitRequired(props.element);
       if (["isSum", "isAvg"].includes(field))
@@ -327,6 +338,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           }
         }
         default:
+          if (isArray(column == null ? void 0 : column.options))
+            return column.options;
           return [];
       }
     }
@@ -392,6 +405,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           class: "table-cell",
           title: __props.element[column.field],
           style: normalizeStyle(unref(setStyle)(column, index, __props.columnWidthProps))
+        }, [prevFunc(column) ? (openBlock(), createElementBlock(Fragment, {
+          key: 0
         }, [column.type === "text" ? (openBlock(), createElementBlock(Fragment, {
           key: 0
         }, [index === 0 ? (openBlock(), createElementBlock(Fragment, {
@@ -434,7 +449,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           disabled: setDisabled(column),
           checked: __props.element[column.field],
           "onUpdate:checked": [($event) => __props.element[column.field] = $event, (checked) => onUpdateChecked(checked, column)]
-        }, null, 8, ["disabled", "checked", "onUpdate:checked"]), [[vShow, isShow(column.field)]]), showRelation(column.field) ? (openBlock(), createBlock(unref(NPopover), {
+        }, null, 8, ["disabled", "checked", "onUpdate:checked"]), [[vShow, isShow(column)]]), showRelation(column.field) ? (openBlock(), createBlock(unref(NPopover), {
           key: 0,
           placement: "right-start",
           "show-arrow": false
@@ -474,7 +489,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           value: __props.element._defaultValue,
           "onUpdate:value": [_cache[0] || (_cache[0] = ($event) => __props.element._defaultValue = $event), (value) => handleUpdateSelect(value, column)],
           options: getOptions(column)
-        }), null, 16, ["multiple", "disabled", "value", "options", "onUpdate:value"])), [[vShow, isShow(column.field)]]) : withDirectives((openBlock(), createBlock(unref(NSelect), mergeProps({
+        }), null, 16, ["multiple", "disabled", "value", "options", "onUpdate:value"])), [[vShow, isShow(column)]]) : withDirectives((openBlock(), createBlock(unref(NSelect), mergeProps({
           key: 1
         }, selectProps(column.field), {
           clearable: "",
@@ -483,7 +498,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           value: __props.element[column.field],
           "onUpdate:value": [($event) => __props.element[column.field] = $event, (value) => handleUpdateSelect(value, column)],
           options: getOptions(column)
-        }), null, 16, ["multiple", "disabled", "value", "onUpdate:value", "options"])), [[vShow, isShow(column.field)]])], 64))], 64)) : createCommentVNode("v-if", true), column.type === "color" ? (openBlock(), createBlock(unref(NColorPicker), {
+        }), null, 16, ["multiple", "disabled", "value", "onUpdate:value", "options"])), [[vShow, isShow(column)]])], 64))], 64)) : createCommentVNode("v-if", true), column.type === "color" ? (openBlock(), createBlock(unref(NColorPicker), {
           key: 3,
           class: "c-field-set__color-picker",
           clearable: "",
@@ -604,7 +619,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             }
           }())]),
           _: 1
-        })], 64))], 64)) : createCommentVNode("v-if", true)], 12, _hoisted_2)) : createCommentVNode("v-if", true)], 64);
+        })], 64))], 64)) : createCommentVNode("v-if", true)], 64)) : createCommentVNode("v-if", true)], 12, _hoisted_2)) : createCommentVNode("v-if", true)], 64);
       }), 128))]);
     };
   }

package/es/components/field-set/src/constants/index.d.ts

@@ -45,7 +45,7 @@ export declare const COLOR_MAP: Readonly<{
     '#C163FF': "紫色";
     '#DB0000': "红色";
 }>;
-export declare const InjectionFieldList: InjectionKey<AnyObject[]>;
+export declare const InjectionFieldList: InjectionKey<AnyObject[] | undefined>;
 type WordbookOption = {
     label: string;
     value: string;