@netang/quasar 0.0.81 → 0.0.82

package/components/dialog/index.vue

@@ -9,7 +9,7 @@
         <q-card class="flex column" :style="customStyle">
 
             <!-- 头部 -->
-            <q-toolbar>
+            <q-toolbar class="n-line--bottom">
                 <!-- 标题 -->
                 <q-toolbar-title>{{currentTitle}}</q-toolbar-title>
                 <!-- 关闭按钮 -->
@@ -38,7 +38,7 @@
             </q-card-section>
 
             <!-- 底部 -->
-            <q-card-actions align="right" v-if="bottom">
+            <q-card-actions class="n-line--top" align="right" v-if="bottom">
                 <!-- 取消按钮 -->
                 <q-btn label="取消" color="primary" @click="onDialogCancel" flat v-close-popup v-if="cancel" />
                 <!-- 确定按钮 -->
@@ -91,7 +91,9 @@ export default {
         // 组件标识
         name: String,
         // 路由组件路径
-        route: String,
+        path: String,
+        // 路由组件参数
+        query: Object,
         // 组件传参
         props: Object,
         // 标题
@@ -197,44 +199,6 @@ export default {
 
         // ==========【计算属性】=========================================================================================
 
-        function setWH(style, field, sign) {
-            if (props[field]) {
-                if ($n_indexOf(props[field], '%') > -1) {
-                    style[field] = props[field].replace('%', sign)
-                } else {
-                    style[field] = $n_px(props[field])
-                }
-            }
-        }
-
-        /**
-         * 自定义样式
-         */
-        const customStyle = computed(function () {
-
-            const style = {}
-
-            if (
-                props.fullscreen
-                || $q.platform.is.mobile
-                || (props.width === '100%' && props.height === '100%')
-            ) {
-                style.width = '100vw'
-                style.height = '100vh'
-                style.borderRadius = 0
-
-            } else {
-                // 宽度
-                setWH(style, 'width', 'vw')
-                // 高度
-                setWH(style, 'height', 'vh')
-                // 最小宽度
-                setWH(style, 'minWidth', 'vw')
-            }
-
-            return style
-        })
-
         /**
          * 获取当前组件
          */
@@ -244,9 +208,9 @@ export default {
             let comp
 
             // 如果是路由路径
-            if (props.route) {
+            if (props.path) {
                 // 获取路由组件
-                comp = $n_get(routers, `${$n_slash(props.route, 'start', false)}.component`)
+                comp = $n_get(routers, `${$n_slash(props.path, 'start', false)}.component`)
 
             // 如果有组件标识
             } else if (props.name && $n_has(components, props.name)) {
@@ -268,6 +232,34 @@ export default {
             return comp
         })
 
+        /**
+         * 自定义样式
+         */
+        const customStyle = computed(function () {
+
+            const style = {}
+
+            if (
+                props.fullscreen
+                || $q.platform.is.mobile
+                || (props.width === '100%' && props.height === '100%')
+            ) {
+                style.width = '100vw'
+                style.height = '100vh'
+                style.borderRadius = 0
+
+            } else {
+                // 宽度
+                setWH(style, 'width', 'vw')
+                // 高度
+                setWH(style, 'height', 'vh')
+                // 最小宽度
+                setWH(style, 'minWidth', 'vw')
+            }
+
+            return style
+        })
+
         /**
          * 当前标题
          */
@@ -278,14 +270,24 @@ export default {
                 return props.title
             }
 
-            return props.route ?
-                // 如果是路由路径, 则获取路由标题
-                $n_get(routers, `${$n_slash(props.route, 'start', false)}.meta.title`, '')
-                : ''
+            return ''
         })
 
         // ==========【方法】=============================================================================================
 
+        /**
+         * 设置宽高
+         */
+        function setWH(style, field, sign) {
+            if (props[field]) {
+                if ($n_indexOf(props[field], '%') > -1) {
+                    style[field] = props[field].replace('%', sign)
+                } else {
+                    style[field] = $n_px(props[field])
+                }
+            }
+        }
+
         /**
          * 隐藏对话框
          */

package/components/field-table/index.vue

@@ -96,7 +96,7 @@
             @focus="onFieldBlur"
             @show="onPopupShow"
             @before-hide="showPopup = false"
-            v-if="! readonly"
+            v-if="! readonly && ! disable"
         >
             <!-- 快捷表格 -->
             <q-table

package/components/field-tree/index.vue

@@ -2,6 +2,7 @@
     <q-field
         class="n-field-tree"
         :model-value="showValue"
+        :disable="disable"
         :readonly="readonly"
         :clearable="clearable"
         @focus="onFieldFocus"
@@ -37,7 +38,7 @@
                             :key="`item-${index}`"
                             :label="item.label"
                             dense
-                            removable
+                            :removable="! readonly && ! disable"
                             @remove="onRemoveItem(index)"
                         />
                     </template>
@@ -84,7 +85,7 @@
             @focus="onFieldFocus"
             @show="onPopupShow"
             @before-hide="showPopup = false"
-            v-if="! readonly"
+            v-if="! readonly && ! disable"
         >
             <q-card>
                 <!-- 树 -->
@@ -178,6 +179,8 @@ export default {
         placeholder: String,
         // 是否可清除
         clearable: Boolean,
+        // 是否禁用
+        disable: Boolean,
         // 是否只读
         readonly: Boolean,
     },

package/components/img/index.vue

@@ -43,7 +43,8 @@
             'rounded-borders': rounded,
             'n-img--round': round,
         }"
-        v-bind="imageProps"
+        :style="imageProps"
+        v-bind="$attrs"
         v-else
     >
         <div class="q-img__content absolute-full q-anchor--skip">
@@ -156,14 +157,8 @@ export default {
             }
 
             return {
-                class: $n_get(attrs, 'class'),
-                style: [
-                    {
-                        width,
-                        height,
-                    },
-                    $n_get(attrs, 'style'),
-                ],
+                width,
+                height,
             }
         })
 

package/components/uploader-query/index.vue

@@ -4,6 +4,7 @@
         <!-- 上传按钮 -->
         <slot
             name="button"
+            :disable="disable || readonly"
             :size="currentSize"
             v-if="$slots.button"
         />
@@ -17,6 +18,7 @@
                 @click="uploader.chooseUpload"
                 color="primary"
                 outline
+                :disable="disable || readonly"
                 unelevated
                 v-bind="buttonProps"
             />
@@ -34,7 +36,7 @@
             <template v-if="type === 'image'">
 
                 <!-- 左边方块按钮 -->
-                <template v-if="! rightSquareButton">
+                <template v-if="! disable && ! readonly && ! rightSquareButton">
                     <slot
                         name="square-button"
                         :size="currentSize"
@@ -146,14 +148,14 @@
                                 size="xs"
                                 title="删除"
                                 @click="uploader.deleteFileItem(fileItem)"
-                                v-if="! noDelete"
+                                v-if="! noDelete && ! disable && ! readonly"
                             />
                         </div>
                     </q-img>
                 </div>
 
                 <!-- 右边方块按钮 -->
-                <template v-if="rightSquareButton">
+                <template v-if="! disable && ! readonly && rightSquareButton">
                     <slot
                         name="square-button"
                         :size="currentSize"
@@ -285,7 +287,7 @@
                                 size="xs"
                                 title="修改"
                                 @click="uploader.previewImage(fileItem)"
-                                v-if="! noEdit"
+                                v-if="! noEdit && ! disable && ! readonly"
                             >
                                 <q-popup-edit
                                     :model-value="fileItem.title"
@@ -318,7 +320,7 @@
                             size="xs"
                             title="删除"
                             @click="uploader.deleteFileItem(fileItem)"
-                            v-if="! noDelete"
+                            v-if="! noDelete && ! disable && ! readonly"
                         />
                     </div>
                 </div>
@@ -383,6 +385,10 @@ export default {
             type: Boolean,
             default: true,
         },
+        // 是否禁用
+        disable: Boolean,
+        // 是否只读
+        readonly: Boolean,
         // 是否隐藏按钮
         noButton: Boolean,
         // 是否隐藏预览按钮
@@ -433,6 +439,8 @@ export default {
             return props.drag
                 && $n_isValidArray(query.value)
                 && query.value.length > 1
+                && ! props.readonly
+                && ! props.disable
         })
 
         /**

package/package.json

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

package/sass/common.scss

@@ -75,12 +75,11 @@ body {
     color: var(--n-placeholder-color);
 }
 
+// 不可点击
 .n-pointer-none {
     pointer-events: none;
 }
 
-
-
 //.n-color-primary,
 //.n-color-main {
 //    color: var(--q-primary);

package/utils/$power.js

@@ -9,6 +9,7 @@ import $n_toLower from 'lodash/toLower'
 import $n_isNumber from 'lodash/isNumber'
 import $n_cloneDeep from 'lodash/cloneDeep'
 import $n_isFunction from 'lodash/isFunction'
+import $n_pick from 'lodash/pick'
 
 import $n_router from '@netang/utils/vue/router'
 
@@ -33,7 +34,7 @@ import $n_run from '@netang/utils/run'
 import $n_http from '@netang/utils/http'
 
 import { statePower } from '../store'
-import { NRenderKey, NPowerKey, NFormKey, NTableKey } from './symbols'
+import { NRenderKey, NPowerKey, NDialogKey, NFormKey, NTableKey } from './symbols'
 
 import $n_getData from './getData'
 import $n_toast from './toast'
@@ -87,11 +88,30 @@ function create(params) {
         requestAfter: null,
     }, params)
 
+    // 获取对话框渲染注入
+    const $dialog = inject(NDialogKey)
+    const hasDialog = !! $dialog
+
     // 获取渲染注入
     const $render = inject(NRenderKey)
+    const hasRender = !! $render
+
+    // 如果有对话框注入
+    if (hasDialog) {
+        const {
+            dialogProps,
+        } = $dialog
+
+        // 合并权限参数
+        Object.assign(o, $n_pick(dialogProps, [ 'path', 'query' ]))
+
+        // 合并权限参数
+        if ($n_has($dialog, 'props.powerProps') && $n_isValidObject($dialog.props.powerProps)) {
+            $n_merge(o, $dialog.props.powerProps)
+        }
+    }
 
     // 如果有渲染注入
-    const hasRender = !! $render
     if (hasRender) {
         // 如果有权限传参, 则合并参数
         const powerProps = $n_get($render, 'props.powerProps')

package/utils/$table.js

@@ -122,10 +122,12 @@ function create(params) {
         rowDblClick: null,
     }, params)
 
+    // 获取权限注入
+    const $power = $n_has(params, '$power') ? params.$power : inject(NPowerKey)
+    const hasPowr = !! $power
+
     // 获取渲染注入
     const $render = inject(NRenderKey)
-
-    // 如果有渲染注入
     if (!! $render) {
         // 如果有表格传参, 则合并参数
         const tableProps = $n_get($render, 'props.tableProps')
@@ -134,10 +136,6 @@ function create(params) {
         }
     }
 
-    // 获取权限注入
-    const $power = $n_has(params, '$power') ? params.$power : inject(NPowerKey)
-    const hasPowr = !! $power
-
     // 获取选择类型(默认 single)
     if (! $n_has(o, 'selection') || ! $n_isValidString(o.selection)) {
         if (hasPowr) {

package/utils/dialog.js

@@ -12,7 +12,7 @@ import { NDialogKey } from './symbols'
 function create(params) {
     if (
         // 如果是路由组件
-        $n_has(params, 'route')
+        $n_has(params, 'path')
         // 或自定义组件
         || $n_has(params, 'name')
     ) {