sun-biz 0.0.4-beta.54 → 0.0.4-beta.56

package/dist/components/index.js

@@ -2331,6 +2331,10 @@ const Table_exports_ = Tablevue_type_script_setup_true_lang_tsx_name_Table;
 });
 const TableContainer_exports_ = TableContainervue_type_script_lang_ts_setup_true_name_ProTableContainer;
 /* ESM default export */ const TableContainer = TableContainer_exports_;
+const Paginationvue_type_script_setup_true_lang_ts_name_Pagination_hoisted_1 = {
+    key: 0,
+    class: "pagination-slot"
+};
 /* ESM default export */ const Paginationvue_type_script_setup_true_lang_ts_name_Pagination = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
     __name: 'Pagination',
     props: {
@@ -2341,30 +2345,82 @@ const TableContainer_exports_ = TableContainervue_type_script_lang_ts_setup_true
         },
         handleCurrentChange: {
             type: Function
+        },
+        layout: {},
+        enableCustomPageSize: {
+            type: Boolean
         }
     },
     setup (__props) {
+        const props = __props;
+        const pageSize = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)({
+            get: ()=>props.pageInfo.pageSize,
+            set: (val)=>{
+                const value = Number(val);
+                // 修改时只能录入正整数
+                if (Number.isInteger(value) && value > 0) props.handleSizeChange(value);
+            }
+        });
+        const computedLayout = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
+            if (props.enableCustomPageSize) return (props.layout ?? 'total, sizes, prev, pager, next').replace('sizes', 'slot');
+            return props.layout ?? 'total, sizes, prev, pager, next';
+        });
         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",
+                layout: computedLayout.value,
                 onSizeChange: _ctx.handleSizeChange,
                 onCurrentChange: _ctx.handleCurrentChange,
                 "set-scroll-top": 500,
                 background: ""
-            }, _ctx.$attrs), null, 16, [
+            }, _ctx.$attrs), {
+                default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
+                        props.enableCustomPageSize ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("span", Paginationvue_type_script_setup_true_lang_ts_name_Pagination_hoisted_1, [
+                            (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElSelect), {
+                                class: "size-select",
+                                modelValue: pageSize.value,
+                                "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event)=>pageSize.value = $event),
+                                filterable: "",
+                                "allow-create": "",
+                                "default-first-option": "",
+                                "reserve-keyword": false
+                            }, {
+                                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)(_ctx.pageSizes, (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), {
+                                                key: item,
+                                                label: item + '条/页',
+                                                value: item
+                                            }, null, 8, [
+                                                "label",
+                                                "value"
+                                            ]))), 128))
+                                    ]),
+                                _: 1
+                            }, 8, [
+                                "modelValue"
+                            ])
+                        ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true)
+                    ]),
+                _: 1
+            }, 16, [
                 "current-page",
                 "page-size",
                 "total",
                 "page-sizes",
+                "layout",
                 "onSizeChange",
                 "onCurrentChange"
             ]));
     }
 });
-const Pagination_exports_ = Paginationvue_type_script_setup_true_lang_ts_name_Pagination;
+const Pagination_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Paginationvue_type_script_setup_true_lang_ts_name_Pagination, [
+    [
+        '__scopeId',
+        "data-v-eb218d18"
+    ]
+]);
 /* 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"
@@ -2480,6 +2536,10 @@ const SELECTION = 'selection';
         scrollLoad: {
             type: Function,
             default: void 0
+        },
+        enableCustomPageSize: {
+            type: Boolean,
+            default: false
         }
     },
     emits: [
@@ -3065,11 +3125,13 @@ const SELECTION = 'selection';
                         "page-info": paginationInfo.value,
                         "page-sizes": props.pageSizes,
                         "handle-size-change": handleSizeChange,
-                        "handle-current-change": changeCurrentPage
+                        "handle-current-change": changeCurrentPage,
+                        "enable-custom-page-size": props.enableCustomPageSize
                     }, null, 8, [
                         "layout",
                         "page-info",
-                        "page-sizes"
+                        "page-sizes",
+                        "enable-custom-page-size"
                     ])
                 ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true)
             ]));
@@ -7271,7 +7333,8 @@ const CLOSE_OTHER_POPOVERS_EVENT = 'user-select:close-others'; /*
         allowSelectDisabledFlag: {}
     },
     emits: [
-        'change'
+        'change',
+        'update:modelValue'
     ],
     setup (__props, { expose: __expose, emit: __emit }) {
         const props = __props;
@@ -7336,23 +7399,6 @@ const CLOSE_OTHER_POPOVERS_EVENT = 'user-select:close-others'; /*
             deep: true,
             immediate: true
         });
-        (0, __WEBPACK_EXTERNAL_MODULE_vue__.watch)(()=>props.defaultValue, ()=>{
-            if (attrs.modelValue && Array.isArray(props.defaultValue) && props.defaultValue.length && !defaultSetTableSelected.value) {
-                const list = props.defaultValue.map((item)=>({
-                        ...item,
-                        userId: item.value || item.userId,
-                        userName: item.label || item.userName,
-                        value: item.value || item.userId,
-                        label: item.label || item.userName
-                    }));
-                userList.value = [
-                    ...list
-                ];
-            }
-        }, {
-            deep: true,
-            immediate: true
-        });
         (0, __WEBPACK_EXTERNAL_MODULE_vue__.watch)(()=>props.userJobCodes, (newVal, oldVal)=>{
             if (newVal && !(0, __WEBPACK_EXTERNAL_MODULE__sun_toolkit_shared__.isEqual)(oldVal, newVal)) initComponentData();
         });
@@ -7437,34 +7483,7 @@ const CLOSE_OTHER_POPOVERS_EVENT = 'user-select:close-others'; /*
                         ...item,
                         label: item.userName,
                         value: item.userId
-                    })); // 保留已选中的项，确保选中状态能正确回显
-                // 只有在非搜索状态下（没有关键字）才合并选中项，搜索时以搜索结果为准
-                const isSearch = !!data?.keyWord;
-                if (!isSearch && selectedRows.value?.length) {
-                    const selectedList = selectedRows.value.map((item)=>({
-                            ...item,
-                            userId: item.value || item.userId,
-                            userName: item.label || item.userName,
-                            value: item.value || item.userId,
-                            label: item.label || item.userName
-                        }));
-                    list = (0, __WEBPACK_EXTERNAL_MODULE_lodash__.uniqBy)([
-                        ...list,
-                        ...selectedList
-                    ], 'userId');
-                } else if (!isSearch && attrs.modelValue && Array.isArray(props.defaultValue) && props.defaultValue.length) {
-                    const defaultList = props.defaultValue.map((item)=>({
-                            ...item,
-                            userId: item.value || item.userId,
-                            userName: item.label || item.userName,
-                            value: item.value || item.userId,
-                            label: item.label || item.userName
-                        }));
-                    list = (0, __WEBPACK_EXTERNAL_MODULE_lodash__.uniqBy)([
-                        ...list,
-                        ...defaultList
-                    ], 'userId');
-                }
+                    }));
                 userList.value = list;
                 currentRowIndex.value = -1;
                 tableRef.value?.eleTable?.setCurrentRow?.(void 0);
@@ -7482,7 +7501,7 @@ const CLOSE_OTHER_POPOVERS_EVENT = 'user-select:close-others'; /*
         };
         const handleChange = ()=>{
             let value = selectedRows.value.map((item)=>item.value || item.userId);
-            if (attrs['onUpdate:modelValue']) attrs['onUpdate:modelValue'](props.multiSelectFlag ? value : value[0]);
+            emit('update:modelValue', props.multiSelectFlag ? value : value[0]);
             if (props.multiSelectFlag) emit('change', value, selectedRows.value);
             else {
                 const data = value[0] ? userList.value.find((item)=>item.value === value[0] || item.userId === value[0]) : void 0;
@@ -12002,7 +12021,7 @@ function useUpdateInvoiceFormConfig(options) {
             reasonLoading.value = true;
             const [, res] = await queryReasonList(constant_REASON_USE_SCOPE_CODE.ADJUST_NUMBER);
             reasonLoading.value = false;
-            if (res?.success) reasonList.value = res?.data;
+            if (res?.success) reasonList.value = res?.data?.filter((item)=>item.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES);
         };
         /** 提交 */ const confirmFn = async ()=>{
             const isValid = await formRef.value.ref.validate();

package/dist/components/pro-table/interface/index.d.ts

@@ -69,6 +69,8 @@ export interface PaginationProps {
     pageSizes: number[];
     handleSizeChange: (size: number) => void;
     handleCurrentChange: (currentPage: number) => void;
+    layout?: string;
+    enableCustomPageSize?: boolean;
 }
 export declare namespace Table {
     interface PageInfo {

package/dist/components/static/css/index.css

@@ -19,6 +19,13 @@
   background-color: #0000 !important;
 }
 
+.size-select[data-v-eb218d18] {
+  color: #606266;
+  width: 110px;
+  margin-left: 10px;
+  font-weight: 400;
+}
+
 .input[data-v-bf6cf296] .el-input__inner {
   cursor: pointer !important;
 }

package/dist/index.js

@@ -2367,6 +2367,10 @@ const Table_exports_ = Tablevue_type_script_setup_true_lang_tsx_name_Table;
 });
 const TableContainer_exports_ = TableContainervue_type_script_lang_ts_setup_true_name_ProTableContainer;
 /* ESM default export */ const TableContainer = TableContainer_exports_;
+const Paginationvue_type_script_setup_true_lang_ts_name_Pagination_hoisted_1 = {
+    key: 0,
+    class: "pagination-slot"
+};
 /* ESM default export */ const Paginationvue_type_script_setup_true_lang_ts_name_Pagination = /*@__PURE__*/ (0, __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent)({
     __name: 'Pagination',
     props: {
@@ -2377,30 +2381,82 @@ const TableContainer_exports_ = TableContainervue_type_script_lang_ts_setup_true
         },
         handleCurrentChange: {
             type: Function
+        },
+        layout: {},
+        enableCustomPageSize: {
+            type: Boolean
         }
     },
     setup (__props) {
+        const props = __props;
+        const pageSize = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)({
+            get: ()=>props.pageInfo.pageSize,
+            set: (val)=>{
+                const value = Number(val);
+                // 修改时只能录入正整数
+                if (Number.isInteger(value) && value > 0) props.handleSizeChange(value);
+            }
+        });
+        const computedLayout = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
+            if (props.enableCustomPageSize) return (props.layout ?? 'total, sizes, prev, pager, next').replace('sizes', 'slot');
+            return props.layout ?? 'total, sizes, prev, pager, next';
+        });
         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",
+                layout: computedLayout.value,
                 onSizeChange: _ctx.handleSizeChange,
                 onCurrentChange: _ctx.handleCurrentChange,
                 "set-scroll-top": 500,
                 background: ""
-            }, _ctx.$attrs), null, 16, [
+            }, _ctx.$attrs), {
+                default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
+                        props.enableCustomPageSize ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementBlock)("span", Paginationvue_type_script_setup_true_lang_ts_name_Pagination_hoisted_1, [
+                            (0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(__WEBPACK_EXTERNAL_MODULE_element_sun__.ElSelect), {
+                                class: "size-select",
+                                modelValue: pageSize.value,
+                                "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event)=>pageSize.value = $event),
+                                filterable: "",
+                                "allow-create": "",
+                                "default-first-option": "",
+                                "reserve-keyword": false
+                            }, {
+                                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)(_ctx.pageSizes, (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), {
+                                                key: item,
+                                                label: item + '条/页',
+                                                value: item
+                                            }, null, 8, [
+                                                "label",
+                                                "value"
+                                            ]))), 128))
+                                    ]),
+                                _: 1
+                            }, 8, [
+                                "modelValue"
+                            ])
+                        ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true)
+                    ]),
+                _: 1
+            }, 16, [
                 "current-page",
                 "page-size",
                 "total",
                 "page-sizes",
+                "layout",
                 "onSizeChange",
                 "onCurrentChange"
             ]));
     }
 });
-const Pagination_exports_ = Paginationvue_type_script_setup_true_lang_ts_name_Pagination;
+const Pagination_exports_ = /*#__PURE__*/ (0, exportHelper["default"])(Paginationvue_type_script_setup_true_lang_ts_name_Pagination, [
+    [
+        '__scopeId',
+        "data-v-eb218d18"
+    ]
+]);
 /* 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"
@@ -2516,6 +2572,10 @@ const SELECTION = 'selection';
         scrollLoad: {
             type: Function,
             default: void 0
+        },
+        enableCustomPageSize: {
+            type: Boolean,
+            default: false
         }
     },
     emits: [
@@ -3101,11 +3161,13 @@ const SELECTION = 'selection';
                         "page-info": paginationInfo.value,
                         "page-sizes": props.pageSizes,
                         "handle-size-change": handleSizeChange,
-                        "handle-current-change": changeCurrentPage
+                        "handle-current-change": changeCurrentPage,
+                        "enable-custom-page-size": props.enableCustomPageSize
                     }, null, 8, [
                         "layout",
                         "page-info",
-                        "page-sizes"
+                        "page-sizes",
+                        "enable-custom-page-size"
                     ])
                 ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true)
             ]));
@@ -7940,7 +8002,8 @@ const CLOSE_OTHER_POPOVERS_EVENT = 'user-select:close-others'; /*
         allowSelectDisabledFlag: {}
     },
     emits: [
-        'change'
+        'change',
+        'update:modelValue'
     ],
     setup (__props, { expose: __expose, emit: __emit }) {
         const props = __props;
@@ -8005,23 +8068,6 @@ const CLOSE_OTHER_POPOVERS_EVENT = 'user-select:close-others'; /*
             deep: true,
             immediate: true
         });
-        (0, __WEBPACK_EXTERNAL_MODULE_vue__.watch)(()=>props.defaultValue, ()=>{
-            if (attrs.modelValue && Array.isArray(props.defaultValue) && props.defaultValue.length && !defaultSetTableSelected.value) {
-                const list = props.defaultValue.map((item)=>({
-                        ...item,
-                        userId: item.value || item.userId,
-                        userName: item.label || item.userName,
-                        value: item.value || item.userId,
-                        label: item.label || item.userName
-                    }));
-                userList.value = [
-                    ...list
-                ];
-            }
-        }, {
-            deep: true,
-            immediate: true
-        });
         (0, __WEBPACK_EXTERNAL_MODULE_vue__.watch)(()=>props.userJobCodes, (newVal, oldVal)=>{
             if (newVal && !(0, __WEBPACK_EXTERNAL_MODULE__sun_toolkit_shared__.isEqual)(oldVal, newVal)) initComponentData();
         });
@@ -8106,34 +8152,7 @@ const CLOSE_OTHER_POPOVERS_EVENT = 'user-select:close-others'; /*
                         ...item,
                         label: item.userName,
                         value: item.userId
-                    })); // 保留已选中的项，确保选中状态能正确回显
-                // 只有在非搜索状态下（没有关键字）才合并选中项，搜索时以搜索结果为准
-                const isSearch = !!data?.keyWord;
-                if (!isSearch && selectedRows.value?.length) {
-                    const selectedList = selectedRows.value.map((item)=>({
-                            ...item,
-                            userId: item.value || item.userId,
-                            userName: item.label || item.userName,
-                            value: item.value || item.userId,
-                            label: item.label || item.userName
-                        }));
-                    list = (0, __WEBPACK_EXTERNAL_MODULE_lodash__.uniqBy)([
-                        ...list,
-                        ...selectedList
-                    ], 'userId');
-                } else if (!isSearch && attrs.modelValue && Array.isArray(props.defaultValue) && props.defaultValue.length) {
-                    const defaultList = props.defaultValue.map((item)=>({
-                            ...item,
-                            userId: item.value || item.userId,
-                            userName: item.label || item.userName,
-                            value: item.value || item.userId,
-                            label: item.label || item.userName
-                        }));
-                    list = (0, __WEBPACK_EXTERNAL_MODULE_lodash__.uniqBy)([
-                        ...list,
-                        ...defaultList
-                    ], 'userId');
-                }
+                    }));
                 userList.value = list;
                 currentRowIndex.value = -1;
                 tableRef.value?.eleTable?.setCurrentRow?.(void 0);
@@ -8151,7 +8170,7 @@ const CLOSE_OTHER_POPOVERS_EVENT = 'user-select:close-others'; /*
         };
         const handleChange = ()=>{
             let value = selectedRows.value.map((item)=>item.value || item.userId);
-            if (attrs['onUpdate:modelValue']) attrs['onUpdate:modelValue'](props.multiSelectFlag ? value : value[0]);
+            emit('update:modelValue', props.multiSelectFlag ? value : value[0]);
             if (props.multiSelectFlag) emit('change', value, selectedRows.value);
             else {
                 const data = value[0] ? userList.value.find((item)=>item.value === value[0] || item.userId === value[0]) : void 0;
@@ -10837,7 +10856,7 @@ const Title_exports_ = Titlevue_type_script_setup_true_lang_ts_name_sunTitle;
             reasonLoading.value = true;
             const [, res] = await queryReasonList(constant_REASON_USE_SCOPE_CODE.ADJUST_NUMBER);
             reasonLoading.value = false;
-            if (res?.success) reasonList.value = res?.data;
+            if (res?.success) reasonList.value = res?.data?.filter((item)=>item.displayFlag === __WEBPACK_EXTERNAL_MODULE__sun_toolkit_enums__.FLAG.YES);
         };
         /** 提交 */ const confirmFn = async ()=>{
             const isValid = await formRef.value.ref.validate();

package/dist/static/css/index.css

@@ -19,6 +19,13 @@
   background-color: #0000 !important;
 }
 
+.size-select[data-v-eb218d18] {
+  color: #606266;
+  width: 110px;
+  margin-left: 10px;
+  font-weight: 400;
+}
+
 
 
 .disabled-user-tooltip, .disabled-user-tooltip .el-tooltip__trigger {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sun-biz",
-  "version": "0.0.4-beta.54",
+  "version": "0.0.4-beta.56",
   "type": "module",
   "workspaces": [
     "src/*",