@netang/quasar 0.1.74 → 0.1.76

package/components/field-table/index.vue

@@ -87,6 +87,14 @@
             />
         </template>
 
+        <!-- 默认插槽 -->
+        <template
+            v-for="slotName in slotNames.normal"
+            v-slot:[slotName]
+        >
+            <slot :name="slotName" />
+        </template>
+
         <!-- 弹出层代理 -->
         <q-popup-proxy
             ref="popupRef"
@@ -141,9 +149,9 @@
                     </n-data>
                 </template>
 
-                <!-- 插槽 -->
+                <!-- 表格插槽 -->
                 <template
-                    v-for="slotName in slotNames"
+                    v-for="slotName in slotNames.table"
                     v-slot:[slotName]="props"
                 >
                     <q-td :props="props">
@@ -333,7 +341,27 @@ export default {
          * 插槽标识
          */
         const slotNames = computed(function() {
-            return $n_isValidObject(slots) ? Object.keys(slots) : []
+
+            const table = []
+            const normal = []
+
+            // 如果有插槽
+            if ($n_isValidObject(slots)) {
+                for (const key in slots) {
+                    if (key !== 'append' && key !== 'control') {
+                        if (key.startsWith('table-')) {
+                            table.push(key.replace('table-', ''))
+                        } else {
+                            normal.push(key)
+                        }
+                    }
+                }
+            }
+
+            return {
+                table,
+                normal,
+            }
         })
 
         /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netang/quasar",
-  "version": "0.1.74",
+  "version": "0.1.76",
   "description": "netang-quasar",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/sass/index.scss

@@ -2,7 +2,6 @@
 
 @import "quasar/common";
 @import "quasar/btn";
-@import "quasar/dialog";
 @import "quasar/drawer";
 @import "quasar/field";
 @import "quasar/loading";

package/utils/getData.js

@@ -1,73 +1,88 @@
-import { isRef } from 'vue'
-
-import $n_isNil from 'lodash/isNil'
-import $n_map from 'lodash/map'
-
-import $n_http from '@netang/utils/http'
-
-import $n_config from './config'
-
-/**
- * 获取公共数据
- * @param {String|Array} url 请求地址
- * @param pageStatus 页面状态
- * @param emptyDescription 空状态描述
- * @param refValue 请求成功后设置值
- * @returns
- */
-export default async function getData(url, pageStatus = null, emptyDescription = null, refValue = null) {
-
-    const warn = $n_isNil(pageStatus) || ! isRef(pageStatus)
-
-    // 如果是数组, 说明需要同时请求多个地址
-    // --------------------------------------------------
-    if (Array.isArray(url)) {
-
-        const result = await $n_http($n_map(url, function (item) {
-            return {
-                url: $n_config('apiDataUrl') + item,
-                warn,
-            }
-        }))
-
-        const res = []
-
-        for (const { status, data } of result) {
-            if (! status) {
-                if (! warn) {
-                    pageStatus.value = false
-                }
-                if (! $n_isNil(emptyDescription) && isRef(emptyDescription)) {
-                    emptyDescription.value = data.msg
-                }
-                return false
-            }
-            res.push(data)
-        }
-
-        return res
-    }
-
-    // 单个请求
-    // --------------------------------------------------
-    const { status, data } = await $n_http({
-        url: $n_config('apiDataUrl') + url,
-        warn,
-    })
-    if (! status) {
-        if (! warn) {
-            pageStatus.value = false
-        }
-        if (! $n_isNil(emptyDescription) && isRef(emptyDescription)) {
-            emptyDescription.value = data.msg
-        }
-        return false
-    }
-
-    // 直接设置 value
-    if (! $n_isNil(refValue) && isRef(refValue)) {
-        refValue.value = data
-    }
-
-    return data
-}
+import { isRef } from 'vue'
+
+import $n_has from 'lodash/has'
+import $n_isNil from 'lodash/isNil'
+import $n_map from 'lodash/map'
+
+import $n_http from '@netang/utils/http'
+import $n_isValidObject from '@netang/utils/isValidObject'
+
+import $n_config from './config'
+
+/**
+ * 获取公共数据
+ * @param {String|Array} url 请求地址
+ * @param pageStatus 页面状态
+ * @param emptyDescription 空状态描述
+ * @param refValue 请求成功后设置值
+ * @returns
+ */
+export default async function getData(url, pageStatus = null, emptyDescription = null, refValue = null) {
+
+    const warn = $n_isNil(pageStatus) || ! isRef(pageStatus)
+
+    // 获取单个请求配置
+    function getSingleHttpOptions(opt) {
+
+        // 如果是对象
+        if ($n_isValidObject(opt)) {
+            opt.url = $n_config('apiDataUrl') + opt.url
+            if (! $n_has(opt, 'warn')) {
+                opt.warn = warn
+            }
+            return opt
+        }
+
+        // 否则为字符串
+        return {
+            url: $n_config('apiDataUrl') + opt,
+            warn,
+        }
+    }
+
+    // 如果是数组, 说明需要同时请求多个地址
+    // --------------------------------------------------
+    if (Array.isArray(url)) {
+
+        const result = await $n_http($n_map(url, function (item) {
+            return getSingleHttpOptions(item)
+        }))
+
+        const res = []
+
+        for (const { status, data } of result) {
+            if (! status) {
+                if (! warn) {
+                    pageStatus.value = false
+                }
+                if (! $n_isNil(emptyDescription) && isRef(emptyDescription)) {
+                    emptyDescription.value = data.msg
+                }
+                return false
+            }
+            res.push(data)
+        }
+
+        return res
+    }
+
+    // 单个请求
+    // --------------------------------------------------
+    const { status, data } = await $n_http(getSingleHttpOptions(url))
+    if (! status) {
+        if (! warn) {
+            pageStatus.value = false
+        }
+        if (! $n_isNil(emptyDescription) && isRef(emptyDescription)) {
+            emptyDescription.value = data.msg
+        }
+        return false
+    }
+
+    // 直接设置 value
+    if (! $n_isNil(refValue) && isRef(refValue)) {
+        refValue.value = data
+    }
+
+    return data
+}

package/sass/quasar/dialog.scss

@@ -1,7 +0,0 @@
-/**
- * 对话框
- */
-.n-dialog {
-
-}
-