sun-biz 0.0.4-beta.8 → 0.0.4-beta.9

package/dist/components/index.js

@@ -786,16 +786,39 @@ const _hoisted_3 = {
             props.changeSourceData(result);
         }
         function changeInputSort(flag, sort) {
-            let data = [
+            const currentRow = tableData.value[flag];
+            if (!currentRow) return; // 创建新的排序数组
+            let newData = [
                 ...tableData.value
+            ]; // 移除当前项
+            newData = newData.filter((item)=>item.prop !== currentRow.prop); // 在指定位置插入当前项
+            const insertIndex = Math.min(sort - 1, newData.length);
+            newData.splice(insertIndex, 0, currentRow); // 重新分配排序值
+            newData = newData.map((item, index)=>({
+                    ...item,
+                    ascendSort: index + 1
+                })); // 更新原始数据
+            let result = [
+                ...props.data
             ];
-            let findObj = data.find((item, index)=>index == flag);
-            data.splice(flag, 1);
-            data.splice(sort - 1, 0, findObj);
+            result = result.map((item)=>{
+                let findObj = newData.find((cur)=>cur.prop === item.prop);
+                if (findObj) return {
+                    ...item,
+                    ascendSort: findObj.ascendSort
+                };
+                return {
+                    ...item
+                };
+            });
+            props.changeSourceData(result);
+        }
+        const changeSort = (0, __WEBPACK_EXTERNAL_MODULE__sun_toolkit_shared__.debounce)(changeInputSort, 1200);
+        function handleSortEnd(data) {
             data = data.map((item, index)=>({
                     ...item,
                     ascendSort: index + 1
-                }));
+                })); // 更新原始数据中的排序字段
             let result = [
                 ...props.data
             ];
@@ -811,16 +834,12 @@ const _hoisted_3 = {
             });
             props.changeSourceData(result);
         }
-        const changeSort = (0, __WEBPACK_EXTERNAL_MODULE__sun_toolkit_shared__.debounce)(changeInputSort, 1200);
-        function handleSortEnd() {}
         const columns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>getColumn());
         const tableData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
-            let result = props.data.filter((item)=>item.sortable);
-            result.sort((a, b)=>(a?.ascendSort || 0) - (b?.ascendSort || 0));
-            result = result.map((item, index)=>{
-                item.ascendSort = index + 1;
-                return item;
-            });
+            let result = [
+                ...props.data.filter((item)=>item.sortable)
+            ]; // 按照现有的ascendSort排序，如果没有则按默认顺序
+            result.sort((a, b)=>(a?.ascendSort || 999) - (b?.ascendSort || 999));
             return result;
         });
         function changeAscendFlag(name, value, ascendSort) {
@@ -882,11 +901,11 @@ const _hoisted_3 = {
                             max: tableData.value.length,
                             modelValue: row.ascendSort,
                             'onUpdate:modelValue': (value)=>{
-                                row.ascendSort = value;
-                                changeSort(index, value);
+                                if (value && value !== row.ascendSort) changeSort(index, value);
                             },
-                            onInput: (value)=>{
-                                changeSort(index, value);
+                            onBlur: (event)=>{
+                                const value = event.target.value;
+                                if (value && parseInt(value) !== row.ascendSort) changeInputSort(index, parseInt(value));
                             }
                         })
                 }
@@ -1459,7 +1478,9 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
         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,
-                    render: ()=>'--'
+                    render: ()=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)("span", null, [
+                            (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)("--")
+                        ])
                 })));
         function changeSourceData(data) {
             sourceData.value = data;
@@ -1803,7 +1824,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-65b0a9d0"
+        "data-v-70d357a6"
     ]
 ]);
 /* ESM default export */ const dbgrid_component_setting = dbgrid_component_setting_exports_;
@@ -4730,7 +4751,7 @@ const pluginMainRequest = async (methodName, params)=>{
         const result = await Api.PluginMain[methodName](paramsJson);
         const { ...res } = JSON.parse(result);
         // console.log("params", params);
-        // console.log("res", JSON.parse(result));
+        console.log("出参", JSON.parse(result));
         if (!res.success) __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.error(res.errorMessage);
         return [
             res.success ? void 0 : res,
@@ -7640,9 +7661,20 @@ const access_infovue_type_script_setup_true_lang_ts_name_accessInfo_hoisted_3 =
                         "code"
                     ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true),
                     (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementVNode)("div", access_infovue_type_script_setup_true_lang_ts_name_accessInfo_hoisted_3, [
+                        _ctx.clearBtn ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)(_component_el_button, {
+                            key: 0,
+                            type: "primary",
+                            plain: "",
+                            onClick: clearFn
+                        }, {
+                            default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
+                                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.toDisplayString)(_ctx.btnTitle), 1)
+                                ]),
+                            _: 1
+                        })) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true),
                         (0, __WEBPACK_EXTERNAL_MODULE_vue__.renderSlot)(_ctx.$slots, "default"),
                         _ctx.invoiceConfig ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(invoice), {
-                            key: 0,
+                            key: 1,
                             ref_key: "invoiceRef",
                             ref: invoiceRef,
                             "menu-id": _ctx.menuId,
@@ -7651,18 +7683,7 @@ const access_infovue_type_script_setup_true_lang_ts_name_accessInfo_hoisted_3 =
                         }, null, 8, [
                             "menu-id",
                             "invoice-usage-code"
-                        ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true),
-                        _ctx.clearBtn ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)(_component_el_button, {
-                            key: 1,
-                            type: "primary",
-                            plain: "",
-                            onClick: clearFn
-                        }, {
-                            default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
-                                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.toDisplayString)(_ctx.btnTitle), 1)
-                                ]),
-                            _: 1
-                        })) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true)
+                        ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true)
                     ])
                 ]),
                 _ctx.showBanner && bannerCode.value ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(BannerInfo), {
@@ -7934,8 +7955,12 @@ function useUpdateInvoiceFormConfig(options) {
                                 }
                                 const currentNo = Number(modelValue.value?.currentNo);
                                 const endNo = Number(modelValue.value?.endNo);
-                                const numValue = Number(value);
-                                if (numValue < currentNo || numValue > endNo) callback(new Error(`调整后票号需在${modelValue.value?.currentNo}-${modelValue.value?.endNo}之间`));
+                                const numValue = Number(value); // 如果当前票号和结束票号一致，且调整后票号也一致，直接通过
+                                if (currentNo === endNo && numValue === currentNo) {
+                                    callback();
+                                    return;
+                                }
+                                if (numValue <= currentNo || numValue > endNo) callback(new Error(`调整后票号需在当前票号和结束票号之间！`));
                                 else callback();
                             },
                             trigger: [
@@ -8058,7 +8083,9 @@ function useUpdateInvoiceFormConfig(options) {
         };
         /** 提交 */ const confirmFn = async ()=>{
             const isValid = await formRef.value.ref.validate();
+            const isEndNo = updateModel.value?.currentNo === modelValue.value?.currentNo && modelValue.value?.currentNo === modelValue.value?.endNo;
             if (!isValid) return [];
+            if (isEndNo) __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.error("无可用票号，无法修改");
             const params = {
                 invoiceAllotId: originData.value?.invoiceAllotId,
                 currentNo: updateModel.value?.currentNo,

package/dist/hooks/index.js

@@ -564,7 +564,7 @@ function useFetchDataset(codeSystemCodes, enabledFlag) {
 }
 /* ESM default export */ const use_editable_table = useEditableTable;
 function useDataChangeDetector(sources, options) {
-    const confirmMessage = options?.confirmMessage || '您有未保存的更改，确定要离开吗？';
+    const confirmMessage = options?.confirmMessage || "您有未保存的更改，确定要离开吗？";
     // 缓存原始数据
     const cacheSources = sources.map((s)=>(0, __WEBPACK_EXTERNAL_MODULE__sun_toolkit_shared__.cloneDeep)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(s)));
     let clearSourceWatchList = [];
@@ -599,13 +599,14 @@ function useDataChangeDetector(sources, options) {
             sources.forEach((value, index)=>{
                 console.log(index, (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(value), cacheSources[index]);
             });
-            __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessageBox.confirm(confirmMessage, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
+            __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessageBox.confirm(confirmMessage, "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
             }).then(async ()=>{
                 next();
             }).catch(()=>{
+                if (options?.cancelFn) options.cancelFn();
                 next(false);
             });
             return;

package/dist/hooks/use-data-change-detector/index.d.ts

@@ -1,9 +1,10 @@
-import { Ref } from 'vue';
+import { Ref } from "vue";
 export declare function useDataChangeDetector<T extends readonly unknown[]>(sources: {
     [K in keyof T]: Ref<T[K]>;
 }, options?: {
     confirmMessage?: string;
     isSkip?: Ref<boolean>;
+    cancelFn?: () => void;
 }): {
     checkChange: () => boolean;
     updateOriginals: () => void;

package/dist/index.js

@@ -787,16 +787,39 @@ const _hoisted_3 = {
             props.changeSourceData(result);
         }
         function changeInputSort(flag, sort) {
-            let data = [
+            const currentRow = tableData.value[flag];
+            if (!currentRow) return; // 创建新的排序数组
+            let newData = [
                 ...tableData.value
+            ]; // 移除当前项
+            newData = newData.filter((item)=>item.prop !== currentRow.prop); // 在指定位置插入当前项
+            const insertIndex = Math.min(sort - 1, newData.length);
+            newData.splice(insertIndex, 0, currentRow); // 重新分配排序值
+            newData = newData.map((item, index)=>({
+                    ...item,
+                    ascendSort: index + 1
+                })); // 更新原始数据
+            let result = [
+                ...props.data
             ];
-            let findObj = data.find((item, index)=>index == flag);
-            data.splice(flag, 1);
-            data.splice(sort - 1, 0, findObj);
+            result = result.map((item)=>{
+                let findObj = newData.find((cur)=>cur.prop === item.prop);
+                if (findObj) return {
+                    ...item,
+                    ascendSort: findObj.ascendSort
+                };
+                return {
+                    ...item
+                };
+            });
+            props.changeSourceData(result);
+        }
+        const changeSort = (0, __WEBPACK_EXTERNAL_MODULE__sun_toolkit_shared__.debounce)(changeInputSort, 1200);
+        function handleSortEnd(data) {
             data = data.map((item, index)=>({
                     ...item,
                     ascendSort: index + 1
-                }));
+                })); // 更新原始数据中的排序字段
             let result = [
                 ...props.data
             ];
@@ -812,16 +835,12 @@ const _hoisted_3 = {
             });
             props.changeSourceData(result);
         }
-        const changeSort = (0, __WEBPACK_EXTERNAL_MODULE__sun_toolkit_shared__.debounce)(changeInputSort, 1200);
-        function handleSortEnd() {}
         const columns = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>getColumn());
         const tableData = (0, __WEBPACK_EXTERNAL_MODULE_vue__.computed)(()=>{
-            let result = props.data.filter((item)=>item.sortable);
-            result.sort((a, b)=>(a?.ascendSort || 0) - (b?.ascendSort || 0));
-            result = result.map((item, index)=>{
-                item.ascendSort = index + 1;
-                return item;
-            });
+            let result = [
+                ...props.data.filter((item)=>item.sortable)
+            ]; // 按照现有的ascendSort排序，如果没有则按默认顺序
+            result.sort((a, b)=>(a?.ascendSort || 999) - (b?.ascendSort || 999));
             return result;
         });
         function changeAscendFlag(name, value, ascendSort) {
@@ -883,11 +902,11 @@ const _hoisted_3 = {
                             max: tableData.value.length,
                             modelValue: row.ascendSort,
                             'onUpdate:modelValue': (value)=>{
-                                row.ascendSort = value;
-                                changeSort(index, value);
+                                if (value && value !== row.ascendSort) changeSort(index, value);
                             },
-                            onInput: (value)=>{
-                                changeSort(index, value);
+                            onBlur: (event)=>{
+                                const value = event.target.value;
+                                if (value && parseInt(value) !== row.ascendSort) changeInputSort(index, parseInt(value));
                             }
                         })
                 }
@@ -1460,7 +1479,9 @@ function dbgrid_component_settingvue_type_script_setup_true_lang_tsx_isSlot(s) {
         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,
-                    render: ()=>'--'
+                    render: ()=>(0, __WEBPACK_EXTERNAL_MODULE_vue__.createVNode)("span", null, [
+                            (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)("--")
+                        ])
                 })));
         function changeSourceData(data) {
             sourceData.value = data;
@@ -1804,7 +1825,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-65b0a9d0"
+        "data-v-70d357a6"
     ]
 ]);
 /* ESM default export */ const dbgrid_component_setting = dbgrid_component_setting_exports_;
@@ -3897,7 +3918,7 @@ function useSelectByDirectionEvent(options) {
     };
 }
 function useDataChangeDetector(sources, options) {
-    const confirmMessage = options?.confirmMessage || '您有未保存的更改，确定要离开吗？';
+    const confirmMessage = options?.confirmMessage || "您有未保存的更改，确定要离开吗？";
     // 缓存原始数据
     const cacheSources = sources.map((s)=>(0, __WEBPACK_EXTERNAL_MODULE__sun_toolkit_shared__.cloneDeep)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(s)));
     let clearSourceWatchList = [];
@@ -3932,13 +3953,14 @@ function useDataChangeDetector(sources, options) {
             sources.forEach((value, index)=>{
                 console.log(index, (0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(value), cacheSources[index]);
             });
-            __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessageBox.confirm(confirmMessage, '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
+            __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessageBox.confirm(confirmMessage, "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
             }).then(async ()=>{
                 next();
             }).catch(()=>{
+                if (options?.cancelFn) options.cancelFn();
                 next(false);
             });
             return;
@@ -5186,7 +5208,7 @@ const pluginMainRequest = async (methodName, params)=>{
         const result = await Api.PluginMain[methodName](paramsJson);
         const { ...res } = JSON.parse(result);
         // console.log("params", params);
-        // console.log("res", JSON.parse(result));
+        console.log("出参", JSON.parse(result));
         if (!res.success) __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.error(res.errorMessage);
         return [
             res.success ? void 0 : res,
@@ -6169,8 +6191,12 @@ function useUpdateInvoiceFormConfig(options) {
                                 }
                                 const currentNo = Number(modelValue.value?.currentNo);
                                 const endNo = Number(modelValue.value?.endNo);
-                                const numValue = Number(value);
-                                if (numValue < currentNo || numValue > endNo) callback(new Error(`调整后票号需在${modelValue.value?.currentNo}-${modelValue.value?.endNo}之间`));
+                                const numValue = Number(value); // 如果当前票号和结束票号一致，且调整后票号也一致，直接通过
+                                if (currentNo === endNo && numValue === currentNo) {
+                                    callback();
+                                    return;
+                                }
+                                if (numValue <= currentNo || numValue > endNo) callback(new Error(`调整后票号需在当前票号和结束票号之间！`));
                                 else callback();
                             },
                             trigger: [
@@ -7293,7 +7319,9 @@ const Title_exports_ = Titlevue_type_script_setup_true_lang_ts_name_sunTitle;
         };
         /** 提交 */ const confirmFn = async ()=>{
             const isValid = await formRef.value.ref.validate();
+            const isEndNo = updateModel.value?.currentNo === modelValue.value?.currentNo && modelValue.value?.currentNo === modelValue.value?.endNo;
             if (!isValid) return [];
+            if (isEndNo) __WEBPACK_EXTERNAL_MODULE_element_sun__.ElMessage.error("无可用票号，无法修改");
             const params = {
                 invoiceAllotId: originData.value?.invoiceAllotId,
                 currentNo: updateModel.value?.currentNo,
@@ -7942,9 +7970,20 @@ const access_infovue_type_script_setup_true_lang_ts_name_accessInfo_hoisted_3 =
                         "code"
                     ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true),
                     (0, __WEBPACK_EXTERNAL_MODULE_vue__.createElementVNode)("div", access_infovue_type_script_setup_true_lang_ts_name_accessInfo_hoisted_3, [
+                        _ctx.clearBtn ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)(_component_el_button, {
+                            key: 0,
+                            type: "primary",
+                            plain: "",
+                            onClick: clearFn
+                        }, {
+                            default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
+                                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.toDisplayString)(_ctx.btnTitle), 1)
+                                ]),
+                            _: 1
+                        })) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true),
                         (0, __WEBPACK_EXTERNAL_MODULE_vue__.renderSlot)(_ctx.$slots, "default"),
                         _ctx.invoiceConfig ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(invoice), {
-                            key: 0,
+                            key: 1,
                             ref_key: "invoiceRef",
                             ref: invoiceRef,
                             "menu-id": _ctx.menuId,
@@ -7953,18 +7992,7 @@ const access_infovue_type_script_setup_true_lang_ts_name_accessInfo_hoisted_3 =
                         }, null, 8, [
                             "menu-id",
                             "invoice-usage-code"
-                        ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true),
-                        _ctx.clearBtn ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)(_component_el_button, {
-                            key: 1,
-                            type: "primary",
-                            plain: "",
-                            onClick: clearFn
-                        }, {
-                            default: (0, __WEBPACK_EXTERNAL_MODULE_vue__.withCtx)(()=>[
-                                    (0, __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode)((0, __WEBPACK_EXTERNAL_MODULE_vue__.toDisplayString)(_ctx.btnTitle), 1)
-                                ]),
-                            _: 1
-                        })) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true)
+                        ])) : (0, __WEBPACK_EXTERNAL_MODULE_vue__.createCommentVNode)("", true)
                     ])
                 ]),
                 _ctx.showBanner && bannerCode.value ? ((0, __WEBPACK_EXTERNAL_MODULE_vue__.openBlock)(), (0, __WEBPACK_EXTERNAL_MODULE_vue__.createBlock)((0, __WEBPACK_EXTERNAL_MODULE_vue__.unref)(BannerInfo), {

package/package.json

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