@netang/quasar 0.2.42 → 0.2.44

package/components/uploader-query/index.vue

@@ -55,15 +55,15 @@
                 <template v-if="! disable && ! readonly && ! rightSquareButton">
                     <slot
                         name="square-button"
-                        :size="currentSize"
+                        :size="currentSquareButtonSize"
                         :show="showSquareButton"
                         v-if="$slots['square-button']"
                     />
                     <div
                         class="n-uploader-query__button--square"
                         :style="{
-                            width: toPx(currentSize),
-                            height: toPx(currentSize),
+                            width: toPx(currentSquareButtonSize),
+                            height: toPx(currentSquareButtonSize),
                         }"
                         v-show="showSquareButton"
                         v-else-if="! noButton && currentButtonType === 'square'"
@@ -75,7 +75,7 @@
                         >
                             <q-icon
                                 name="add"
-                                :size="toPx(currentSize / 2)"
+                                :size="toPx(currentSquareButtonSize / 2)"
                             />
                             <div class="n-uploader-query__button--square-button__text" v-if="buttonText">{{buttonText}}</div>
                         </div>
@@ -88,7 +88,7 @@
                         >
                             <q-icon
                                 name="cloud_upload"
-                                :size="toPx(currentSize / 3)"
+                                :size="toPx(currentSquareButtonSize / 3)"
                             />
                             <div class="n-uploader-query__button--square-button__text" v-if="buttonText">{{buttonText}}</div>
                         </div>
@@ -489,6 +489,8 @@ export default {
         buttonProps: Object,
         // 图片/按钮/文件 尺寸
         size: Number,
+        // 方块按钮尺寸
+        squareButtonSize: Number,
         // 是否开启拖拽
         drag: {
             type: Boolean,
@@ -625,6 +627,16 @@ export default {
             return uploaderProps.type === 'image' ? 70 : 50
         })
 
+        /**
+         * 当前方块尺寸
+         */
+        const currentSquareButtonSize = computed(function () {
+            if (props.squareButtonSize) {
+                return props.squareButtonSize
+            }
+            return currentSize.value
+        })
+
         /**
          * 是否显示方块按钮
          */
@@ -688,6 +700,8 @@ export default {
             currentButtonType,
             // 当前尺寸
             currentSize,
+            // 当前方块尺寸
+            currentSquareButtonSize,
             // 是否显示方块按钮
             showSquareButton,
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netang/quasar",
-  "version": "0.2.42",
+  "version": "0.2.44",
 
   "description": "netang-quasar",
   "scripts": {

package/utils/$power.js

@@ -1128,13 +1128,15 @@ async function request(options) {
         // 如果验证表单
         if ($n_get(o.powerBtn.data, 'validate') !== false) {
 
-            if (! o.$form.formRef) {
+            if (
+                ! o.$form.formRef
+                || ! o.$form.formRef?.value?.validate
+            ) {
                 throw new Error('没有绑定 fromRef')
             }
 
             // 验证表单
             if (! await o.$form.formRef.value.validate()) {
-
                 // 轻提示
                 $n_toast({
                     message: '表单中有无效值',