sun-biz 0.0.3-beta.7 → 0.0.3-beta.9

package/dist/components/index.js

@@ -460,6 +460,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 类型
 function useTableConfigColumn(changeInputSort, length, disabledDraggable) {
     const changeSort = debounce(changeInputSort, 1200);
     return [
@@ -485,6 +486,7 @@ function useTableConfigColumn(changeInputSort, length, disabledDraggable) {
                     'false-label': 0,
                     size: 'small',
                     modelValue: row.displayFlag,
+                    disabled: row.type === SELECTION,
                     'onUpdate:modelValue': (value)=>row.displayFlag = value
                 })
         },
@@ -496,6 +498,7 @@ function useTableConfigColumn(changeInputSort, length, disabledDraggable) {
                     maxLength: 16,
                     'controls-position': 'right',
                     modelValue: row.minWidth,
+                    disabled: row.type === SELECTION,
                     'onUpdate:modelValue': (value)=>row.minWidth = value,
                     size: 'small',
                     placeholder: '请输入列宽 (最小值)'
@@ -510,7 +513,7 @@ function useTableConfigColumn(changeInputSort, length, disabledDraggable) {
                     min: 0,
                     'controls-position': 'right',
                     modelValue: row.sort,
-                    disabled: disabledDraggable.value,
+                    disabled: disabledDraggable.value || row.type === SELECTION,
                     'onUpdate:modelValue': (value)=>row.sort = value,
                     onInput: (sort)=>{
                         changeSort(index, sort);
@@ -924,7 +927,10 @@ const _hoisted_3 = {
             });
             sourceData.value.sort((a, b)=>a.sort - b.sort);
         });
-        const tableColumn = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>sourceData.value.filter((item)=>item.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.YES));
+        const tableColumn = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>sourceData.value.map((item)=>({
+                    ...item,
+                    isHidden: item.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO
+                })));
         function changeSourceData(data) {
             sourceData.value = data;
         }
@@ -1176,7 +1182,7 @@ const _hoisted_3 = {
 const dbgrid_component_setting_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(dbgrid_component_settingvue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-2753b83c"
+        "data-v-a19d408c"
     ]
 ]);
 /* ESM default export */ const dbgrid_component_setting = dbgrid_component_setting_exports_;
@@ -1197,7 +1203,7 @@ const EXPORT_FILE = 'export-file';
     emits: [
         'success'
     ],
-    setup (__props, { emit: __emit }) {
+    setup (__props, { expose: __expose, emit: __emit }) {
         const columnsSettingRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
         const dataSetList = use_fetch_dataset_useFetchDataset([
             FILE_TYPE_CODE
@@ -1270,6 +1276,9 @@ const EXPORT_FILE = 'export-file';
             exportFile(value[0]);
         }
         const exportFileFlag = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>columnsSettingRef.value?.exportFileFlag);
+        __expose({
+            exportFileFlag
+        });
         return (_ctx, _cache)=>{
             const _component_Setting = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("Setting");
             const _component_el_icon = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-icon");
@@ -1327,7 +1336,7 @@ const EXPORT_FILE = 'export-file';
 const TableSettingButton_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(TableSettingButtonvue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-6705b56b"
+        "data-v-52eaeaae"
     ]
 ]);
 /* ESM default export */ const TableSettingButton = TableSettingButton_exports_;
@@ -1418,6 +1427,7 @@ const pro_tablevue_type_script_lang_ts_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)({
     __name: 'index',
@@ -1436,7 +1446,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
             default: void 0
         },
         componentNo: {
-            default: ""
+            default: ''
         },
         fetchData: {
             type: Function,
@@ -1455,8 +1465,12 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
             type: Boolean,
             default: false
         },
+        defaultQuery: {
+            type: Boolean,
+            default: true
+        },
         rowKey: {
-            default: "id"
+            default: 'id'
         },
         loading: {
             type: Boolean,
@@ -1474,10 +1488,10 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
             default: ()=>({})
         },
         layout: {
-            default: "total, sizes, prev, pager, next"
+            default: 'total, sizes, prev, pager, next'
         },
         dragTips: {
-            default: "温馨提示：您可通过拖动进行排序"
+            default: '温馨提示：您可通过拖动进行排序'
         },
         isShowDragTips: {
             type: Boolean,
@@ -1487,7 +1501,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
             default: {}
         },
         dragTipsClassName: {
-            default: ""
+            default: ''
         }
     },
     emits: [
@@ -1513,12 +1527,13 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
         });
         const serveColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([]);
         const columnTypes = [
-            "selection",
-            "radio",
-            "index",
-            "expand",
-            "sort"
+            '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)());
@@ -1536,7 +1551,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
                     sortData.curData = item;
                     sortData.result = data;
                 }
-                if (item?.[attrs?.["tree-props"]?.children]) getDragSortData(newIndex, item?.[attrs?.["tree-props"]?.children], startIndexObj, sortData);
+                if (item?.[attrs?.['tree-props']?.children]) getDragSortData(newIndex, item?.[attrs?.['tree-props']?.children], startIndexObj, sortData);
             });
             return sortData;
         }
@@ -1546,7 +1561,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
             let data = [
                 ...state.tableData
             ];
-            if (attrs?.["tree-props"]) {
+            if (attrs?.['tree-props']) {
                 let { result, curIndex: newCurIndex, curData: newCurData } = getDragSortData(newIndex, data, {
                     startIndex: -1
                 }, {
@@ -1562,7 +1577,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
                     curData: {}
                 });
                 if (newCurData.belongGroupElementId !== oldCurData.belongGroupElementId) {
-                    __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.warning("暂不支持跨层级拖拽配置");
+                    __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.warning('暂不支持跨层级拖拽配置');
                     return [];
                 }
                 const [removedItem] = result.splice(oldCurIndex, 1);
@@ -1578,16 +1593,16 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
  * 表格拖拽排序
  **/ const initDragSort = ()=>{
             const tbody = document.querySelector(`#${uuid.value} tbody`);
-            let initialHTML = ""; //暂不支持跨层级拖拽
+            let initialHTML = ''; //暂不支持跨层级拖拽
             if (tbody) __WEBPACK_EXTERNAL_MODULE_sortablejs__["default"].create(tbody, {
-                handle: ".cursor-move",
+                handle: '.cursor-move',
                 animation: 300,
                 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);
+                    if (data.length) emit('drag-end', data);
                     else evt.from.innerHTML = initialHTML;
                 },
                 onStart (evt) {
@@ -1602,7 +1617,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
         });
         async function fetchDbgridComponent() {
             let [, result] = await queryDbgridComponentByExample({
-                componentNo: props.componentNo || ""
+                componentNo: props.componentNo || ''
             });
             if (result?.success) try {
                 let column = result.data.dbgridSettingValue && JSON.parse(result.data.dbgridSettingValue) || [];
@@ -1621,7 +1636,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
             if (props.draggable) (0, __WEBPACK_EXTERNAL_MODULE_vue__.nextTick)(()=>{
                 initDragSort();
             });
-            if (props.pagination && props?.fetchData) fetchList();
+            if (props.pagination && props?.fetchData && props.defaultQuery) fetchList();
         });
         /**
  * 获取列表
@@ -1639,7 +1654,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
                 state.pageInfo.pageNumber = 1;
                 state.pageInfo.pageSize = val;
                 fetchList();
-            } else emit("size-page-change", val);
+            } else emit('size-page-change', val);
         };
         /**
  * 分页组件改变 当前页数 事件
@@ -1647,7 +1662,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
             if (props.fetchData) {
                 state.pageInfo.pageNumber = val;
                 fetchList();
-            } else emit("current-page-change", val);
+            } else emit('current-page-change', val);
         }
         // 超级表格 ref
         const proTableRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
@@ -1664,7 +1679,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
             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]));
@@ -1704,31 +1719,54 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
         });
         /**
  * 处理接口和本地的columns
- */ const tableColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
+ */ const commonColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
             if (!props.componentNo) return props.columns;
             {
-                if (!serveColumns.value?.length) return props.columns.map((cur)=>({
+                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
                     }));
-                let curColumns = [
-                    ...props.columns
-                ];
-                curColumns = curColumns.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,
+                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,
-                        sort: index + 1,
-                        ...findObj,
-                        isHidden: item.isHidden || findObj.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO
-                    };
-                });
-                curColumns.sort((a, b)=>Number(a.sort) - Number(b.sort));
-                return curColumns;
+                        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 = [
+                    {
+                        type: pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_SELECTION,
+                        prop: pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_SELECTION
+                    },
+                    ...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());
+        const selectedData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>proTableRef?.value?.getSelectionRows() || []);
         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)("div", pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1, [
@@ -1757,7 +1795,9 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
                                 "table-data": selectedData.value,
                                 "component-no": props.componentNo,
                                 "columns-setting": props.columnsSetting,
-                                columns: tableColumns.value,
+                                columns: commonColumns.value,
+                                ref_key: "tableSettingButtonRef",
+                                ref: tableSettingButtonRef,
                                 onSuccess: fetchDbgridComponent
                             }, null, 8, [
                                 "table-data",
@@ -1779,13 +1819,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
                                 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.filter((item)=>{
-                                            /**
-             * defaultDisplayFlag: 默认显示标识，0：不显示，1：显示
-             * serveColumns ：服务端返回的列配置
-             */ if (props.componentNo && !serveColumns.value.length && item.defaultDisplayFlag === (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG).NO) return false;
-                                            return !item.isHidden;
-                                        }), (item, index)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, null, [
+                                        ((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
@@ -4408,7 +4442,7 @@ const WB_NO = "wbNo";
         const isInlineMode = "inline" === props.layoutMode;
         const formRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
         const itemRefs = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
-        const formModel = (0, __WEBPACK_EXTERNAL_MODULE_vue__.reactive)(getFormModel(configData.value));
+        const formModel = (0, __WEBPACK_EXTERNAL_MODULE_vue__.reactive)(getFormModel(props.data));
         const model = (0, __WEBPACK_EXTERNAL_MODULE_vue__.useModel)(__props, "modelValue");
         const rules = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>getFormRules(configData.value));
         const emit = __emit;
@@ -4501,7 +4535,9 @@ const WB_NO = "wbNo";
                                             ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true),
                                             item?.render ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveDynamicComponent)(item.render()), (0, __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps)({
                                                 key: 1,
-                                                ref_for: true
+                                                ref_for: true,
+                                                ref_key: "itemRefs",
+                                                ref: itemRefs
                                             }, item.extraProps || {}, {
                                                 modelValue: formModel[item.name],
                                                 "onUpdate:modelValue": ($event)=>formModel[item.name] = $event,

package/dist/index.js

@@ -461,6 +461,7 @@ function useFetchDataset(codeSystemCodes, enabledFlag) {
  * @param params
  * @returns
  */ const exportData2File = (params)=>(0, __WEBPACK_EXTERNAL_MODULE__sun_toolkit_request__.basicRequest)('/untils/exportData2File', params);
+const SELECTION = 'selection'; // 定义 CheckboxValueType 类型
 function useTableConfigColumn(changeInputSort, length, disabledDraggable) {
     const changeSort = debounce(changeInputSort, 1200);
     return [
@@ -486,6 +487,7 @@ function useTableConfigColumn(changeInputSort, length, disabledDraggable) {
                     'false-label': 0,
                     size: 'small',
                     modelValue: row.displayFlag,
+                    disabled: row.type === SELECTION,
                     'onUpdate:modelValue': (value)=>row.displayFlag = value
                 })
         },
@@ -497,6 +499,7 @@ function useTableConfigColumn(changeInputSort, length, disabledDraggable) {
                     maxLength: 16,
                     'controls-position': 'right',
                     modelValue: row.minWidth,
+                    disabled: row.type === SELECTION,
                     'onUpdate:modelValue': (value)=>row.minWidth = value,
                     size: 'small',
                     placeholder: '请输入列宽 (最小值)'
@@ -511,7 +514,7 @@ function useTableConfigColumn(changeInputSort, length, disabledDraggable) {
                     min: 0,
                     'controls-position': 'right',
                     modelValue: row.sort,
-                    disabled: disabledDraggable.value,
+                    disabled: disabledDraggable.value || row.type === SELECTION,
                     'onUpdate:modelValue': (value)=>row.sort = value,
                     onInput: (sort)=>{
                         changeSort(index, sort);
@@ -925,7 +928,10 @@ const _hoisted_3 = {
             });
             sourceData.value.sort((a, b)=>a.sort - b.sort);
         });
-        const tableColumn = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>sourceData.value.filter((item)=>item.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.YES));
+        const tableColumn = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>sourceData.value.map((item)=>({
+                    ...item,
+                    isHidden: item.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO
+                })));
         function changeSourceData(data) {
             sourceData.value = data;
         }
@@ -1177,7 +1183,7 @@ const _hoisted_3 = {
 const dbgrid_component_setting_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(dbgrid_component_settingvue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-2753b83c"
+        "data-v-a19d408c"
     ]
 ]);
 /* ESM default export */ const dbgrid_component_setting = dbgrid_component_setting_exports_;
@@ -1198,7 +1204,7 @@ const EXPORT_FILE = 'export-file';
     emits: [
         'success'
     ],
-    setup (__props, { emit: __emit }) {
+    setup (__props, { expose: __expose, emit: __emit }) {
         const columnsSettingRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
         const dataSetList = useFetchDataset([
             FILE_TYPE_CODE
@@ -1271,6 +1277,9 @@ const EXPORT_FILE = 'export-file';
             exportFile(value[0]);
         }
         const exportFileFlag = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>columnsSettingRef.value?.exportFileFlag);
+        __expose({
+            exportFileFlag
+        });
         return (_ctx, _cache)=>{
             const _component_Setting = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("Setting");
             const _component_el_icon = (0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveComponent)("el-icon");
@@ -1328,7 +1337,7 @@ const EXPORT_FILE = 'export-file';
 const TableSettingButton_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(TableSettingButtonvue_type_script_setup_true_lang_tsx, [
     [
         '__scopeId',
-        "data-v-6705b56b"
+        "data-v-52eaeaae"
     ]
 ]);
 /* ESM default export */ const TableSettingButton = TableSettingButton_exports_;
@@ -1419,6 +1428,7 @@ const pro_tablevue_type_script_lang_ts_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)({
     __name: 'index',
@@ -1437,7 +1447,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
             default: void 0
         },
         componentNo: {
-            default: ""
+            default: ''
         },
         fetchData: {
             type: Function,
@@ -1456,8 +1466,12 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
             type: Boolean,
             default: false
         },
+        defaultQuery: {
+            type: Boolean,
+            default: true
+        },
         rowKey: {
-            default: "id"
+            default: 'id'
         },
         loading: {
             type: Boolean,
@@ -1475,10 +1489,10 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
             default: ()=>({})
         },
         layout: {
-            default: "total, sizes, prev, pager, next"
+            default: 'total, sizes, prev, pager, next'
         },
         dragTips: {
-            default: "温馨提示：您可通过拖动进行排序"
+            default: '温馨提示：您可通过拖动进行排序'
         },
         isShowDragTips: {
             type: Boolean,
@@ -1488,7 +1502,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
             default: {}
         },
         dragTipsClassName: {
-            default: ""
+            default: ''
         }
     },
     emits: [
@@ -1514,12 +1528,13 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
         });
         const serveColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)([]);
         const columnTypes = [
-            "selection",
-            "radio",
-            "index",
-            "expand",
-            "sort"
+            '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)());
@@ -1537,7 +1552,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
                     sortData.curData = item;
                     sortData.result = data;
                 }
-                if (item?.[attrs?.["tree-props"]?.children]) getDragSortData(newIndex, item?.[attrs?.["tree-props"]?.children], startIndexObj, sortData);
+                if (item?.[attrs?.['tree-props']?.children]) getDragSortData(newIndex, item?.[attrs?.['tree-props']?.children], startIndexObj, sortData);
             });
             return sortData;
         }
@@ -1547,7 +1562,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
             let data = [
                 ...state.tableData
             ];
-            if (attrs?.["tree-props"]) {
+            if (attrs?.['tree-props']) {
                 let { result, curIndex: newCurIndex, curData: newCurData } = getDragSortData(newIndex, data, {
                     startIndex: -1
                 }, {
@@ -1563,7 +1578,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
                     curData: {}
                 });
                 if (newCurData.belongGroupElementId !== oldCurData.belongGroupElementId) {
-                    __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.warning("暂不支持跨层级拖拽配置");
+                    __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.warning('暂不支持跨层级拖拽配置');
                     return [];
                 }
                 const [removedItem] = result.splice(oldCurIndex, 1);
@@ -1579,16 +1594,16 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
  * 表格拖拽排序
  **/ const initDragSort = ()=>{
             const tbody = document.querySelector(`#${uuid.value} tbody`);
-            let initialHTML = ""; //暂不支持跨层级拖拽
+            let initialHTML = ''; //暂不支持跨层级拖拽
             if (tbody) __WEBPACK_EXTERNAL_MODULE_sortablejs__["default"].create(tbody, {
-                handle: ".cursor-move",
+                handle: '.cursor-move',
                 animation: 300,
                 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);
+                    if (data.length) emit('drag-end', data);
                     else evt.from.innerHTML = initialHTML;
                 },
                 onStart (evt) {
@@ -1603,7 +1618,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
         });
         async function fetchDbgridComponent() {
             let [, result] = await queryDbgridComponentByExample({
-                componentNo: props.componentNo || ""
+                componentNo: props.componentNo || ''
             });
             if (result?.success) try {
                 let column = result.data.dbgridSettingValue && JSON.parse(result.data.dbgridSettingValue) || [];
@@ -1622,7 +1637,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
             if (props.draggable) (0, __WEBPACK_EXTERNAL_MODULE_vue__.nextTick)(()=>{
                 initDragSort();
             });
-            if (props.pagination && props?.fetchData) fetchList();
+            if (props.pagination && props?.fetchData && props.defaultQuery) fetchList();
         });
         /**
  * 获取列表
@@ -1640,7 +1655,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
                 state.pageInfo.pageNumber = 1;
                 state.pageInfo.pageSize = val;
                 fetchList();
-            } else emit("size-page-change", val);
+            } else emit('size-page-change', val);
         };
         /**
  * 分页组件改变 当前页数 事件
@@ -1648,7 +1663,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
             if (props.fetchData) {
                 state.pageInfo.pageNumber = val;
                 fetchList();
-            } else emit("current-page-change", val);
+            } else emit('current-page-change', val);
         }
         // 超级表格 ref
         const proTableRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
@@ -1665,7 +1680,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
             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]));
@@ -1705,31 +1720,54 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
         });
         /**
  * 处理接口和本地的columns
- */ const tableColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
+ */ const commonColumns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
             if (!props.componentNo) return props.columns;
             {
-                if (!serveColumns.value?.length) return props.columns.map((cur)=>({
+                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
                     }));
-                let curColumns = [
-                    ...props.columns
-                ];
-                curColumns = curColumns.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,
+                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,
-                        sort: index + 1,
-                        ...findObj,
-                        isHidden: item.isHidden || findObj.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG.NO
-                    };
-                });
-                curColumns.sort((a, b)=>Number(a.sort) - Number(b.sort));
-                return curColumns;
+                        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 = [
+                    {
+                        type: pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_SELECTION,
+                        prop: pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_SELECTION
+                    },
+                    ...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());
+        const selectedData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>proTableRef?.value?.getSelectionRows() || []);
         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)("div", pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_1, [
@@ -1758,7 +1796,9 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
                                 "table-data": selectedData.value,
                                 "component-no": props.componentNo,
                                 "columns-setting": props.columnsSetting,
-                                columns: tableColumns.value,
+                                columns: commonColumns.value,
+                                ref_key: "tableSettingButtonRef",
+                                ref: tableSettingButtonRef,
                                 onSuccess: fetchDbgridComponent
                             }, null, 8, [
                                 "table-data",
@@ -1780,13 +1820,7 @@ const pro_tablevue_type_script_lang_ts_setup_true_name_ProTable_hoisted_2 = {
                                 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.filter((item)=>{
-                                            /**
-             * defaultDisplayFlag: 默认显示标识，0：不显示，1：显示
-             * serveColumns ：服务端返回的列配置
-             */ if (props.componentNo && !serveColumns.value.length && item.defaultDisplayFlag === (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.ENABLED_FLAG).NO) return false;
-                                            return !item.isHidden;
-                                        }), (item, index)=>((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)(__WEBPACK_EXTERNAL_MODULE_vue__.Fragment, null, [
+                                        ((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
@@ -5022,7 +5056,7 @@ const WB_NO = "wbNo";
         const isInlineMode = "inline" === props.layoutMode;
         const formRef = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
         const itemRefs = (0, __WEBPACK_EXTERNAL_MODULE_vue__.ref)();
-        const formModel = (0, __WEBPACK_EXTERNAL_MODULE_vue__.reactive)(getFormModel(configData.value));
+        const formModel = (0, __WEBPACK_EXTERNAL_MODULE_vue__.reactive)(getFormModel(props.data));
         const model = (0, __WEBPACK_EXTERNAL_MODULE_vue__.useModel)(__props, "modelValue");
         const rules = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>getFormRules(configData.value));
         const emit = __emit;
@@ -5115,7 +5149,9 @@ const WB_NO = "wbNo";
                                             ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true),
                                             item?.render ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.resolveDynamicComponent)(item.render()), (0, __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps)({
                                                 key: 1,
-                                                ref_for: true
+                                                ref_for: true,
+                                                ref_key: "itemRefs",
+                                                ref: itemRefs
                                             }, item.extraProps || {}, {
                                                 modelValue: formModel[item.name],
                                                 "onUpdate:modelValue": ($event)=>formModel[item.name] = $event,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sun-biz",
-  "version": "0.0.3-beta.7",
+  "version": "0.0.3-beta.9",
   "type": "module",
   "workspaces": [
     "src/*",