sun-biz 0.0.3-beta.26 → 0.0.3-beta.27

package/dist/components/index.js

@@ -265,8 +265,8 @@ const copy_text_with_tooltip_exports_ = /*#__PURE__*/ (0, exportHelper["default"
  * @returns {String}
  * */ function formatValue(callValue) {
     // 如果当前值为数组，使用 / 拼接（根据需求自定义）
-    if (isArray(callValue)) return callValue.length ? callValue.join(" / ") : "--";
-    return callValue ?? "--";
+    if (isArray(callValue)) return callValue.length ? callValue.join(' / ') : '--';
+    return callValue ?? '--';
 }
 /**
  * @description 处理 prop 为多级嵌套的情况，返回的数据 (列如: prop: user.name)
@@ -274,8 +274,8 @@ const copy_text_with_tooltip_exports_ = /*#__PURE__*/ (0, exportHelper["default"
  * @param {String} prop 当前 prop
  * @returns {*}
  * */ function handleRowAccordingToProp(row, prop) {
-    if (!prop?.includes(".")) return row[prop] ?? "--";
-    prop.split(".").forEach((item)=>row = row[item] ?? "--");
+    if (!prop?.includes('.')) return row[prop] ?? '--';
+    prop.split('.').forEach((item)=>row = row[item] ?? '--');
     return row;
 }
 /**
@@ -283,7 +283,7 @@ const copy_text_with_tooltip_exports_ = /*#__PURE__*/ (0, exportHelper["default"
  * @param {String} prop 当前 prop
  * @returns {String}
  * */ function handleProp(prop) {
-    const propArr = prop.split(".");
+    const propArr = prop.split('.');
     if (1 == propArr.length) return prop;
     return propArr[propArr.length - 1];
 }
@@ -304,15 +304,54 @@ const copy_text_with_tooltip_exports_ = /*#__PURE__*/ (0, exportHelper["default"
  * @param {String} type 过滤类型（目前只有 tag）
  * @returns {String}
  * */ function filterEnum(callValue, enumData, fieldNames, type) {
-    const value = fieldNames?.value ?? "value";
-    const label = fieldNames?.label ?? "label";
-    const children = fieldNames?.children ?? "children";
+    const value = fieldNames?.value ?? 'value';
+    const label = fieldNames?.label ?? 'label';
+    const children = fieldNames?.children ?? 'children';
     let filterData = {};
     // 判断 enumData 是否为数组
     if (Array.isArray(enumData)) filterData = findItemNested(enumData, callValue, value, children);
     // 判断是否输出的结果为 tag 类型
-    if ("tag" == type) return filterData?.tagType ? filterData.tagType : "";
-    return filterData ? filterData[label] : "--";
+    if ('tag' == type) return filterData?.tagType ? filterData.tagType : '';
+    return filterData ? filterData[label] : '--';
+}
+const ASCENDING = 'ascending';
+const DESCENDING = 'descending';
+/**
+ * 多字段排序（支持字符串、数字、日期）
+ * @param data 要排序的数组
+ * @param fields 排序字段数组（按优先级从高到低）
+ */ function multiFieldSort(data, fields) {
+    // 判断是否是日期格式字符串
+    function isDateLike(val) {
+        return 'string' == typeof val && /^\d{4}[-/]\d{2}[-/]\d{2}/.test(val);
+    }
+    // 判断 null 或 undefined
+    function isNullish(val) {
+        return null == val;
+    }
+    return [
+        ...data
+    ].sort((a, b)=>{
+        for (const { fieldName, ascendFlag, type = 'auto' } of fields){
+            const valA = a[fieldName];
+            const valB = b[fieldName];
+            if (isNullish(valA) && !isNullish(valB)) return ascendFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES ? 1 : -1;
+            if (!isNullish(valA) && isNullish(valB)) return ascendFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES ? -1 : 1;
+            if (isNullish(valA) && isNullish(valB)) continue;
+            let parsedA = valA;
+            let parsedB = valB;
+            const shouldParseDate = 'date' === type || 'auto' === type && isDateLike(valA) && isDateLike(valB);
+            if (shouldParseDate) {
+                parsedA = new Date(valA).getTime();
+                parsedB = new Date(valB).getTime();
+            }
+            if ('string' == typeof parsedA && 'string' == typeof parsedB) {
+                const cmp = parsedA.toLowerCase().localeCompare(parsedB.toLowerCase());
+                if (0 !== cmp) return ascendFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES ? cmp : -cmp;
+            } else if (parsedA !== parsedB) return ascendFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES ? parsedA - parsedB : parsedB - parsedA;
+        }
+        return 0;
+    });
 }
 function _isSlot(s) {
     return 'function' == typeof s || '[object Object]' === Object.prototype.toString.call(s) && !(0, __WEBPACK_EXTERNAL_MODULE_vue__.isVNode)(s);
@@ -326,11 +365,13 @@ const TableColumn = (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
         }
     },
     setup (props, { slots }) {
-        const enumMap = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('enumMap', (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(new Map())); // 渲染表格数据
+        const enumMap = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('enumMap', (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(new Map())); // 注入数据（带默认值）
+        const hiddenDefaultText = (0, __WEBPACK_EXTERNAL_MODULE_vue__.inject)('hiddenDefaultText'); // 渲染表格数据
         const renderCellData = (item, scope)=>{
             const rawValue = handleRowAccordingToProp(scope.row, item.prop);
             let result = enumMap.value.get(item.prop) && item.isFilterEnum ? filterEnum(rawValue, enumMap.value.get(item.prop), item.fieldNames) : formatValue(rawValue);
             if (item?.autoFormatterNumber) result = formatDecimalNumber(result) ?? '--';
+            if (hiddenDefaultText && '--' === result) result = ' ';
             return item?.supportCopyAndTips ? (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(copy_text_with_tooltip, {
                 supportTextCopy: item?.supportTextCopy,
                 align: "text-center",
@@ -535,7 +576,37 @@ function useTableConfigColumn(changeInputSort, length, disabledDraggable) {
         {
             label: '列名称',
             prop: 'label',
-            minWidth: 170
+            minWidth: 170,
+            render: (row)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)("div", {
+                    class: 'cursor-pointer',
+                    onClick: (event)=>{
+                        event.stopPropagation();
+                        switch(row.ascendFlag){
+                            case __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES:
+                                row.ascendFlag = __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.NO;
+                                break;
+                            case __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.NO:
+                                row.ascendFlag = __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.ALL;
+                                break;
+                            default:
+                                row.ascendFlag = __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES;
+                        }
+                    }
+                }, [
+                    row.label,
+                    row.sortable && (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)("span", {
+                        class: "caret-wrapper"
+                    }, [
+                        (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)("i", {
+                            class: `sort-caret ascending ${row.ascendFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES ? '!border-b-blue-500' : ''}`
+                        }, null),
+                        (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)("i", {
+                            class: `sort-caret descending ${row.ascendFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.NO ? '!border-t-blue-500' : ''}`
+                        }, null)
+                    ])
+                ], 8, [
+                    "onClick"
+                ])
         },
         {
             label: '属性',
@@ -667,6 +738,271 @@ const DbgridTableConfig_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Db
     ]
 ]);
 /* ESM default export */ const DbgridTableConfig = DbgridTableConfig_exports_;
+const _hoisted_1 = {
+    key: 0
+};
+const _hoisted_2 = {
+    class: "mb-2 flex items-center"
+};
+const _hoisted_3 = {
+    class: "flex justify-end",
+    style: {
+        "justify-content": "end"
+    }
+};
+/* ESM default export */ const AdvancedSortvue_type_script_setup_true_lang_tsx = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
+    __name: 'AdvancedSort',
+    props: {
+        data: {},
+        changeSourceData: {
+            type: Function
+        }
+    },
+    setup (__props) {
+        const props = __props;
+        const isSHow = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(false);
+        const popoverRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
+        function show() {
+            isSHow.value = true;
+        }
+        function hide() {
+            isSHow.value = false;
+        }
+        function confirm() {
+            popoverRef.value.hide();
+        }
+        function deleteCondition(name) {
+            let result = [
+                ...props.data
+            ];
+            result = result.map((item)=>{
+                if (item.prop === name) return {
+                    ...item,
+                    ascendFlag: __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.ALL
+                };
+                return item;
+            });
+            props.changeSourceData(result);
+        }
+        function changeInputSort(flag, sort) {
+            let data = [
+                ...tableData.value
+            ];
+            let findObj = data.find((item, index)=>index == flag);
+            data.splice(flag, 1);
+            data.splice(sort - 1, 0, findObj);
+            data = data.map((item, index)=>({
+                    ...item,
+                    ascendSort: index + 1
+                }));
+            let result = [
+                ...props.data
+            ];
+            result = result.map((item)=>{
+                let findObj = data.find((cur)=>cur.prop === item.prop);
+                if (findObj) return {
+                    ...item,
+                    ascendSort: findObj.ascendSort
+                };
+                return {
+                    ...item
+                };
+            });
+            props.changeSourceData(result);
+        }
+        const changeSort = (0, __WEBPACK_EXTERNAL_MODULE__sun_toolkit_shared__.debounce)(changeInputSort, 1200);
+        function handleSortEnd() {}
+        const columns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>getColumn());
+        const tableData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
+            let result = props.data.filter((item)=>item.sortable);
+            result.sort((a, b)=>(a?.ascendSort || 0) - (b?.ascendSort || 0));
+            result = result.map((item, index)=>{
+                item.ascendSort = index + 1;
+                return item;
+            });
+            return result;
+        });
+        function changeAscendFlag(name, value, ascendSort) {
+            let result = [
+                ...props.data
+            ];
+            result = result.map((item)=>{
+                if (item.prop === name) return {
+                    ...item,
+                    ascendFlag: value,
+                    ascendSort
+                };
+                return item;
+            });
+            props.changeSourceData(result);
+        }
+        function getColumn() {
+            return [
+                {
+                    label: '名称',
+                    prop: 'label',
+                    minWidth: 170
+                },
+                {
+                    label: '排序规则',
+                    prop: 'ascendFlag',
+                    minWidth: 170,
+                    editable: true,
+                    render: (row)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElRadioGroup, {
+                            size: 'small',
+                            modelValue: row.ascendFlag,
+                            'onUpdate:modelValue': (value)=>{
+                                changeAscendFlag(row.prop, value, row.ascendSort);
+                            }
+                        }, ()=>[
+                                (0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElRadioButton, {
+                                    label: '正序',
+                                    value: __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES
+                                }),
+                                (0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElRadioButton, {
+                                    label: '倒序',
+                                    value: __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.NO
+                                }),
+                                (0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElRadioButton, {
+                                    label: '不排序',
+                                    value: __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.ALL
+                                })
+                            ])
+                },
+                {
+                    label: '优先级',
+                    prop: 'displayFlag',
+                    minWidth: 170,
+                    editable: true,
+                    render: (row, index)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElInputNumber, {
+                            controls: false,
+                            placeholder: '请输入优先级',
+                            min: 1,
+                            max: tableData.value.length,
+                            modelValue: row.ascendSort,
+                            'onUpdate:modelValue': (value)=>{
+                                row.ascendSort = value;
+                                changeSort(index, value);
+                            },
+                            onInput: (value)=>{
+                                changeSort(index, value);
+                            }
+                        })
+                }
+            ];
+        }
+        return (_ctx, _cache)=>{
+            const _component_CaretTop = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("CaretTop");
+            const _component_el_icon = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-icon");
+            const _component_CaretBottom = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("CaretBottom");
+            const _component_el_tag = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-tag");
+            const _component_el_button = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-button");
+            const _component_el_popover = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-popover");
+            return (0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)(_component_el_popover, {
+                trigger: "click",
+                width: "600",
+                ref_key: "popoverRef",
+                ref: popoverRef,
+                onShow: show,
+                onHide: hide,
+                icon: (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE__element_sun_icons_vue__.InfoFilled),
+                "icon-color": "#626AEF"
+            }, {
+                reference: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
+                        (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(_component_el_button, null, {
+                            default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
+                                    _cache[0] || (_cache[0] = (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)("组合排序 ")),
+                                    isSHow.value ? (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true) : ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("span", _hoisted_1, [
+                                        ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(true), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, null, (0, __WEBPACK_EXTERNAL_MODULE_vue__.renderList)(tableData.value.filter((item)=>item?.ascendFlag === (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG).NO || item?.ascendFlag === (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG).YES), (item)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)(_component_el_tag, {
+                                                hit: false,
+                                                key: item.prop,
+                                                class: "ml-2",
+                                                effect: "plain",
+                                                onClose: ()=>{
+                                                    deleteCondition(item.prop);
+                                                },
+                                                closable: "",
+                                                type: "info"
+                                            }, {
+                                                default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
+                                                        (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.toDisplayString)(item.label) + " ", 1),
+                                                        item?.ascendFlag === (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG).YES ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)(_component_el_icon, {
+                                                            key: 0,
+                                                            class: "text-blue-500"
+                                                        }, {
+                                                            default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
+                                                                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(_component_CaretTop)
+                                                                ]),
+                                                            _: 1
+                                                        })) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true),
+                                                        item?.ascendFlag === (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG).NO ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)(_component_el_icon, {
+                                                            key: 1,
+                                                            class: "text-blue-500"
+                                                        }, {
+                                                            default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
+                                                                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(_component_CaretBottom)
+                                                                ]),
+                                                            _: 1
+                                                        })) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true)
+                                                    ]),
+                                                _: 2
+                                            }, 1032, [
+                                                "onClose"
+                                            ]))), 128))
+                                    ]))
+                                ]),
+                            _: 1
+                        })
+                    ]),
+                default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
+                        (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementVNode)("div", _hoisted_2, [
+                            (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(_component_el_icon, {
+                                style: {
+                                    color: "#0000ffa6"
+                                },
+                                class: "mr-2"
+                            }, {
+                                default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
+                                        (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE__element_sun_icons_vue__.InfoFilled))
+                                    ]),
+                                _: 1
+                            }),
+                            _cache[1] || (_cache[1] = (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)("请根据以下规则编辑排序条件 "))
+                        ]),
+                        (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(pro_table, {
+                            onDragEnd: handleSortEnd,
+                            ref: "tableRef",
+                            "drag-tips": "",
+                            class: "mb-2",
+                            draggable: true,
+                            "row-key": "prop",
+                            columns: columns.value,
+                            data: tableData.value
+                        }, null, 8, [
+                            "columns",
+                            "data"
+                        ]),
+                        (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementVNode)("div", _hoisted_3, [
+                            (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(_component_el_button, {
+                                size: "small",
+                                onClick: confirm
+                            }, {
+                                default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>_cache[2] || (_cache[2] = [
+                                        (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)(" 关闭 ")
+                                    ])),
+                                _: 1
+                            })
+                        ])
+                    ]),
+                _: 1
+            }, 8, [
+                "icon"
+            ]);
+        };
+    }
+});
+const AdvancedSort_exports_ = AdvancedSortvue_type_script_setup_true_lang_tsx;
+/* ESM default export */ const AdvancedSort = AdvancedSort_exports_;
 /**
  * 获取主应用配置信息
  */ var use_app_config_MAIN_APP_CONFIG = /*#__PURE__*/ function(MAIN_APP_CONFIG) {
@@ -735,10 +1071,10 @@ function useDialog(initialVisible = false) {
         closeLoading
     };
 }
-const _hoisted_1 = {
+const pro_dialogvue_type_script_setup_true_lang_ts_name_ProDialog_hoisted_1 = {
     class: "flex w-full items-center justify-between"
 };
-const _hoisted_2 = {
+const pro_dialogvue_type_script_setup_true_lang_ts_name_ProDialog_hoisted_2 = {
     key: 0,
     class: "dialog-footer"
 };
@@ -843,7 +1179,7 @@ const _hoisted_2 = {
                     onClose: justCloseDialog
                 }), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createSlots)({
                     header: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(({ titleClass })=>[
-                            (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementVNode)("div", _hoisted_1, [
+                            (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementVNode)("div", pro_dialogvue_type_script_setup_true_lang_ts_name_ProDialog_hoisted_1, [
                                 _ctx.$slots.header ? (0, __WEBPACK_EXTERNAL_MODULE_vue__.renderSlot)(_ctx.$slots, "header", {
                                     key: 0,
                                     titleClass: titleClass
@@ -885,7 +1221,7 @@ const _hoisted_2 = {
                         fn: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
                                 _ctx.$slots.footer ? (0, __WEBPACK_EXTERNAL_MODULE_vue__.renderSlot)(_ctx.$slots, "footer", {
                                     key: 1
-                                }) : ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("div", _hoisted_2, [
+                                }) : ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("div", pro_dialogvue_type_script_setup_true_lang_ts_name_ProDialog_hoisted_2, [
                                     (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElButton), {
                                         onClick: handleCancel,
                                         ref_key: "cancelBtnRef",
@@ -961,7 +1297,7 @@ const dbgrid_component_settingvue_type_script_setup_true_lang_tsx_hoisted_1 = {
 const dbgrid_component_settingvue_type_script_setup_true_lang_tsx_hoisted_2 = {
     class: "mb-4 mt-4 flex items-center justify-between"
 };
-const _hoisted_3 = {
+const dbgrid_component_settingvue_type_script_setup_true_lang_tsx_hoisted_3 = {
     class: "flex flex-1 overflow-hidden"
 };
 function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
@@ -1146,7 +1482,10 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
                         displayFlag: item.displayFlag,
                         minWidth: item.minWidth,
                         width: item.width,
-                        prop: item.prop
+                        prop: item.prop,
+                        ascendSort: item.ascendSort,
+                        ascendFlag: item.ascendFlag,
+                        sortable: item.sortable
                     }));
                 if (serveDbgridComponentSettingList.value?.length) {
                     let findObj = serveDbgridComponentSettingList.value.find((item)=>{
@@ -1340,7 +1679,7 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
                                         _cache[6] || (_cache[6] = (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementVNode)("span", null, "影响范围", -1)),
                                         (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElSelect), {
                                             disabled: !(0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(isAdmin),
-                                            class: "ml-6 w-60",
+                                            class: "ml-6 mr-4 w-52",
                                             modelValue: influenceScopeCode.value,
                                             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event)=>influenceScopeCode.value = $event),
                                             clearable: false,
@@ -1366,7 +1705,7 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
                                         ]),
                                         influenceScopeCode.value === (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.INFLUENCE_SCOPE_CODE).PRiVATE ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElSelect), {
                                             key: 0,
-                                            class: "ml-4 w-60",
+                                            class: "mr-4 w-52",
                                             filterable: true,
                                             disabled: !(0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(isAdmin),
                                             remote: true,
@@ -1391,6 +1730,13 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
                                         }, 8, [
                                             "disabled",
                                             "modelValue"
+                                        ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true),
+                                        (sourceData.value || []).find((item)=>item.sortable) ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)(AdvancedSort, {
+                                            key: 1,
+                                            "change-source-data": changeSourceData,
+                                            data: sourceData.value
+                                        }, null, 8, [
+                                            "data"
                                         ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true)
                                     ]),
                                     (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementVNode)("div", null, [
@@ -1419,7 +1765,7 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
                                         ])
                                     ])
                                 ]),
-                                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementVNode)("div", _hoisted_3, [
+                                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementVNode)("div", dbgrid_component_settingvue_type_script_setup_true_lang_tsx_hoisted_3, [
                                     (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(DbgridTableConfig, {
                                         ref_key: "dbgridTableConfigRef",
                                         ref: dbgridTableConfigRef,
@@ -1450,7 +1796,7 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
 const dbgrid_component_setting_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(dbgrid_component_settingvue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-1e6d29ee"
+        "data-v-3ade4ac1"
     ]
 ]);
 /* ESM default export */ const dbgrid_component_setting = dbgrid_component_setting_exports_;
@@ -1850,7 +2196,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
 };
 const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
     key: 1,
-    class: "mt-5 flex justify-between items-center"
+    class: "mt-5 flex items-center justify-between"
 };
 const SELECTION = 'selection';
 // 接受父组件参数，配置默认值
@@ -1873,6 +2219,13 @@ const SELECTION = 'selection';
         componentNo: {
             default: ''
         },
+        hiddenDefaultText: {
+            type: Boolean,
+            default: false
+        },
+        couldSortFieldList: {
+            default: ()=>[]
+        },
         fetchData: {
             type: Function,
             default: void 0
@@ -1932,10 +2285,12 @@ const SELECTION = 'selection';
     emits: [
         "drag-end",
         "size-page-change",
-        "current-page-change"
+        "current-page-change",
+        "sort-change"
     ],
     setup (__props, { expose: __expose, emit: __emit }) {
         const props = __props;
+        const sortFieldList = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(void 0);
         const exportFileFlag = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(__WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO);
         const componentDesc = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)('文件');
         let state = (0, __WEBPACK_EXTERNAL_MODULE_vue__.reactive)({
@@ -1959,6 +2314,8 @@ const SELECTION = 'selection';
         // 定义 emit 事件
         const emit = __emit;
         const attrs = (0, __WEBPACK_EXTERNAL_MODULE_vue__.useAttrs)();
+        // 提供静态数据
+        (0, __WEBPACK_EXTERNAL_MODULE_vue__.provide)('hiddenDefaultText', props.hiddenDefaultText);
         const tableRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
         const proTableRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>tableRef.value?.proTableRef);
         /**
@@ -2049,6 +2406,12 @@ const SELECTION = 'selection';
                 componentDesc.value = result.data.componentDesc;
                 try {
                     let column = result.data.dbgridSettingValue && JSON.parse(result.data.dbgridSettingValue) || [];
+                    sortFieldList.value = column.filter((item)=>item.sortable && (item.ascendFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.NO || item.ascendFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES)).map((item)=>({
+                            fieldName: item.prop,
+                            ascendFlag: item.ascendFlag,
+                            sort: item.ascendSort
+                        }));
+                    proTableRef.value?.clearSort();
                     serveColumns.value = column;
                 } catch (error) {
                     console.log(error);
@@ -2103,20 +2466,29 @@ const SELECTION = 'selection';
         /**
    * 支持根据传递的filterObj完成过滤
    */ const tableData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
-            if (Object.keys(props.filterObj).length) return [
+            let result = [
                 ...state.tableData
-            ].filter((item)=>Object.keys(props.filterObj).every((cur)=>!props.filterObj[cur] && [
+            ];
+            if (sortFieldList.value?.length && !props.pagination) {
+                let sortList = [
+                    ...sortFieldList.value
+                ];
+                sortList.sort((a, b)=>a.sort - b.sort);
+                result = multiFieldSort(result, sortFieldList.value);
+            }
+            if (Object.keys(props.filterObj).length) return result.filter((item)=>Object.keys(props.filterObj).every((cur)=>!props.filterObj[cur] && [
                         '',
                         void 0,
                         null
                     ].includes(props.filterObj[cur]) || item[cur] === props.filterObj[cur]));
-            return state.tableData;
+            return result;
         });
         __expose({
             selections,
             tableData,
             setCurrentRow,
             proTableRef,
+            sortFieldList,
             eleTable: new Proxy({}, {
                 get (_target, prop) {
                     return proTableRef.value?.[prop];
@@ -2147,11 +2519,19 @@ const SELECTION = 'selection';
         /**
    * 处理接口和本地的columns
    */ const commonColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
-            if (!props.componentNo) return props.columns;
+            let propsColumns = [
+                ...props.columns
+            ];
+            if (props.couldSortFieldList && props.couldSortFieldList?.length) propsColumns = propsColumns.map((item)=>{
+                let supportSort = !!(props.couldSortFieldList || []).find((cur)=>cur.fieldName === item.prop);
+                return {
+                    sortable: !!supportSort && (props.pagination ? 'custom' : supportSort),
+                    ...item
+                };
+            });
+            if (!props.componentNo) return propsColumns;
             {
-                let result = [
-                    ...props.columns
-                ].map((cur)=>({
+                let result = propsColumns.map((cur)=>({
                         displayFlag: cur.isHidden || cur.defaultDisplayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO ? __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO : __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.YES,
                         ...cur
                     }));
@@ -2193,6 +2573,32 @@ const SELECTION = 'selection';
             }
             return result.filter((item)=>!item.isHidden && !(props.componentNo && !serveColumns.value?.length && item.defaultDisplayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO));
         });
+        function sortChange({ column, order, prop }) {
+            if (!props.couldSortFieldList?.length) return emit('sort-change', {
+                column,
+                order,
+                prop
+            });
+            let ascendFlag = __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.ALL;
+            switch(order){
+                case ASCENDING:
+                    ascendFlag = __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES;
+                    break;
+                case DESCENDING:
+                    ascendFlag = __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.NO;
+                    break;
+                default:
+                    ascendFlag = __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.ALL;
+            }
+            if (ascendFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.ALL) return sortFieldList.value = [];
+            sortFieldList.value = [
+                {
+                    fieldName: prop,
+                    ascendFlag,
+                    sort: 1
+                }
+            ];
+        }
         return (_ctx, _cache)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("div", pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1, [
                 props?.draggable || props?.isShowDragTips ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("div", {
                     key: 0,
@@ -2223,6 +2629,7 @@ const SELECTION = 'selection';
                                 "columns-setting": props.columnsSetting,
                                 loading: (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(state).loading || props.loading,
                                 onSuccess: fetchDbgridComponent,
+                                onSortChange: sortChange,
                                 ref_key: "tableRef",
                                 ref: tableRef,
                                 data: tableData.value,
@@ -2252,7 +2659,7 @@ const SELECTION = 'selection';
                 props.pagination ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("div", pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2, [
                     (0, __WEBPACK_EXTERNAL_MODULE_vue__.renderSlot)(_ctx.$slots, "pagination"),
                     (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(Pagination, {
-                        class: "w-full flex justify-end",
+                        class: "flex w-full justify-end",
                         layout: props.layout,
                         "page-info": paginationInfo.value,
                         "page-sizes": props.pageSizes,