sun-biz 0.0.3-beta.21 → 0.0.3-beta.22

package/dist/components/index.js

@@ -327,64 +327,84 @@ 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())); // 渲染表格数据
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const renderCellData = (item, scope)=>{
-            let result = enumMap.value.get(item.prop) && item.isFilterEnum ? filterEnum(handleRowAccordingToProp(scope.row, item.prop), enumMap.value.get(item.prop), item.fieldNames) : formatValue(handleRowAccordingToProp(scope.row, item.prop));
-            if (item?.autoFormatterNumber) return formatDecimalNumber(result) ?? '--';
-            return (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)("span", null, [
-                item?.supportCopyAndTips ? (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(copy_text_with_tooltip, {
-                    supportTextCopy: item?.supportTextCopy,
-                    align: "text-center",
-                    text: result
-                }, null, 8, [
-                    "supportTextCopy",
-                    "text"
-                ]) : result
+            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) ?? '--';
+            return item?.supportCopyAndTips ? (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(copy_text_with_tooltip, {
+                supportTextCopy: item?.supportTextCopy,
+                align: "text-center",
+                text: result
+            }, null, 8, [
+                "supportTextCopy",
+                "text"
+            ]) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)("span", null, [
+                result
             ]);
         }; // 获取 tag 类型
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const getTagType = (item, scope)=>filterEnum(handleRowAccordingToProp(scope.row, item.prop), enumMap.value.get(item.prop), item.fieldNames, 'tag') || 'primary';
-        return ()=>{
-            const { column } = props;
-            return (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, null, [
-                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElTableColumn, (0, __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps)(column, {
-                    align: column.align ?? 'center',
-                    fixed: !!column.fixed && column.fixed,
-                    showOverflowTooltip: column.showOverflowTooltip ?? 'operation' !== column.prop
-                }), {
-                    default: (scope)=>{
-                        let _slot2; // if (column._children)
-                        // return column._children.map((child) =>
-                        //   RenderTableColumn(child),
-                        // );
-                        if (column.render) {
-                            if (column.editable) {
-                                let _slot;
-                                return scope.row.editable ? [
-                                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-form-item"), {
-                                        style: {
-                                            marginBottom: '0'
-                                        },
-                                        prop: `tableData.${scope.$index}.${column.prop}`,
-                                        rules: column.rules ? 'function' == typeof column.rules ? column.rules(scope.row) : column.rules : []
-                                    }, _isSlot(_slot = column.render(scope.row, scope.$index)) ? _slot : {
-                                        default: ()=>[
-                                                _slot
-                                            ],
-                                        _: 1
-                                    }, 8, [
-                                        "rules"
-                                    ])
-                                ] : [
-                                    column.render(scope.row, scope.$index)
-                                ];
-                            }
-                            return [
-                                column.render(scope.row, scope.$index)
-                            ];
-                        }
-                        if (column.prop && slots[handleProp(column.prop)]) return slots[handleProp(column.prop)](scope);
-                        if (column.tag) return (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-tag"), {
+        const renderColumn = (column)=>{
+            const columnProps = {
+                ...column,
+                align: column.align ?? 'center',
+                fixed: column.fixed ?? false,
+                showOverflowTooltip: column.showOverflowTooltip ?? 'operation' !== column.prop
+            };
+            const renderHeader = (scope)=>{
+                if (column.headerRender) return [
+                    column.headerRender(scope)
+                ];
+                if (column.prop && slots?.[`${handleProp(column.prop)}Header`]) return [
+                    slots[`${handleProp(column.prop)}Header`](scope)
+                ];
+                return [
+                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)("span", {
+                        class: column.columnClass
+                    }, [
+                        column.required && (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)("span", {
+                            style: "color: #f56c6c"
+                        }, [
+                            (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)("*")
+                        ]),
+                        column.label
+                    ], 2)
+                ];
+            };
+            const renderDefault = (scope)=>{
+                if (column._children?.length) return column._children.map((child)=>renderColumn(child));
+                 // 自定义 render 函数
+                if (column.render) {
+                    if (column.editable && scope.row.editable) {
+                        let _slot;
+                        return [
+                            (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-form-item"), {
+                                style: {
+                                    marginBottom: '0'
+                                },
+                                prop: `tableData.${scope.$index}.${column.prop}`,
+                                rules: column.rules ? 'function' == typeof column.rules ? column.rules(scope.row) : column.rules : []
+                            }, _isSlot(_slot = column.render(scope.row, scope.$index)) ? _slot : {
+                                default: ()=>[
+                                        _slot
+                                    ],
+                                _: 1
+                            }, 8, [
+                                "rules"
+                            ])
+                        ];
+                    }
+                    return [
+                        column.render(scope.row, scope.$index)
+                    ];
+                } // 插槽内容
+                if (column.prop && slots?.[handleProp(column.prop)]) return [
+                    slots[handleProp(column.prop)](scope)
+                ];
+                 // Tag 类型
+                if (column.tag) {
+                    let _slot2;
+                    return [
+                        (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElTag, {
                             type: getTagType(column, scope)
                         }, _isSlot(_slot2 = renderCellData(column, scope)) ? _slot2 : {
                             default: ()=>[
@@ -393,41 +413,93 @@ const TableColumn = (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
                             _: 1
                         }, 8, [
                             "type"
-                        ]);
-                        return [
-                            renderCellData(column, scope)
-                        ];
-                    },
-                    header: (scope)=>{
-                        if (column.headerRender) return column.headerRender(scope);
-                        if (column.prop && slots[`${handleProp(column.prop)}Header`]) return slots[`${handleProp(column.prop)}Header`](scope);
-                        return [
-                            (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)("span", {
-                                class: column.columnClass
-                            }, [
-                                column.required && (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)("span", {
-                                    class: "mr-2",
-                                    style: {
-                                        color: '#f56c6c'
-                                    }
-                                }, [
-                                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)("*")
-                                ]),
-                                column.label
-                            ], 2)
-                        ];
-                    },
-                    _: 1
-                }, 16, [
-                    "align",
-                    "fixed",
-                    "showOverflowTooltip"
-                ])
-            ]);
+                        ])
+                    ];
+                } // 默认渲染
+                return [
+                    renderCellData(column, scope)
+                ];
+            };
+            return (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElTableColumn, columnProps, {
+                default: (scope)=>renderDefault(scope),
+                header: (scope)=>renderHeader(scope),
+                _: 1
+            }, 16);
         };
+        return ()=>renderColumn(props.column);
     }
 });
 /* ESM default export */ const composables_TableColumn = TableColumn;
+// 接受父组件参数，配置默认值
+/* ESM default export */ const RenderColumnvue_type_script_lang_ts_setup_true_name_ProTable = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
+    __name: 'RenderColumn',
+    props: {
+        columnObj: {}
+    },
+    setup (__props) {
+        const columnTypes = [
+            'selection',
+            'radio',
+            'index',
+            'expand',
+            'sort'
+        ];
+        return (_ctx, _cache)=>_ctx.columnObj?.type && columnTypes.includes(_ctx.columnObj.type) ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElTableColumn), (0, __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps)({
+                key: 0
+            }, _ctx.columnObj, {
+                width: _ctx.columnObj.minWidth || _ctx.columnObj.width,
+                align: _ctx.columnObj.align ?? 'center',
+                "reserve-selection": 'selection' == _ctx.columnObj.type
+            }), {
+                default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)((scope)=>[
+                        'expand' == _ctx.columnObj.type ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, {
+                            key: 0
+                        }, [
+                            _ctx.columnObj.render ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveDynamicComponent)(_ctx.columnObj.render(scope.row, scope.$index, scope.expanded)), {
+                                key: 0
+                            })) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.renderSlot)(_ctx.$slots, _ctx.columnObj.type, (0, __WEBPACK_EXTERNAL_MODULE_vue__.normalizeProps)((0, __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps)({
+                                key: 1
+                            }, scope)))
+                        ], 64)) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true),
+                        'sort' == _ctx.columnObj.type ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElTag), {
+                            key: 1,
+                            class: "move"
+                        }, {
+                            default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
+                                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElIcon), null, {
+                                        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__.DCaret))
+                                            ]),
+                                        _: 1
+                                    })
+                                ]),
+                            _: 1
+                        })) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true)
+                    ]),
+                _: 3
+            }, 16, [
+                "width",
+                "align",
+                "reserve-selection"
+            ])) : ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(composables_TableColumn), {
+                key: 1,
+                column: _ctx.columnObj
+            }, (0, __WEBPACK_EXTERNAL_MODULE_vue__.createSlots)({
+                _: 2
+            }, [
+                (0, __WEBPACK_EXTERNAL_MODULE_vue__.renderList)(Object.keys(_ctx.$slots), (slot)=>({
+                        name: slot,
+                        fn: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)((scope)=>[
+                                (0, __WEBPACK_EXTERNAL_MODULE_vue__.renderSlot)(_ctx.$slots, slot, (0, __WEBPACK_EXTERNAL_MODULE_vue__.normalizeProps)((0, __WEBPACK_EXTERNAL_MODULE_vue__.guardReactiveProps)(scope)))
+                            ])
+                    }))
+            ]), 1032, [
+                "column"
+            ]));
+    }
+});
+const RenderColumn_exports_ = RenderColumnvue_type_script_lang_ts_setup_true_name_ProTable;
+/* ESM default export */ const RenderColumn = RenderColumn_exports_;
 /**
  * [1-10012-1]获取值域列表
  * @param data
@@ -456,7 +528,7 @@ function use_fetch_dataset_useFetchDataset(codeSystemCodes, enabledFlag) {
  * @param params
  * @returns
  */ const exportData2File = (params)=>(0, __WEBPACK_EXTERNAL_MODULE__sun_toolkit_request__.basicRequest)('/untils/exportData2File', params);
-const SELECTION = 'selection'; // 定义 CheckboxValueType 类型
+// 定义 CheckboxValueType 类型
 function useTableConfigColumn(changeInputSort, length, disabledDraggable) {
     const changeSort = debounce(changeInputSort, 1200);
     return [
@@ -482,7 +554,6 @@ function useTableConfigColumn(changeInputSort, length, disabledDraggable) {
                     'false-value': 0,
                     size: 'small',
                     modelValue: row.displayFlag,
-                    disabled: row.type === SELECTION,
                     'onUpdate:modelValue': (value)=>row.displayFlag = value
                 })
         },
@@ -493,8 +564,8 @@ function useTableConfigColumn(changeInputSort, length, disabledDraggable) {
             render: (row)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.h)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElInputNumber, {
                     maxLength: 16,
                     'controls-position': 'right',
+                    min: 0,
                     modelValue: row.minWidth,
-                    disabled: row.type === SELECTION,
                     'onUpdate:modelValue': (value)=>row.minWidth = value,
                     size: 'small',
                     placeholder: '请输入列宽 (最小值)'
@@ -509,7 +580,7 @@ function useTableConfigColumn(changeInputSort, length, disabledDraggable) {
                     min: 0,
                     'controls-position': 'right',
                     modelValue: row.sort,
-                    disabled: disabledDraggable.value || row.type === SELECTION,
+                    disabled: disabledDraggable.value,
                     'onUpdate:modelValue': (value)=>row.sort = value,
                     onInput: (sort)=>{
                         changeSort(index, sort);
@@ -715,20 +786,22 @@ const _hoisted_2 = {
         const attrs = (0, __WEBPACK_EXTERNAL_MODULE_vue__.useAttrs)();
         const loading = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(false);
         const dialogRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
+        const confirmBtnRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
+        const cancelBtnRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
         const emits = __emit;
         // 纯关闭弹窗，不执行其他操作，用于左上角X
         const justCloseDialog = ()=>{
             closeDialog();
-            emits('close');
+            emits("close");
         };
         // 处理常规关闭，支持before-close钩子
         const handleClose = ()=>{
-            if (attrs?.['before-close']) (attrs?.['before-close'])(closeDialog);
+            if (attrs?.["before-close"]) (attrs?.["before-close"])(closeDialog);
             else closeDialog();
         };
         // 处理取消按钮点击
         const handleCancel = ()=>{
-            emits('cancel');
+            emits("cancel");
             if (__props.closeOnCancel) handleClose();
         };
         const handleConfirm = async ()=>{
@@ -739,7 +812,7 @@ const _hoisted_2 = {
                     loading.value = false;
                     if (!err) {
                         handleClose();
-                        emits('success');
+                        emits("success");
                     }
                 } catch  {
                     loading.value = false;
@@ -747,13 +820,15 @@ const _hoisted_2 = {
             }
         };
         const changeScreen = async (flag)=>{
-            emits('changeScreen', flag);
+            emits("changeScreen", flag);
         };
         __expose({
             ref: dialogRef,
             open: openDialog,
             close: closeDialog,
-            visible
+            visible,
+            confirmBtnRef,
+            cancelBtnRef
         });
         return (_ctx, _cache)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, null, [
                 (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElDialog), (0, __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps)({
@@ -809,19 +884,29 @@ const _hoisted_2 = {
                                     key: 1
                                 }) : ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("div", _hoisted_2, [
                                     (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElButton), {
-                                        onClick: handleCancel
+                                        onClick: handleCancel,
+                                        ref_key: "cancelBtnRef",
+                                        ref: cancelBtnRef,
+                                        onKeydown: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withKeys)(handleCancel, [
+                                            "enter"
+                                        ])
                                     }, {
                                         default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>_cache[3] || (_cache[3] = [
                                                 (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)("取消")
                                             ])),
                                         _: 1
-                                    }),
+                                    }, 512),
                                     _ctx.showConfirmButton ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElButton), {
                                         key: 0,
+                                        ref_key: "confirmBtnRef",
+                                        ref: confirmBtnRef,
                                         loading: loading.value,
                                         type: "primary",
                                         disabled: _ctx.confirmDisabled,
-                                        onClick: handleConfirm
+                                        onClick: handleConfirm,
+                                        onKeydown: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withKeys)(handleConfirm, [
+                                            "enter"
+                                        ])
                                     }, {
                                         default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>_cache[4] || (_cache[4] = [
                                                 (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)(" 确认 ")
@@ -849,7 +934,7 @@ const _hoisted_2 = {
                             onClick: (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(openDialog)
                         }, {
                             default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
-                                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.toDisplayString)(__WEBPACK_EXTERNAL_MODULE_vue__.unref(attrs)?.['button-text']), 1)
+                                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.toDisplayString)(__WEBPACK_EXTERNAL_MODULE_vue__.unref(attrs)?.["button-text"]), 1)
                                 ]),
                             _: 1
                         }, 8, [
@@ -905,7 +990,9 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
         ]);
         const isAdmin = userInfo?.adminFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES || userInfo?.userJobCode === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG_STR.NO;
         const componentId = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)('');
-        const fullscreen = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(false);
+        const fullscreen = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(true);
+        const confirmLoading = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(false);
+        const applicationLoading = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(false);
         const props = __props;
         (0, __WEBPACK_EXTERNAL_MODULE_vue__.onMounted)(()=>{
             dialogRef.value.open();
@@ -925,7 +1012,6 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
         const influenceScopeCode = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(__WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.INFLUENCE_SCOPE_CODE.PUBLIC);
         const userList = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([]);
         const sourceData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([]);
-        const exportFileFlag = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(__WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO);
         const disabledDraggable = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>!props.columnsSetting?.draggable);
         function initColumns() {
             sourceData.value = props.columns.map((item, index)=>({
@@ -971,7 +1057,6 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
                 if (result?.data?.length) {
                     componentId.value = result.data[0].componentId || '';
                     serveDbgridComponentSettingList.value = result.data[0].dbgridComponentSettingList || [];
-                    exportFileFlag.value = result.data[0].exportFileFlag;
                     if (serveDbgridComponentSettingList.value.length) {
                         if (!isAdmin) {
                             influenceScopeCode.value = __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.INFLUENCE_SCOPE_CODE.PRiVATE;
@@ -1041,7 +1126,7 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
                 return item;
             });
         }
-        function submit() {
+        function submit(isSave) {
             return new Promise((resolve, reject)=>{
                 if (influenceScopeCode.value === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.INFLUENCE_SCOPE_CODE.PRiVATE && !bizId.value) {
                     __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.warning('请选择操作员');
@@ -1090,7 +1175,7 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
                 }).then((result)=>{
                     let [, data] = result;
                     if (data?.success) {
-                        __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.success('保存成功');
+                        __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.success(isSave ? '保存成功' : '应用成功');
                         resolve([]);
                     } else reject([
                         '',
@@ -1105,8 +1190,7 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
             });
         }
         __expose({
-            dialogRef,
-            exportFileFlag
+            dialogRef
         }); /**
    * 左右滚动
    */ 
@@ -1140,17 +1224,25 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
         function changeScreen(flag) {
             fullscreen.value = flag;
         }
-        function onClose() {
-            props.remove();
-            renderDialog.value = false;
+        function handleCancel() {
+            dialogRef.value.close();
+        }
+        async function handleConfirm(isSave = true) {
+            const loadingRef = isSave ? confirmLoading : applicationLoading;
+            loadingRef.value = true;
+            try {
+                const [err] = await submit(isSave);
+                loadingRef.value = false;
+                if (!err) {
+                    if (isSave) handleCancel();
+                    props.success();
+                }
+            } catch  {
+                loadingRef.value = false;
+            }
         }
         return (_ctx, _cache)=>renderDialog.value ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)(pro_dialog, {
                 key: 0,
-                "confirm-fn": submit,
-                onSuccess: props.success,
-                onClosed: _cache[4] || (_cache[4] = ()=>{
-                    onClose();
-                }),
                 "destroy-on-close": true,
                 width: 1000,
                 fullscreen: fullscreen.value,
@@ -1161,6 +1253,49 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
                 "button-class": "mr-5",
                 title: "数据窗口组件"
             }, {
+                footer: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
+                        (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElButton), {
+                            onClick: handleCancel
+                        }, {
+                            default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>_cache[7] || (_cache[7] = [
+                                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)("取消")
+                                ])),
+                            _: 1
+                        }),
+                        (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElButton), {
+                            type: "primary",
+                            loading: applicationLoading.value,
+                            disabled: applicationLoading.value,
+                            plain: "",
+                            onClick: _cache[4] || (_cache[4] = ()=>{
+                                handleConfirm(false);
+                            })
+                        }, {
+                            default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>_cache[8] || (_cache[8] = [
+                                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)("应用")
+                                ])),
+                            _: 1
+                        }, 8, [
+                            "loading",
+                            "disabled"
+                        ]),
+                        (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElButton), {
+                            loading: confirmLoading.value,
+                            type: "primary",
+                            disabled: confirmLoading.value,
+                            onClick: _cache[5] || (_cache[5] = ()=>{
+                                handleConfirm(true);
+                            })
+                        }, {
+                            default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>_cache[9] || (_cache[9] = [
+                                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)(" 确认 ")
+                                ])),
+                            _: 1
+                        }, 8, [
+                            "loading",
+                            "disabled"
+                        ])
+                    ]),
                 default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
                         (0, __WEBPACK_EXTERNAL_MODULE_vue__.withDirectives)(((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("div", {
                             style: (0, __WEBPACK_EXTERNAL_MODULE_vue__.normalizeStyle)({
@@ -1177,6 +1312,11 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
                                 }),
                                 (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementVNode)("div", null, [
                                     (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(pro_table, {
+                                        disabled: "",
+                                        "columns-setting": {
+                                            disabled: true
+                                        },
+                                        "component-no": props.componentNo,
                                         ref_key: "tableRef",
                                         ref: tableRef,
                                         columns: tableColumn.value,
@@ -1186,12 +1326,13 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
                                             {}
                                         ]
                                     }, null, 8, [
+                                        "component-no",
                                         "columns"
                                     ])
                                 ]),
                                 (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementVNode)("div", dbgrid_component_settingvue_type_script_setup_true_lang_tsx_hoisted_2, [
                                     (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementVNode)("div", null, [
-                                        _cache[5] || (_cache[5] = (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementVNode)("span", null, "影响范围", -1)),
+                                        _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",
@@ -1254,7 +1395,7 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
                                             modelValue: scrollKeyWord.value,
                                             "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event)=>scrollKeyWord.value = $event),
                                             placeholder: "\n                选择后可自动定位到对应的属性\n              ",
-                                            class: "w-60"
+                                            class: "w-64"
                                         }, {
                                             default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
                                                     ((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)(sourceData.value, (item)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElOption), {
@@ -1296,7 +1437,6 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
                     ]),
                 _: 1
             }, 8, [
-                "onSuccess",
                 "fullscreen"
             ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true);
     }
@@ -1304,7 +1444,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-2487e092"
+        "data-v-20489fe7"
     ]
 ]);
 /* ESM default export */ const dbgrid_component_setting = dbgrid_component_setting_exports_;
@@ -1348,13 +1488,13 @@ const EXPORT_FILE = 'export-file';
         tableData: {},
         columns: {},
         componentNo: {},
-        columnsSetting: {}
+        columnsSetting: {},
+        exportFileFlag: {}
     },
     emits: [
         'success'
     ],
-    setup (__props, { expose: __expose, emit: __emit }) {
-        const columnsSettingRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
+    setup (__props, { emit: __emit }) {
         const dataSetList = use_fetch_dataset_useFetchDataset([
             FILE_TYPE_CODE
         ]);
@@ -1369,7 +1509,7 @@ const EXPORT_FILE = 'export-file';
                     children: []
                 }
             ];
-            if (exportFileFlag.value === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.NO) return result;
+            if (props.exportFileFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO || props.columnsSetting?.disabled) return result;
             let list = dataSetList.value?.[FILE_TYPE_CODE] || [];
             if (1 === list.length) result.push({
                 value: list[0]?.dataValueNo,
@@ -1418,6 +1558,7 @@ const EXPORT_FILE = 'export-file';
             panelValue.value = [];
         }
         function openColumnSetting() {
+            if (props.columnsSetting?.disabled) return;
             tableColumnSetting({
                 columns: props.columns,
                 componentNo: props.componentNo,
@@ -1427,14 +1568,10 @@ const EXPORT_FILE = 'export-file';
                 }
             });
         }
-        const exportFileFlag = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>columnsSettingRef.value?.exportFileFlag);
         function handleMenuClick(value) {
             if (value === COLUMN_SETTING) openColumnSetting();
             else exportFile(value);
         }
-        __expose({
-            exportFileFlag
-        });
         return (_ctx, _cache)=>{
             const _component_el_menu_item = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-menu-item");
             const _component_el_sub_menu = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-sub-menu");
@@ -1512,29 +1649,700 @@ const EXPORT_FILE = 'export-file';
             })) : ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("span", {
                 key: 1,
                 onClick: openColumnSetting,
-                class: "el-dropdown-link absolute left-3 top-2.5 z-50 cursor-pointer text-blue-600"
+                class: (0, __WEBPACK_EXTERNAL_MODULE_vue__.normalizeClass)(`el-dropdown-link absolute left-3 top-2.5  z-50 ${props.columnsSetting?.disabled ? 'cursor-not-allowed text-blue-400' : 'cursor-pointer text-blue-600'}`)
             }, [
-                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElIcon), {
-                    class: ""
+                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElIcon), null, {
+                    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__.Setting))
+                        ]),
+                    _: 1
+                })
+            ], 2));
+        };
+    }
+});
+const TableSettingButton_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(TableSettingButtonvue_type_script_setup_true_lang_tsx, [
+    [
+        '__scopeId',
+        "data-v-33e7f7b0"
+    ]
+]);
+/* ESM default export */ const TableSettingButton = TableSettingButton_exports_;
+/* ESM default export */ const Tablevue_type_script_setup_true_lang_tsx_name_Table = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
+    __name: 'Table',
+    props: {
+        id: {},
+        loading: {
+            type: Boolean
+        },
+        exportFileFlag: {},
+        draggable: {
+            type: Boolean
+        },
+        data: {},
+        componentNo: {},
+        rowKey: {},
+        tableColumns: {},
+        commonColumns: {},
+        columnsSetting: {}
+    },
+    emits: [
+        'success'
+    ],
+    setup (__props, { expose: __expose, emit: __emit }) {
+        const props = __props;
+        const emits = __emit;
+        const proTableRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
+        const selectedData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>proTableRef?.value?.getSelectionRows() || []);
+        __expose({
+            proTableRef
+        });
+        return (_ctx, _cache)=>{
+            const _directive_loading = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveDirective)("loading");
+            return (0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, null, [
+                props.componentNo ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)(TableSettingButton, {
+                    key: 0,
+                    "table-data": selectedData.value,
+                    "export-file-flag": props.exportFileFlag,
+                    "component-no": props.componentNo,
+                    "columns-setting": props.columnsSetting,
+                    columns: _ctx.commonColumns,
+                    ref: "tableSettingButtonRef",
+                    onSuccess: _cache[0] || (_cache[0] = ($event)=>emits('success'))
+                }, null, 8, [
+                    "table-data",
+                    "export-file-flag",
+                    "component-no",
+                    "columns-setting",
+                    "columns"
+                ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true),
+                (0, __WEBPACK_EXTERNAL_MODULE_vue__.withDirectives)(((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElTable), (0, __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps)({
+                    id: props.id,
+                    ref_key: "proTableRef",
+                    ref: proTableRef,
+                    data: props.data,
+                    style: {
+                        width: "100%"
+                    },
+                    class: "min-h-0 flex-1 overflow-auto",
+                    "row-key": props.rowKey,
+                    "cell-class-name": ({ column })=>_ctx.draggable && 'operation' !== column.property ? 'cursor-move' : '',
+                    border: ""
+                }, _ctx.$attrs), {
+                    default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
+                            ((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)(props.tableColumns, (item, index)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)(RenderColumn, {
+                                    "column-obj": item,
+                                    key: index
+                                }, null, 8, [
+                                    "column-obj"
+                                ]))), 128))
+                        ]),
+                    _: 1
+                }, 16, [
+                    "id",
+                    "data",
+                    "row-key",
+                    "cell-class-name"
+                ])), [
+                    [
+                        _directive_loading,
+                        props.loading
+                    ]
+                ])
+            ], 64);
+        };
+    }
+});
+const Table_exports_ = Tablevue_type_script_setup_true_lang_tsx_name_Table;
+/* ESM default export */ const Table = Table_exports_;
+// 接受父组件参数，配置默认值
+/* ESM default export */ const TableContainervue_type_script_lang_ts_setup_true_name_ProTableContainer = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
+    __name: 'TableContainer',
+    props: {
+        model: {
+            default: ()=>({})
+        },
+        draggable: {
+            type: Boolean
+        },
+        editable: {
+            type: Boolean
+        }
+    },
+    setup (__props, { expose: __expose }) {
+        const props = __props;
+        const formRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
+        __expose(new Proxy({}, {
+            get (_target, prop) {
+                if (formRef.value) return formRef.value[prop];
+            },
+            has (_target, prop) {
+                if (formRef?.value) return prop in formRef.value;
+                return false;
+            }
+        }));
+        return (_ctx, _cache)=>_ctx.editable ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElForm), (0, __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps)({
+                key: 0,
+                model: props.model,
+                ref_key: "formRef",
+                ref: formRef
+            }, _ctx.$attrs), {
+                default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
+                        (0, __WEBPACK_EXTERNAL_MODULE_vue__.renderSlot)(_ctx.$slots, "default")
+                    ]),
+                _: 3
+            }, 16, [
+                "model"
+            ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.renderSlot)(_ctx.$slots, "default", {
+                key: 1
+            });
+    }
+});
+const TableContainer_exports_ = TableContainervue_type_script_lang_ts_setup_true_name_ProTableContainer;
+/* ESM default export */ const TableContainer = TableContainer_exports_;
+/* ESM default export */ const Paginationvue_type_script_setup_true_lang_ts_name_Pagination = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
+    __name: 'Pagination',
+    props: {
+        pageInfo: {},
+        pageSizes: {},
+        handleSizeChange: {
+            type: Function
+        },
+        handleCurrentChange: {
+            type: Function
+        }
+    },
+    setup (__props) {
+        return (_ctx, _cache)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElPagination), (0, __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps)({
+                "current-page": _ctx.pageInfo.pageNumber,
+                "page-size": _ctx.pageInfo.pageSize,
+                total: _ctx.pageInfo.total,
+                "page-sizes": _ctx.pageSizes,
+                layout: "total, sizes, prev, pager, next",
+                onSizeChange: _ctx.handleSizeChange,
+                onCurrentChange: _ctx.handleCurrentChange,
+                "set-scroll-top": 500,
+                background: ""
+            }, _ctx.$attrs), null, 16, [
+                "current-page",
+                "page-size",
+                "total",
+                "page-sizes",
+                "onSizeChange",
+                "onCurrentChange"
+            ]));
+    }
+});
+const Pagination_exports_ = Paginationvue_type_script_setup_true_lang_ts_name_Pagination;
+/* ESM default export */ const Pagination = Pagination_exports_;
+const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
+    class: "relative flex flex-1 flex-col overflow-hidden"
+};
+const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
+    key: 1,
+    class: "mt-5 flex justify-between items-center"
+};
+const SELECTION = 'selection';
+// 接受父组件参数，配置默认值
+/* ESM default export */ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
+    __name: 'index',
+    props: {
+        columns: {
+            default: ()=>[]
+        },
+        data: {
+            default: ()=>[]
+        },
+        pagination: {
+            type: Boolean,
+            default: false
+        },
+        pageInfo: {
+            default: void 0
+        },
+        componentNo: {
+            default: ''
+        },
+        fetchData: {
+            type: Function,
+            default: void 0
+        },
+        columnsSetting: {
+            default: ()=>({
+                    draggable: true
+                })
+        },
+        draggable: {
+            type: Boolean,
+            default: false
+        },
+        editable: {
+            type: Boolean,
+            default: false
+        },
+        defaultQuery: {
+            type: Boolean,
+            default: true
+        },
+        rowKey: {
+            default: 'id'
+        },
+        loading: {
+            type: Boolean,
+            default: false
+        },
+        pageSizes: {
+            default: ()=>[
+                    10,
+                    25,
+                    50,
+                    100
+                ]
+        },
+        filterObj: {
+            default: ()=>({})
+        },
+        layout: {
+            default: 'total, sizes, prev, pager, next'
+        },
+        dragTips: {
+            default: '温馨提示：您可通过拖动进行排序'
+        },
+        isShowDragTips: {
+            type: Boolean,
+            default: false
+        },
+        dragTipsCustomStyle: {
+            default: {}
+        },
+        dragTipsClassName: {
+            default: ''
+        }
+    },
+    emits: [
+        "drag-end",
+        "size-page-change",
+        "current-page-change"
+    ],
+    setup (__props, { expose: __expose, emit: __emit }) {
+        const props = __props;
+        const exportFileFlag = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(__WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO);
+        let state = (0, __WEBPACK_EXTERNAL_MODULE_vue__.reactive)({
+            // 表格数据
+            tableData: props.data,
+            loading: false,
+            // 分页数据
+            pageInfo: {
+                // 当前页数
+                pageNumber: 1,
+                // 每页显示条数
+                pageSize: 10,
+                // 总条数
+                total: 0
+            }
+        });
+        const serveColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([]);
+        const formRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
+        // 生成组件唯一id
+        const uuid = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)((0, __WEBPACK_EXTERNAL_MODULE_vue__.useId)());
+        // 定义 emit 事件
+        const emit = __emit;
+        const attrs = (0, __WEBPACK_EXTERNAL_MODULE_vue__.useAttrs)();
+        const tableRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
+        const proTableRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>tableRef.value?.proTableRef);
+        /**
+   *获取参与排序的列表 索引 是否可以拖拽
+   */ function getDragSortData(newIndex, data, startIndexObj, sortData) {
+            data.forEach((item, index)=>{
+                startIndexObj.startIndex += 1;
+                if (startIndexObj.startIndex > newIndex) return;
+                if (startIndexObj.startIndex === newIndex) {
+                    sortData.curIndex = index;
+                    sortData.curData = item;
+                    sortData.result = data;
+                }
+                if (item?.[attrs?.['tree-props']?.children]) getDragSortData(newIndex, item?.[attrs?.['tree-props']?.children], startIndexObj, sortData);
+            });
+            return sortData;
+        }
+        /**
+   * 获取拖拽排序数据结果
+   */ function getSortableResult(newIndex, oldIndex) {
+            let data = [
+                ...state.tableData
+            ];
+            if (attrs?.['tree-props']) {
+                let { result, curIndex: newCurIndex, curData: newCurData } = getDragSortData(newIndex, data, {
+                    startIndex: -1
+                }, {
+                    result: [],
+                    curIndex: 0,
+                    curData: {}
+                });
+                let { curIndex: oldCurIndex, curData: oldCurData } = getDragSortData(oldIndex, data, {
+                    startIndex: -1
+                }, {
+                    result: [],
+                    curIndex: 0,
+                    curData: {}
+                });
+                if (newCurData.belongGroupElementId !== oldCurData.belongGroupElementId) {
+                    __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.warning('暂不支持跨层级拖拽配置');
+                    return [];
+                }
+                const [removedItem] = result.splice(oldCurIndex, 1);
+                result.splice(newCurIndex, 0, removedItem);
+                data = result;
+            } else {
+                const [removedItem] = data.splice(oldIndex, 1);
+                data.splice(newIndex, 0, removedItem);
+            }
+            return data;
+        }
+        /***
+   * 表格拖拽排序
+   **/ const initDragSort = ()=>{
+            const tbodyList = document.querySelectorAll(`#${uuid.value} tbody`);
+            const tbody = tbodyList[tbodyList.length - 1];
+            let initialHTML = ''; //暂不支持跨层级拖拽
+            if (tbody) __WEBPACK_EXTERNAL_MODULE_sortablejs__["default"].create(tbody, {
+                handle: '.cursor-move',
+                animation: 300,
+                scroll: true,
+                scrollSensitivity: 80,
+                scrollSpeed: 10,
+                onEnd (evt) {
+                    const { newIndex, oldIndex } = evt;
+                    if (newIndex === oldIndex || void 0 === newIndex || void 0 === oldIndex) return;
+                    //获取拖动后的排序
+                    let data = getSortableResult(newIndex, oldIndex);
+                    if (data.length) emit('drag-end', data);
+                    else evt.from.innerHTML = initialHTML;
+                },
+                onStart (evt) {
+                    // 在拖拽开始时，记录当前容器的 HTML
+                    initialHTML = evt.from.innerHTML;
+                }
+            });
+        };
+        (0, __WEBPACK_EXTERNAL_MODULE_vue__.watch)(()=>props.data, (newValue)=>{
+            state.tableData = newValue;
+            state.pageInfo.total = (newValue || []).length;
+        });
+        async function fetchDbgridComponent() {
+            let [, result] = await queryDbgridComponentByExample({
+                componentNo: props.componentNo || ''
+            });
+            if (result?.success) {
+                exportFileFlag.value = result.data.exportFileFlag;
+                try {
+                    let column = result.data.dbgridSettingValue && JSON.parse(result.data.dbgridSettingValue) || [];
+                    serveColumns.value = column;
+                } catch (error) {
+                    console.log(error);
+                }
+            }
+        }
+        (0, __WEBPACK_EXTERNAL_MODULE_vue__.watch)(()=>props.componentNo, ()=>{
+            if (props.componentNo) fetchDbgridComponent();
+        }, {
+            immediate: true
+        });
+        (0, __WEBPACK_EXTERNAL_MODULE_vue__.onMounted)(()=>{
+            // 支持拖拽排序
+            if (props.draggable) (0, __WEBPACK_EXTERNAL_MODULE_vue__.nextTick)(()=>{
+                initDragSort();
+            });
+            if (props.pagination && props?.fetchData && props.defaultQuery) fetchList();
+        });
+        /**
+   * 获取列表
+   */ async function fetchList() {
+            state.loading = true;
+            let { total = 0, data = [] } = await (props.fetchData && props.fetchData(state.pageInfo)) || {};
+            state.pageInfo.total = Number(total);
+            state.tableData = data;
+            state.loading = false;
+        }
+        /**
+   * 分页组件改变 pageNumber 事件
+   */ const handleSizeChange = (val)=>{
+            if (props.fetchData) {
+                state.pageInfo.pageNumber = 1;
+                state.pageInfo.pageSize = val;
+                fetchList();
+            } else emit('size-page-change', val);
+        };
+        /**
+   * 分页组件改变 当前页数 事件
+   */ function changeCurrentPage(val) {
+            if (props.fetchData) {
+                state.pageInfo.pageNumber = val;
+                fetchList();
+            } else emit('current-page-change', val);
+        }
+        const selections = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
+        // 设置当前行激活态
+        const setCurrentRow = (row)=>{
+            if (proTableRef.value) proTableRef.value.setCurrentRow(row);
+        };
+        // 分页配置信息
+        const paginationInfo = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>props.pageInfo ?? state.pageInfo);
+        /**
+   * 支持根据传递的filterObj完成过滤
+   */ const tableData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
+            if (Object.keys(props.filterObj).length) return [
+                ...state.tableData
+            ].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;
+        });
+        __expose({
+            selections,
+            tableData,
+            setCurrentRow,
+            proTableRef,
+            eleTable: new Proxy({}, {
+                get (_target, prop) {
+                    return proTableRef.value?.[prop];
+                }
+            }),
+            formRef: new Proxy({}, {
+                get (_target, prop) {
+                    return formRef.value?.[prop];
+                },
+                has (_target, prop) {
+                    return prop in formRef.value;
+                }
+            }),
+            validateRow: (index, callback)=>{
+                const validateProps = props.columns.filter((item)=>item.rules).map((item)=>`tableData.${index}.${item.prop}`);
+                return formRef.value.validateField(validateProps, callback);
+            },
+            fetchList: (init = true, initPageInfo = {
+                pageNumber: 1
+            })=>{
+                if (init) state.pageInfo = {
+                    ...state.pageInfo,
+                    ...initPageInfo
+                };
+                fetchList();
+            }
+        });
+        /**
+   * 处理接口和本地的columns
+   */ const commonColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
+            if (!props.componentNo) return props.columns;
+            {
+                let result = [
+                    ...props.columns
+                ].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
+                    }));
+                if (serveColumns.value?.length) {
+                    result = result.map((item, index)=>{
+                        let findObj = serveColumns.value.find((cur)=>cur.prop === item.prop) || {};
+                        return {
+                            displayFlag: item.isHidden ? __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO : __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.YES,
+                            ...item,
+                            sort: index + 1,
+                            ...findObj,
+                            label: item.label || findObj.label,
+                            isHidden: item.isHidden || findObj.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO
+                        };
+                    });
+                    result.sort((a, b)=>Number(a.sort) - Number(b.sort));
+                }
+                return result;
+            }
+        });
+        /**
+   * 表格渲染存在设置标志的情况 左边宽度加个40px
+   */ const tableColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
+            let result = [
+                ...commonColumns.value
+            ];
+            if (props.componentNo) {
+                result = result.map((item, index)=>({
+                        ...item,
+                        minWidth: 0 === index ? (item.minWidth || 40) + 40 : item.minWidth
+                    }));
+                if (exportFileFlag.value && !result.find((cur)=>cur.type === SELECTION)) result = [
+                    {
+                        type: SELECTION,
+                        prop: SELECTION
+                    },
+                    ...result
+                ];
+            }
+            return result.filter((item)=>!item.isHidden && !(props.componentNo && !serveColumns.value?.length && item.defaultDisplayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO));
+        });
+        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,
+                    style: (0, __WEBPACK_EXTERNAL_MODULE_vue__.normalizeStyle)({
+                        color: '#f7ba2a',
+                        ...props.dragTipsCustomStyle
+                    }),
+                    class: (0, __WEBPACK_EXTERNAL_MODULE_vue__.normalizeClass)([
+                        'text-base',
+                        'mb-2',
+                        props.dragTipsClassName
+                    ])
+                }, (0, __WEBPACK_EXTERNAL_MODULE_vue__.toDisplayString)(props.dragTips), 7)) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true),
+                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(TableContainer, {
+                    ref_key: "formRef",
+                    ref: formRef,
+                    editable: _ctx.editable,
+                    model: (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(state),
+                    class: "flex flex-1 flex-col overflow-hidden"
                 }, {
                     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__.Setting))
+                            (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(Table, (0, __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps)({
+                                id: uuid.value,
+                                "export-file-flag": exportFileFlag.value,
+                                "common-columns": commonColumns.value,
+                                "component-no": props.componentNo,
+                                "columns-setting": props.columnsSetting,
+                                loading: (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(state).loading || props.loading,
+                                onSuccess: fetchDbgridComponent,
+                                ref_key: "tableRef",
+                                ref: tableRef,
+                                data: tableData.value,
+                                "row-key": props.rowKey,
+                                "table-columns": tableColumns.value
+                            }, _ctx.$attrs, {
+                                draggable: props.draggable
+                            }), null, 16, [
+                                "id",
+                                "export-file-flag",
+                                "common-columns",
+                                "component-no",
+                                "columns-setting",
+                                "loading",
+                                "data",
+                                "row-key",
+                                "table-columns",
+                                "draggable"
+                            ])
                         ]),
                     _: 1
-                })
+                }, 8, [
+                    "editable",
+                    "model"
+                ]),
+                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",
+                        layout: props.layout,
+                        "page-info": paginationInfo.value,
+                        "page-sizes": props.pageSizes,
+                        "handle-size-change": handleSizeChange,
+                        "handle-current-change": changeCurrentPage
+                    }, null, 8, [
+                        "layout",
+                        "page-info",
+                        "page-sizes"
+                    ])
+                ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true)
             ]));
+    }
+});
+const pro_table_exports_ = pro_tablevue_type_script_lang_ts_setup_true_name_ProTable;
+/* ESM default export */ const pro_table = pro_table_exports_;
+const Tablevue_type_script_setup_true_lang_tsx_name_Table_hoisted_1 = {
+    class: "min-h-0 flex-1"
+};
+/* ESM default export */ const composables_Tablevue_type_script_setup_true_lang_tsx_name_Table = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
+    __name: 'Table',
+    props: {
+        id: {},
+        loading: {
+            type: Boolean
+        },
+        exportFileFlag: {},
+        draggable: {
+            type: Boolean
+        },
+        data: {},
+        componentNo: {},
+        rowKey: {},
+        tableColumns: {},
+        commonColumns: {},
+        columnsSetting: {}
+    },
+    emits: [
+        'success'
+    ],
+    setup (__props, { expose: __expose, emit: __emit }) {
+        const props = __props;
+        const emits = __emit;
+        const proTableRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
+        const selectedData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>props.data.filter((cur)=>cur.checked));
+        __expose({
+            proTableRef
+        });
+        return (_ctx, _cache)=>{
+            const _directive_loading = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveDirective)("loading");
+            return (0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, null, [
+                props.componentNo ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)(TableSettingButton, {
+                    key: 0,
+                    "table-data": selectedData.value,
+                    "export-file-flag": props.exportFileFlag,
+                    "component-no": props.componentNo,
+                    "columns-setting": props.columnsSetting,
+                    columns: _ctx.commonColumns,
+                    ref: "tableSettingButtonRef",
+                    onSuccess: _cache[0] || (_cache[0] = ($event)=>emits('success'))
+                }, null, 8, [
+                    "table-data",
+                    "export-file-flag",
+                    "component-no",
+                    "columns-setting",
+                    "columns"
+                ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true),
+                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementVNode)("div", Tablevue_type_script_setup_true_lang_tsx_name_Table_hoisted_1, [
+                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElAutoResizer), null, {
+                        default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(({ height, width })=>[
+                                (0, __WEBPACK_EXTERNAL_MODULE_vue__.withDirectives)((0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElTableV2), (0, __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps)({
+                                    columns: props.tableColumns,
+                                    data: props.data,
+                                    "row-key": props.rowKey,
+                                    ref_key: "proTableRef",
+                                    ref: proTableRef,
+                                    width: width,
+                                    height: height
+                                }, _ctx.$attrs, {
+                                    fixed: ""
+                                }), null, 16, [
+                                    "columns",
+                                    "data",
+                                    "row-key",
+                                    "width",
+                                    "height"
+                                ]), [
+                                    [
+                                        _directive_loading,
+                                        props.loading
+                                    ]
+                                ])
+                            ]),
+                        _: 1
+                    })
+                ])
+            ], 64);
         };
     }
 });
-const TableSettingButton_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(TableSettingButtonvue_type_script_setup_true_lang_tsx, [
-    [
-        '__scopeId',
-        "data-v-27b372ad"
-    ]
-]);
-/* ESM default export */ const TableSettingButton = TableSettingButton_exports_;
+const composables_Table_exports_ = composables_Tablevue_type_script_setup_true_lang_tsx_name_Table;
+/* ESM default export */ const composables_Table = composables_Table_exports_;
 // 接受父组件参数，配置默认值
-/* ESM default export */ const TableContainervue_type_script_lang_ts_setup_true_name_ProTableContainer = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
+/* ESM default export */ const composables_TableContainervue_type_script_lang_ts_setup_true_name_ProTableContainer = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
     __name: 'TableContainer',
     props: {
         model: {
@@ -1576,9 +2384,9 @@ const TableSettingButton_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(T
             });
     }
 });
-const TableContainer_exports_ = TableContainervue_type_script_lang_ts_setup_true_name_ProTableContainer;
-/* ESM default export */ const TableContainer = TableContainer_exports_;
-/* ESM default export */ const Paginationvue_type_script_setup_true_lang_ts_name_Pagination = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
+const composables_TableContainer_exports_ = composables_TableContainervue_type_script_lang_ts_setup_true_name_ProTableContainer;
+/* ESM default export */ const composables_TableContainer = composables_TableContainer_exports_;
+/* ESM default export */ const composables_Paginationvue_type_script_setup_true_lang_ts_name_Pagination = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
     __name: 'Pagination',
     props: {
         pageInfo: {},
@@ -1611,18 +2419,17 @@ const TableContainer_exports_ = TableContainervue_type_script_lang_ts_setup_true
             ]));
     }
 });
-const Pagination_exports_ = Paginationvue_type_script_setup_true_lang_ts_name_Pagination;
-/* ESM default export */ const Pagination = Pagination_exports_;
-const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1 = {
+const composables_Pagination_exports_ = composables_Paginationvue_type_script_setup_true_lang_ts_name_Pagination;
+/* ESM default export */ const composables_Pagination = composables_Pagination_exports_;
+const pro_table_v2vue_type_script_lang_tsx_setup_true_name_ProTable_hoisted_1 = {
     class: "relative flex flex-1 flex-col overflow-hidden"
 };
-const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
+const pro_table_v2vue_type_script_lang_tsx_setup_true_name_ProTable_hoisted_2 = {
     key: 1,
     class: "mt-5 flex justify-between items-center"
 };
-const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_SELECTION = 'selection';
-// 接受父组件参数，配置默认值
-/* ESM default export */ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
+const pro_table_v2vue_type_script_lang_tsx_setup_true_name_ProTable_SELECTION = 'selection'; // 接受父组件参数，配置默认值
+/* ESM default export */ const pro_table_v2vue_type_script_lang_tsx_setup_true_name_ProTable = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
     __name: 'index',
     props: {
         columns: {
@@ -1704,38 +2511,26 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_SELECTION = 'sel
     ],
     setup (__props, { expose: __expose, emit: __emit }) {
         const props = __props;
+        const exportFileFlag = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(__WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO);
         let state = (0, __WEBPACK_EXTERNAL_MODULE_vue__.reactive)({
-            // 表格数据
             tableData: props.data,
             loading: false,
-            // 分页数据
             pageInfo: {
-                // 当前页数
                 pageNumber: 1,
-                // 每页显示条数
                 pageSize: 10,
-                // 总条数
                 total: 0
             }
         });
         const serveColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([]);
-        const columnTypes = [
-            'selection',
-            'radio',
-            'index',
-            'expand',
-            'sort'
-        ];
-        const tableSettingButtonRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(); //表格设置
-        const formRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
-        // 生成组件唯一id
-        const uuid = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)((0, __WEBPACK_EXTERNAL_MODULE_vue__.useId)());
-        // 定义 emit 事件
+        const formRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(); // 生成组件唯一id
+        const uuid = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)((0, __WEBPACK_EXTERNAL_MODULE_vue__.useId)()); // 定义 emit 事件
         const emit = __emit;
         const attrs = (0, __WEBPACK_EXTERNAL_MODULE_vue__.useAttrs)();
-        /**
+        const tableRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
+        const proTableRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>tableRef.value?.proTableRef); /**
    *获取参与排序的列表 索引 是否可以拖拽
-   */ function getDragSortData(newIndex, data, startIndexObj, sortData) {
+   */ 
+        function getDragSortData(newIndex, data, startIndexObj, sortData) {
             data.forEach((item, index)=>{
                 startIndexObj.startIndex += 1;
                 if (startIndexObj.startIndex > newIndex) return;
@@ -1747,10 +2542,10 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_SELECTION = 'sel
                 if (item?.[attrs?.['tree-props']?.children]) getDragSortData(newIndex, item?.[attrs?.['tree-props']?.children], startIndexObj, sortData);
             });
             return sortData;
-        }
-        /**
+        } /**
    * 获取拖拽排序数据结果
-   */ function getSortableResult(newIndex, oldIndex) {
+   */ 
+        function getSortableResult(newIndex, oldIndex) {
             let data = [
                 ...state.tableData
             ];
@@ -1781,11 +2576,12 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_SELECTION = 'sel
                 data.splice(newIndex, 0, removedItem);
             }
             return data;
-        }
-        /***
+        } /***
    * 表格拖拽排序
-   **/ const initDragSort = ()=>{
-            const tbody = document.querySelector(`#${uuid.value} tbody`);
+   **/ 
+        const initDragSort = ()=>{
+            const tbodyList = document.querySelectorAll(`#${uuid.value} tbody`);
+            const tbody = tbodyList[tbodyList.length - 1];
             let initialHTML = ''; //暂不支持跨层级拖拽
             if (tbody) __WEBPACK_EXTERNAL_MODULE_sortablejs__["default"].create(tbody, {
                 handle: '.cursor-move',
@@ -1795,14 +2591,12 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_SELECTION = 'sel
                 scrollSpeed: 10,
                 onEnd (evt) {
                     const { newIndex, oldIndex } = evt;
-                    if (newIndex === oldIndex || void 0 === newIndex || void 0 === oldIndex) return;
-                    //获取拖动后的排序
+                    if (newIndex === oldIndex || void 0 === newIndex || void 0 === oldIndex) return; //获取拖动后的排序
                     let data = getSortableResult(newIndex, oldIndex);
                     if (data.length) emit('drag-end', data);
                     else evt.from.innerHTML = initialHTML;
                 },
                 onStart (evt) {
-                    // 在拖拽开始时，记录当前容器的 HTML
                     initialHTML = evt.from.innerHTML;
                 }
             });
@@ -1815,11 +2609,14 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_SELECTION = 'sel
             let [, result] = await queryDbgridComponentByExample({
                 componentNo: props.componentNo || ''
             });
-            if (result?.success) try {
-                let column = result.data.dbgridSettingValue && JSON.parse(result.data.dbgridSettingValue) || [];
-                serveColumns.value = column;
-            } catch (error) {
-                console.log(error);
+            if (result?.success) {
+                exportFileFlag.value = result.data.exportFileFlag;
+                try {
+                    let column = result.data.dbgridSettingValue && JSON.parse(result.data.dbgridSettingValue) || [];
+                    serveColumns.value = column;
+                } catch (error) {
+                    console.log(error);
+                }
             }
         }
         (0, __WEBPACK_EXTERNAL_MODULE_vue__.watch)(()=>props.componentNo, ()=>{
@@ -1828,50 +2625,45 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_SELECTION = 'sel
             immediate: true
         });
         (0, __WEBPACK_EXTERNAL_MODULE_vue__.onMounted)(()=>{
-            // 支持拖拽排序
             if (props.draggable) (0, __WEBPACK_EXTERNAL_MODULE_vue__.nextTick)(()=>{
                 initDragSort();
             });
             if (props.pagination && props?.fetchData && props.defaultQuery) fetchList();
-        });
-        /**
+        }); /**
    * 获取列表
-   */ async function fetchList() {
+   */ 
+        async function fetchList() {
             state.loading = true;
             let { total = 0, data = [] } = await (props.fetchData && props.fetchData(state.pageInfo)) || {};
             state.pageInfo.total = Number(total);
             state.tableData = data;
             state.loading = false;
-        }
-        /**
+        } /**
    * 分页组件改变 pageNumber 事件
-   */ const handleSizeChange = (val)=>{
+   */ 
+        const handleSizeChange = (val)=>{
             if (props.fetchData) {
                 state.pageInfo.pageNumber = 1;
                 state.pageInfo.pageSize = val;
                 fetchList();
             } else emit('size-page-change', val);
-        };
-        /**
+        }; /**
    * 分页组件改变 当前页数 事件
-   */ function changeCurrentPage(val) {
+   */ 
+        function changeCurrentPage(val) {
             if (props.fetchData) {
                 state.pageInfo.pageNumber = val;
                 fetchList();
             } else emit('current-page-change', val);
         }
-        // 超级表格 ref
-        const proTableRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
-        const selections = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
-        // 设置当前行激活态
+        const selections = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(); // 设置当前行激活态
         const setCurrentRow = (row)=>{
             if (proTableRef.value) proTableRef.value.setCurrentRow(row);
-        };
-        // 分页配置信息
-        const paginationInfo = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>props.pageInfo ?? state.pageInfo);
-        /**
+        }; // 分页配置信息
+        const paginationInfo = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>props.pageInfo ?? state.pageInfo); /**
    * 支持根据传递的filterObj完成过滤
-   */ const tableData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
+   */ 
+        const tableData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
             if (Object.keys(props.filterObj).length) return [
                 ...state.tableData
             ].filter((item)=>Object.keys(props.filterObj).every((cur)=>!props.filterObj[cur] && [
@@ -1900,7 +2692,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_SELECTION = 'sel
                 }
             }),
             validateRow: (index, callback)=>{
-                const validateProps = props.columns.filter((item)=>item.rules).map((item)=>`tableData.${index}.${item.prop}`);
+                const validateProps = props.columns.filter((item)=>item.rules).map((item)=>`tableData.${index}.${String(item.dataKey)}`);
                 return formRef.value.validateField(validateProps, callback);
             },
             fetchList: (init = true, initPageInfo = {
@@ -1912,58 +2704,104 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_SELECTION = 'sel
                 };
                 fetchList();
             }
-        });
-        /**
+        }); /**
    * 处理接口和本地的columns
-   */ const commonColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
+   */ 
+        const commonColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
             if (!props.componentNo) return props.columns;
             {
                 let result = [
                     ...props.columns
                 ].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,
+                        displayFlag: cur.hidden || 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,
+                        align: cur.align || 'center',
                         ...cur
                     }));
                 if (serveColumns.value?.length) {
                     result = result.map((item, index)=>{
-                        let findObj = serveColumns.value.find((cur)=>cur.prop === item.prop) || {};
+                        let findObj = serveColumns.value.find((cur)=>cur.prop === item.dataKey);
                         return {
-                            displayFlag: item.isHidden ? __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO : __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.YES,
+                            displayFlag: item.hidden ? __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO : __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.YES,
                             ...item,
                             sort: index + 1,
                             ...findObj,
-                            label: item.label || findObj.label,
-                            isHidden: item.isHidden || findObj.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO
+                            title: item.title || findObj.label,
+                            hidden: item.hidden || findObj?.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO
                         };
                     });
                     result.sort((a, b)=>Number(a.sort) - Number(b.sort));
                 }
-                return result;
+                return result.map((item)=>({
+                        ...item,
+                        label: item.title,
+                        prop: item.dataKey,
+                        minWidth: item.minWidth || item.width,
+                        width: void 0
+                    }));
             }
         });
-        /**
+        function SelectionCell({ value, intermediate, onChange }) {
+            return (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElCheckbox, {
+                onChange: onChange,
+                modelValue: value,
+                indeterminate: intermediate
+            }, null, 8, [
+                "onChange",
+                "modelValue",
+                "indeterminate"
+            ]);
+        } /**
    * 表格渲染存在设置标志的情况 左边宽度加个40px
-   */ const tableColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
+   */ 
+        const tableColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
             let result = [
                 ...commonColumns.value
             ];
             if (props.componentNo) {
                 result = result.map((item, index)=>({
                         ...item,
+                        width: 0 === index ? (item.minWidth || 40) + 40 : item.minWidth,
                         minWidth: 0 === index ? (item.minWidth || 40) + 40 : item.minWidth
                     }));
-                if (tableSettingButtonRef?.value?.exportFileFlag && !result.find((cur)=>cur.type === pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_SELECTION)) result = [
+                if (exportFileFlag.value && !result.find((cur)=>cur.key === pro_table_v2vue_type_script_lang_tsx_setup_true_name_ProTable_SELECTION)) result = [
                     {
-                        type: pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_SELECTION,
-                        prop: pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_SELECTION
+                        key: pro_table_v2vue_type_script_lang_tsx_setup_true_name_ProTable_SELECTION,
+                        width: 100,
+                        align: 'center',
+                        cellRenderer: ({ rowData })=>{
+                            const onChange = (value)=>rowData.checked = value;
+                            return (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(SelectionCell, {
+                                value: rowData.checked,
+                                onChange: onChange
+                            }, null, 8, [
+                                "value",
+                                "onChange"
+                            ]);
+                        },
+                        headerCellRenderer: ()=>{
+                            const onChange = (value)=>state.tableData = state.tableData.map((row)=>{
+                                    row.checked = value;
+                                    return row;
+                                });
+                            const allSelected = !!state.tableData.length && state.tableData.every((row)=>row.checked);
+                            const containsChecked = state.tableData.some((row)=>row.checked);
+                            return (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(SelectionCell, {
+                                value: allSelected,
+                                intermediate: containsChecked && !allSelected,
+                                onChange: onChange
+                            }, null, 8, [
+                                "value",
+                                "intermediate",
+                                "onChange"
+                            ]);
+                        }
                     },
                     ...result
                 ];
             }
             return result.filter((item)=>!item.isHidden && !(props.componentNo && !serveColumns.value?.length && item.defaultDisplayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO));
         });
-        const selectedData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>proTableRef?.value?.getSelectionRows() || []);
-        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, [
+        return (_ctx, _cache)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("div", pro_table_v2vue_type_script_lang_tsx_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,
                     style: (0, __WEBPACK_EXTERNAL_MODULE_vue__.normalizeStyle)({
@@ -1976,7 +2814,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_SELECTION = 'sel
                         props.dragTipsClassName
                     ])
                 }, (0, __WEBPACK_EXTERNAL_MODULE_vue__.toDisplayString)(props.dragTips), 7)) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true),
-                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(TableContainer, {
+                (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(composables_TableContainer, {
                     ref_key: "formRef",
                     ref: formRef,
                     editable: _ctx.editable,
@@ -1984,116 +2822,42 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_SELECTION = 'sel
                     class: "flex flex-1 flex-col overflow-hidden"
                 }, {
                     default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
-                            props.componentNo ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)(TableSettingButton, {
-                                key: 0,
-                                "table-data": selectedData.value,
+                            (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(composables_Table, (0, __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps)({
+                                id: uuid.value,
+                                "export-file-flag": exportFileFlag.value,
                                 "component-no": props.componentNo,
                                 "columns-setting": props.columnsSetting,
-                                columns: commonColumns.value,
-                                ref_key: "tableSettingButtonRef",
-                                ref: tableSettingButtonRef,
-                                onSuccess: fetchDbgridComponent
-                            }, null, 8, [
-                                "table-data",
-                                "component-no",
-                                "columns-setting",
-                                "columns"
-                            ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true),
-                            (0, __WEBPACK_EXTERNAL_MODULE_vue__.withDirectives)(((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElTable), (0, __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps)({
-                                id: uuid.value,
-                                ref_key: "proTableRef",
-                                ref: proTableRef,
+                                loading: (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(state).loading || props.loading,
+                                onSuccess: fetchDbgridComponent,
+                                ref_key: "tableRef",
+                                ref: tableRef,
                                 data: tableData.value,
-                                style: {
-                                    width: "100%"
-                                },
-                                class: "min-h-0 flex-1 overflow-auto",
                                 "row-key": props.rowKey,
-                                "cell-class-name": ({ column })=>_ctx.draggable && 'operation' !== column.property ? 'cursor-move' : '',
-                                border: ""
-                            }, _ctx.$attrs), {
-                                default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
-                                        ((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)(tableColumns.value, (item, index)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, null, [
-                                                item?.type && columnTypes.includes(item.type) ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElTableColumn), (0, __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps)({
-                                                    key: 0,
-                                                    ref_for: true
-                                                }, item, {
-                                                    width: item.minWidth || item.width,
-                                                    key: item.prop ?? index,
-                                                    align: item.align ?? 'center',
-                                                    "reserve-selection": 'selection' == item.type
-                                                }), {
-                                                    default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)((scope)=>[
-                                                            'expand' == item.type ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, {
-                                                                key: 0
-                                                            }, [
-                                                                item.render ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveDynamicComponent)(item.render(scope.row, scope.$index, scope.expanded)), {
-                                                                    key: 0
-                                                                })) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.renderSlot)(_ctx.$slots, item.type, (0, __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps)({
-                                                                    key: 1,
-                                                                    ref_for: true
-                                                                }, scope))
-                                                            ], 64)) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true),
-                                                            'sort' == item.type ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElTag), {
-                                                                key: 1,
-                                                                class: "move"
-                                                            }, {
-                                                                default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
-                                                                        (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElIcon), null, {
-                                                                            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__.DCaret))
-                                                                                ]),
-                                                                            _: 1
-                                                                        })
-                                                                    ]),
-                                                                _: 1
-                                                            })) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true)
-                                                        ]),
-                                                    _: 2
-                                                }, 1040, [
-                                                    "width",
-                                                    "align",
-                                                    "reserve-selection"
-                                                ])) : ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(composables_TableColumn), {
-                                                    key: 1,
-                                                    column: item
-                                                }, (0, __WEBPACK_EXTERNAL_MODULE_vue__.createSlots)({
-                                                    _: 2
-                                                }, [
-                                                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.renderList)(Object.keys(_ctx.$slots), (slot)=>({
-                                                            name: slot,
-                                                            fn: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)((scope)=>[
-                                                                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.renderSlot)(_ctx.$slots, slot, (0, __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps)({
-                                                                        ref_for: true
-                                                                    }, scope))
-                                                                ])
-                                                        }))
-                                                ]), 1032, [
-                                                    "column"
-                                                ]))
-                                            ], 64))), 256))
-                                    ]),
-                                _: 3
-                            }, 16, [
+                                "common-columns": commonColumns.value,
+                                "table-columns": tableColumns.value
+                            }, _ctx.$attrs, {
+                                draggable: props.draggable
+                            }), null, 16, [
                                 "id",
+                                "export-file-flag",
+                                "component-no",
+                                "columns-setting",
+                                "loading",
                                 "data",
                                 "row-key",
-                                "cell-class-name"
-                            ])), [
-                                [
-                                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.vLoading),
-                                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(state).loading || props.loading
-                                ]
+                                "common-columns",
+                                "table-columns",
+                                "draggable"
                             ])
                         ]),
-                    _: 3
+                    _: 1
                 }, 8, [
                     "editable",
                     "model"
                 ]),
-                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, [
+                props.pagination ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("div", pro_table_v2vue_type_script_lang_tsx_setup_true_name_ProTable_hoisted_2, [
                     (0, __WEBPACK_EXTERNAL_MODULE_vue__.renderSlot)(_ctx.$slots, "pagination"),
-                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(Pagination, {
+                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)(composables_Pagination, {
                         class: "w-full flex justify-end",
                         layout: props.layout,
                         "page-info": paginationInfo.value,
@@ -2109,8 +2873,8 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_SELECTION = 'sel
             ]));
     }
 });
-const pro_table_exports_ = pro_tablevue_type_script_lang_ts_setup_true_name_ProTable;
-/* ESM default export */ const pro_table = pro_table_exports_;
+const pro_table_v2_exports_ = pro_table_v2vue_type_script_lang_tsx_setup_true_name_ProTable;
+/* ESM default export */ const pro_table_v2 = pro_table_v2_exports_;
 /**
  * 1-10115-1 根据条件查询菜单的检索方式列表（业务态）
  * @param params
@@ -2119,7 +2883,7 @@ const pro_table_exports_ = pro_tablevue_type_script_lang_ts_setup_true_name_ProT
 const queryBizDataList = (params)=>(0, __WEBPACK_EXTERNAL_MODULE__sun_toolkit_request__.basicRequest)("/bizsearch/queryBizDataListByExample", {
         ...params,
         pageSize: 100,
-        pageNum: 1
+        pageNumber: 1
     });
 /**
  * [4-10073-1] 根据业务标识获取Banner数据
@@ -3066,7 +3830,7 @@ const _hoisted_10 = {
     class: "mr-2"
 };
 const _hoisted_11 = {
-    class: "text-[#666666]"
+    class: "text-[#555]"
 };
 const _hoisted_12 = {
     class: "w-full"
@@ -3132,10 +3896,11 @@ const _hoisted_12 = {
         return (_ctx, _cache)=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.withDirectives)(((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("div", {
                 class: (0, __WEBPACK_EXTERNAL_MODULE_vue__.normalizeClass)([
                     {
-                        ['bg-table-header']: _ctx.isBg
+                        ['bg-fill-lighter']: _ctx.isBg
                     },
                     "flex px-[10px] py-2 text-base text-black items-center"
-                ])
+                ]),
+                style: (0, __WEBPACK_EXTERNAL_MODULE_vue__.normalizeStyle)(_ctx.isBg ? "border-top: 1px solid #dfebff" : '')
             }, [
                 (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementVNode)("div", BannerInfovue_type_script_setup_true_lang_ts_name_bannerComponent_hoisted_1, [
                     (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementVNode)("div", BannerInfovue_type_script_setup_true_lang_ts_name_bannerComponent_hoisted_2, [
@@ -3222,7 +3987,7 @@ const _hoisted_12 = {
                             ], 32)
                         ], 2))), 128))
                 ], 2)
-            ], 2)), [
+            ], 6)), [
                 [
                     (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.vLoading),
                     loading.value
@@ -4252,6 +5017,8 @@ const Title_exports_ = Titlevue_type_script_setup_true_lang_ts_name_sunTitle;
                 dataSearchBizIdTypeCode: props.dataSearchBizIdTypeCode || '',
                 keyWord: value,
                 sysMenuId: menuId || '',
+                pageNumber: 1,
+                pageSize: 100,
                 hospitalId: currentOrg?.orgId || '',
                 ...params
             });
@@ -4311,7 +5078,7 @@ const Title_exports_ = Titlevue_type_script_setup_true_lang_ts_name_sunTitle;
 const dict_select_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(dict_selectvue_type_script_setup_true_lang_ts, [
     [
         '__scopeId',
-        "data-v-665ba894"
+        "data-v-04804e6c"
     ]
 ]);
 /* ESM default export */ const dict_select = dict_select_exports_;
@@ -5251,13 +6018,13 @@ const Tablevue_type_script_setup_true_lang_tsx_hoisted_1 = {
         };
     }
 });
-const Table_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Tablevue_type_script_setup_true_lang_tsx, [
+const form_design_render_composables_Table_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Tablevue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
         "data-v-7c43a384"
     ]
 ]);
-/* ESM default export */ const Table = Table_exports_;
+/* ESM default export */ const form_design_render_composables_Table = form_design_render_composables_Table_exports_;
 /* ESM default export */ const Setvue_type_script_setup_true_lang_tsx_name_Set = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
     __name: 'Set',
     props: {
@@ -5421,7 +6188,7 @@ const Other_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Othervue_type_
         const dynamicRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)(null);
         const components = {
             [__WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.CONTROL_TYPE_CODE.COLLAPSE]: Collapse,
-            [__WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.CONTROL_TYPE_CODE.TABLE]: Table,
+            [__WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.CONTROL_TYPE_CODE.TABLE]: form_design_render_composables_Table,
             [__WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.CONTROL_TYPE_CODE.SET]: Set
         };
         __expose({
@@ -6255,4 +7022,4 @@ const invoicevue_type_script_setup_true_lang_ts_name_proInvoice_hoisted_4 = {
 const invoice_exports_ = invoicevue_type_script_setup_true_lang_ts_name_proInvoice;
 /* ESM default export */ const invoice = invoice_exports_;
 var __webpack_exports__COMPONENT_CODE = __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.COMPONENT_CODE;
-export { access_info as AccessInfo, BANNER_COMPONENT_CONFIG, BannerInfo, copy_text_with_tooltip as CopyTextWithTooltip, constant_DATA_SOURCE_CONTENT_TYPE_CODE as DATA_SOURCE_CONTENT_TYPE_CODE, dbgrid_component_setting as DbgridComponentSetting, dict_select as DictSelect, dml_button as DmlButton, flag_select as FlagSelect, form_design_render as FormDesignRender, FormUnit, hospital_select as HospitalSelect, patient_access as PatientAccess, PatientInfo, printReceiptBtn as PrintReceiptBtn, pro_dialog as ProDialog, pro_form as ProForm, invoice as ProInvoice, pro_table as ProTable, Title, convertToSpellNo, convertToWbNo, print, usePrintReceipt, __webpack_exports__COMPONENT_CODE as COMPONENT_CODE };
+export { access_info as AccessInfo, BANNER_COMPONENT_CONFIG, BannerInfo, copy_text_with_tooltip as CopyTextWithTooltip, constant_DATA_SOURCE_CONTENT_TYPE_CODE as DATA_SOURCE_CONTENT_TYPE_CODE, dbgrid_component_setting as DbgridComponentSetting, dict_select as DictSelect, dml_button as DmlButton, flag_select as FlagSelect, form_design_render as FormDesignRender, FormUnit, hospital_select as HospitalSelect, patient_access as PatientAccess, PatientInfo, printReceiptBtn as PrintReceiptBtn, pro_dialog as ProDialog, pro_form as ProForm, invoice as ProInvoice, pro_table as ProTable, pro_table_v2 as ProTableV2, Title, convertToSpellNo, convertToWbNo, print, usePrintReceipt, __webpack_exports__COMPONENT_CODE as COMPONENT_CODE };