@netang/quasar 0.0.73 → 0.0.75

package/components/empty/index.vue

@@ -9,7 +9,10 @@
         />
 
         <!-- 描述文字 -->
-        <div class="text-subtitle1 text-grey-7" v-if="description">{{description}}</div>
+        <div
+            :class="descriptionClass"
+            v-if="description"
+        >{{description}}</div>
     </div>
 </template>
 
@@ -37,6 +40,11 @@ export default {
             type: [ String, Number ],
             default: 70,
         },
+        // 描述类名
+        descriptionClass: {
+            type: String,
+            default: 'text-subtitle1 text-grey-7',
+        },
         // 描述文字
         description: String,
     },

package/components/power-page/index.vue

@@ -1,16 +1,28 @@
 <template>
+    <div v-if="container">
+        <!-- 空数据 -->
+        <n-empty
+            :description="emptyDescription"
+            v-if="pageStatus === false"
+        />
+        <!-- 插槽 -->
+        <slot v-else-if="pageStatus === true" />
+        <!-- 加载 -->
+        <q-inner-loading
+            :showing="pageLoading"
+        />
+    </div>
     <q-page
         v-bind="$attrs"
+        v-else
     >
         <!-- 空数据 -->
         <n-empty
             :description="emptyDescription"
             v-if="pageStatus === false"
         />
-
         <!-- 插槽 -->
         <slot v-else-if="pageStatus === true" />
-
         <!-- 加载 -->
         <q-inner-loading
             :showing="pageLoading"
@@ -32,6 +44,14 @@ export default {
      */
     name: 'NPowerPage',
 
+    /**
+     * 声明属性
+     */
+    props: {
+        // 是否容器化
+        container: Boolean,
+    },
+
     /**
      * 组件
      */
@@ -43,14 +63,27 @@ export default {
      * 组合式
      */
     setup() {
+
         // ==========【数据】============================================================================================
 
         // 获取注入权限数据
-        const $power = inject(NPowerKey)
+        const {
+            // 页面状态
+            pageStatus,
+            // 空状态描述
+            emptyDescription,
+            // 页面加载
+            pageLoading,
+        } = inject(NPowerKey)
 
         // ==========【返回】============================================================================================
         return {
-            ...$power,
+            // 页面状态
+            pageStatus,
+            // 空状态描述
+            emptyDescription,
+            // 页面加载
+            pageLoading,
         }
     },
 }

package/components/thumbnail/index.vue

@@ -5,8 +5,18 @@
         :width="toPx(size)"
         :height="toPx(size)"
         fit="fill"
+        v-bind="$attrs"
         v-if="currentSrc"
     >
+        <template v-slot:error>
+            <div class="absolute-full flex flex-center bg-grey-5 text-white no-padding">
+                <q-icon
+                    :size="errorIconSize"
+                    :name="errorIcon"
+                />
+            </div>
+        </template>
+
         <!-- 预览点击 -->
         <div
             class="absolute-full transparent cursor-pointer"
@@ -15,6 +25,21 @@
             v-if="preview"
         ></div>
     </q-img>
+
+    <!-- 错误图标 -->
+    <div
+        class="flex flex-center bg-grey-5 text-white no-padding"
+        :style="{
+            width: toPx(size),
+            height: toPx(size),
+        }"
+        v-else
+    >
+        <q-icon
+            :size="errorIconSize"
+            :name="errorIcon"
+        />
+    </div>
 </template>
 
 <script>
@@ -24,8 +49,8 @@ import { useQuasar } from 'quasar'
 import $n_px from '@netang/utils/px'
 import $n_noop from '@netang/utils/noop'
 
-import $n_previewImage from '../../utils/previewImage'
 import $n_getImage from '../../utils/getImage'
+import $n_previewImage from '../../utils/previewImage'
 
 export default {
 
@@ -34,6 +59,11 @@ export default {
      */
     name: 'NThumbnail',
 
+    /**
+     * 关闭组件 attribute 透传行为
+     */
+    inheritAttrs: false,
+
     /**
      * 声明属性
      */
@@ -45,6 +75,16 @@ export default {
             type: Number,
             default: 40,
         },
+        // 错误图标大小
+        errorIconSize: {
+            type: String,
+            default: 'sm',
+        },
+        // 错误图标
+        errorIcon: {
+            type: String,
+            default: 'image',
+        },
         // 是否点击放大预览
         preview: Boolean,
     },
@@ -86,7 +126,6 @@ export default {
             currentSrc,
             // 预览
             onPreview,
-
             // 转像素
             toPx: $n_px,
             // 点击空方法

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netang/quasar",
-  "version": "0.0.73",
+  "version": "0.0.75",
   "description": "netang-quasar",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -20,7 +20,6 @@
   "homepage": "https://github.com/netangsoft/netang-quasar#readme",
   "dependencies": {
     "axios": "^1.3.2",
-    "spark-md5": "^3.0.2",
-    "xregexp": "^5.1.1"
+    "spark-md5": "^3.0.2"
   }
 }

package/utils/useAuth.js

@@ -9,8 +9,9 @@ export function initAuthStore() {
     const cache = $n_cookie.get('_tk')
     return checkUserInfo(cache) ? cache : {
         id: 0,
-        isLogin: false,
+        token: '',
         info: {},
+        isLogin: false,
     }
 }