sard-uniapp 1.14.3 → 1.15.0

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [1.14.4](https://github.com/sutras/sard-uniapp/compare/v1.14.3...v1.14.4) (2025-05-16)
+
+
+### Bug Fixes
+
+* 修复 crop-image 弹出问题 ([d7bec84](https://github.com/sutras/sard-uniapp/commit/d7bec84ab9746d3f535b1e85187108aeb3872079))
+
+
+
 ## [1.14.3](https://github.com/sutras/sard-uniapp/compare/v1.14.2...v1.14.3) (2025-05-14)
 
 
@@ -293,21 +302,13 @@
 
 
 
-# [1.6.0](https://github.com/sutras/sard-uniapp/compare/v1.5.0...v1.6.0) (2024-08-19)
-
-
-### Features
-
-* 新增Tree, Timeline, BackTop 组件 close [#36](https://github.com/sutras/sard-uniapp/issues/36), close [#41](https://github.com/sutras/sard-uniapp/issues/41), close 43 ([f0a0504](https://github.com/sutras/sard-uniapp/commit/f0a0504f03a8eac84f926e2e01a61bc31de59057))
-
-
-
-# [1.5.0](https://github.com/sutras/sard-uniapp/compare/v1.4.1...v1.5.0) (2024-08-08)
+# [1.6.0](https://github.com/sutras/sard-uniapp/compare/v1.4.1...v1.6.0) (2024-08-19)
 
 
 ### Features
 
 * 新增Fab, FloatingBubble 组件, 优化构建流程 close [#39](https://github.com/sutras/sard-uniapp/issues/39) ([fe28b0a](https://github.com/sutras/sard-uniapp/commit/fe28b0aeb3a60f8b4d3f74a7d16ceb0fb4ccf295))
+* 新增Tree, Timeline, BackTop 组件 close [#36](https://github.com/sutras/sard-uniapp/issues/36), close [#41](https://github.com/sutras/sard-uniapp/issues/41), close 43 ([f0a0504](https://github.com/sutras/sard-uniapp/commit/f0a0504f03a8eac84f926e2e01a61bc31de59057))
 
 
 

package/components/action-sheet/action-sheet.vue

@@ -54,7 +54,8 @@ import {
   stringifyStyle,
   createBem,
   noop,
-  isFunction
+  isFunction,
+  isObject
 } from "../../utils";
 import SarPopup from "../popup/popup.vue";
 import SarLoading from "../loading/loading.vue";
@@ -100,7 +101,7 @@ export default  _defineComponent({
     const perhapsClose = (type) => {
       if (isFunction(props.beforeClose)) {
         const result = props.beforeClose(type);
-        if (result instanceof Promise) {
+        if (isObject(result) && isFunction(result.then)) {
           return result.then(() => {
             innerVisible.value = false;
             emit("update:visible", false);

package/components/crop-image/crop-image.vue

@@ -68,20 +68,20 @@
       </view>
     </view>
 
-    <view :class="bem.e('canvas-wrapper')">
-      <canvas
-        type="2d"
-        :hidpi="false"
-        :canvas-id="canvasId"
-        :id="canvasId"
-        :style="canvasStyle"
-      ></canvas>
-    </view>
-
     <view v-if="isCropping" :class="bem.e('loading')">
       <sar-loading />
     </view>
   </sar-popup>
+
+  <view :class="bem.e('canvas-wrapper')">
+    <canvas
+      type="2d"
+      :hidpi="false"
+      :canvas-id="canvasId"
+      :id="canvasId"
+      :style="canvasStyle"
+    ></canvas>
+  </view>
 </template>
 
 <script>

package/components/dialog/common.d.ts

@@ -1,6 +1,11 @@
 import { type StyleValue } from 'vue';
 import { type ButtonProps } from '../button';
 import { type TransitionHookEmits } from '../popup/common';
+export type DialogBeforeClose = (type: 'close' | 'cancel' | 'confirm', loading: {
+    readonly cancel: boolean;
+    readonly confirm: boolean;
+    readonly close: boolean;
+}) => any | Promise<any>;
 export interface DialogProps {
     rootStyle?: StyleValue;
     rootClass?: string;
@@ -16,7 +21,7 @@ export interface DialogProps {
     showConfirm?: boolean;
     confirmText?: string;
     overlayClosable?: boolean;
-    beforeClose?: (type: 'close' | 'cancel' | 'confirm') => any | Promise<any>;
+    beforeClose?: DialogBeforeClose;
     duration?: number;
     cancelProps?: ButtonProps;
     confirmProps?: ButtonProps;

package/components/dialog/dialog.vue

@@ -76,7 +76,7 @@
 
 <script>
 import { mergeDefaults as _mergeDefaults, defineComponent as _defineComponent } from "vue";
-import { computed, ref, watch } from "vue";
+import { computed, ref, watch, readonly, reactive } from "vue";
 import {
   classNames,
   stringifyStyle,
@@ -140,22 +140,49 @@ export default  _defineComponent({
         innerVisible.value = props.visible;
       }
     );
-    const loading = ref({
+    const loading = reactive({
       cancel: false,
       confirm: false,
       close: false
     });
+    const readonlyLoading = readonly(loading);
+    const asyncSet =  new Set();
+    watch(
+      innerVisible,
+      () => {
+        if (innerVisible.value === false) {
+          asyncSet.forEach((obj) => {
+            obj.valid = false;
+          });
+          Object.assign(loading, {
+            cancel: false,
+            confirm: false,
+            close: false
+          });
+        }
+      },
+      {
+        flush: "sync"
+      }
+    );
     const perhapsClose = (type) => {
       emit(type);
       if (isFunction(props.beforeClose)) {
-        const result = props.beforeClose(type);
+        const result = props.beforeClose(type, readonlyLoading);
         if (isObject(result) && isFunction(result.then)) {
-          loading.value[type] = true;
+          loading[type] = true;
+          const obj = {
+            valid: true
+          };
+          asyncSet.add(obj);
           return result.then(() => {
-            innerVisible.value = false;
-            emit("update:visible", false);
+            if (obj.valid) {
+              innerVisible.value = false;
+              emit("update:visible", false);
+            }
           }).catch(noop).finally(() => {
-            loading.value[type] = false;
+            loading[type] = false;
+            asyncSet.delete(obj);
           });
         } else if (result === false) {
           return;
@@ -228,7 +255,7 @@ export default  _defineComponent({
         props.popupStyle
       );
     });
-    const __returned__ = { props, emit, bem, t, innerVisible, loading, perhapsClose, onOverlayClick, onClose, onConfirm, onCancel, buttonProps, onVisibleHook, dialogClass, dialogStyle, mergedPopupStyle, SarPopup, SarButton, SarIcon };
+    const __returned__ = { props, emit, bem, t, innerVisible, loading, readonlyLoading, asyncSet, perhapsClose, onOverlayClick, onClose, onConfirm, onCancel, buttonProps, onVisibleHook, dialogClass, dialogStyle, mergedPopupStyle, SarPopup, SarButton, SarIcon };
     return __returned__;
   }
 });

package/components/popout/common.d.ts

@@ -1,5 +1,10 @@
 import { type StyleValue } from 'vue';
 import { type TransitionHookEmits } from '../popup/common';
+export type PopoutBeforeClose = (type: 'close' | 'cancel' | 'confirm', loading: {
+    readonly cancel: boolean;
+    readonly confirm: boolean;
+    readonly close: boolean;
+}) => any | Promise<any>;
 export interface PopoutProps {
     rootStyle?: StyleValue;
     rootClass?: string;
@@ -15,7 +20,7 @@ export interface PopoutProps {
     showClose?: boolean;
     showFooter?: boolean;
     overlayClosable?: boolean;
-    beforeClose?: (type: 'close' | 'cancel' | 'confirm') => boolean | undefined | Promise<any>;
+    beforeClose?: PopoutBeforeClose;
     keepRender?: boolean;
 }
 export declare const defaultPopoutProps: {

package/components/popout/popout.vue

@@ -93,13 +93,14 @@
 
 <script>
 import { mergeDefaults as _mergeDefaults, defineComponent as _defineComponent } from "vue";
-import { computed, ref, watch } from "vue";
+import { computed, reactive, readonly, ref, watch } from "vue";
 import {
   classNames,
   stringifyStyle,
   createBem,
   noop,
-  isFunction
+  isFunction,
+  isObject
 } from "../../utils";
 import SarPopup from "../popup/popup.vue";
 import SarButton from "../button/button.vue";
@@ -173,22 +174,49 @@ export default  _defineComponent({
       emit("visible-hook", name);
       emit(name);
     };
-    const loading = ref({
+    const loading = reactive({
       cancel: false,
       confirm: false,
       close: false
     });
+    const readonlyLoading = readonly(loading);
+    const asyncSet =  new Set();
+    watch(
+      innerVisible,
+      () => {
+        if (innerVisible.value === false) {
+          asyncSet.forEach((obj) => {
+            obj.valid = false;
+          });
+          Object.assign(loading, {
+            cancel: false,
+            confirm: false,
+            close: false
+          });
+        }
+      },
+      {
+        flush: "sync"
+      }
+    );
     const perhapsClose = (type) => {
       emit(type);
       if (isFunction(props.beforeClose)) {
-        const result = props.beforeClose(type);
-        if (result instanceof Promise) {
-          loading.value[type] = true;
+        const result = props.beforeClose(type, readonlyLoading);
+        if (isObject(result) && isFunction(result.then)) {
+          loading[type] = true;
+          const obj = {
+            valid: true
+          };
+          asyncSet.add(obj);
           return result.then(() => {
-            innerVisible.value = false;
-            emit("update:visible", false);
+            if (obj.valid) {
+              innerVisible.value = false;
+              emit("update:visible", false);
+            }
           }).catch(noop).finally(() => {
-            loading.value[type] = false;
+            loading[type] = false;
+            asyncSet.delete(obj);
           });
         } else if (result === false) {
           return;
@@ -217,7 +245,7 @@ export default  _defineComponent({
     const popoutStyle = computed(() => {
       return stringifyStyle(props.rootStyle);
     });
-    const __returned__ = { props, emit, bem, t, innerVisible, already, wholeVisible, onBeforeEnter, onAfterLeave, callVisibleHook, onVisibleHook, loading, perhapsClose, onOverlayClick, onCloseClick, onConfirm, onCancel, popoutClass, popoutStyle, get classNames() {
+    const __returned__ = { props, emit, bem, t, innerVisible, already, wholeVisible, onBeforeEnter, onAfterLeave, callVisibleHook, onVisibleHook, loading, readonlyLoading, asyncSet, perhapsClose, onOverlayClick, onCloseClick, onConfirm, onCancel, popoutClass, popoutStyle, get classNames() {
       return classNames;
     }, SarPopup, SarButton, SarIcon };
     return __returned__;

package/components/share-sheet/share-sheet.vue

@@ -78,7 +78,8 @@ import {
   createBem,
   noop,
   isFileUrl,
-  isFunction
+  isFunction,
+  isObject
 } from "../../utils";
 import SarPopup from "../popup/popup.vue";
 import SarIcon from "../icon/icon.vue";
@@ -135,7 +136,7 @@ export default  _defineComponent({
     const perhapsClose = (type) => {
       if (isFunction(props.beforeClose)) {
         const result = props.beforeClose(type);
-        if (result instanceof Promise) {
+        if (isObject(result) && isFunction(result.then)) {
           return result.then(() => {
             innerVisible.value = false;
             emit("update:visible", false);

package/package.json

@@ -2,7 +2,7 @@
   "id": "sard-uniapp",
   "name": "sard-uniapp",
   "displayName": "sard-uniapp",
-  "version": "1.14.3",
+  "version": "1.15.0",
   "description": "sard-uniapp 是一套基于 Uniapp + Vue3 框架开发的兼容多端的 UI 组件库",
   "main": "index.js",
   "scripts": {
@@ -122,7 +122,7 @@
     "lodash-es": "^4.17.21",
     "prettier": "^2.8.8",
     "region-data": "^1.2.3",
-    "sard-cli": "^1.1.6",
+    "sard-cli": "^1.1.7",
     "sass": "^1.69.7",
     "tel-area-code": "^1.1.0",
     "ts-custom-error": "^3.3.1",