@netang/quasar 0.0.53 → 0.0.55

package/components/field-tree/index.vue

@@ -106,7 +106,7 @@
                         <div
                             class="cursor-pointer full-width"
                             :class="{
-                                'text-primary': $n.indexOf(treeTicked, node.id) > -1,
+                                'text-primary': checkTreeNodeActive(node),
                             }"
                             @click="onNode($event, node)"
                         >{{node.label}}</div>
@@ -118,7 +118,17 @@
 </template>
 
 <script>
-import { ref, computed, watch, onMounted, onUpdated } from 'vue'
+import { ref, computed, watch, onUpdated } from 'vue'
+
+import $n_has from 'lodash/has'
+import $n_uniq from 'lodash/uniq'
+import $n_concat from 'lodash/concat'
+
+import $n_forEach from '@netang/utils/forEach'
+import $n_isValidArray from '@netang/utils/isValidArray'
+import $n_indexOf from '@netang/utils/indexOf'
+import $n_isRequired from '@netang/utils/isRequired'
+import $n_isValidValue from '@netang/utils/isValidValue'
 
 export default {
 
@@ -193,7 +203,7 @@ export default {
         const showValue = computed(function () {
 
             // 如果有已选数据
-            return $n.isValidArray(treeTickedNodes.value)
+            return $n_isValidArray(treeTickedNodes.value)
                 // 取已选数据第一条的标签
                 ? treeTickedNodes.value[0].label
                 : ''
@@ -243,10 +253,10 @@ export default {
 
             const lists = []
 
-            $n.forEach(treeTicked.value, function (treeKey) {
+            $n_forEach(treeTicked.value, function (treeKey) {
 
                 // 获取树选择的节点
-                if ($n.has(treeAll, treeKey)) {
+                if ($n_has(treeAll, treeKey)) {
                     lists.push({
                         id: treeKey,
                         label: treeAll[treeKey][props.showAllLevels ? 'path' : 'label'],
@@ -290,7 +300,7 @@ export default {
                 // 如果弹出层是隐藏的
                 ! showPopup.value
                 // 如果输入框有值
-                && $n.isValidValue(val)
+                && $n_isValidValue(val)
             ) {
                 // 显示弹出层
                 popupRef.value.show()
@@ -323,13 +333,13 @@ export default {
                     }
 
                     // 如果是父节点
-                    if ($n.isValidArray(item.children)) {
+                    if ($n_isValidArray(item.children)) {
                         getChildren(item.children, item.id, path)
                     }
                 }
             }
 
-            if ($n.isValidArray(props.nodes)) {
+            if ($n_isValidArray(props.nodes)) {
                 getChildren(props.nodes, 0, '')
             }
 
@@ -347,21 +357,21 @@ export default {
                 // 如果是单选
                 ! props.multiple
                 // 如果有值
-                && $n.isRequired(props.modelValue)
+                && $n_isRequired(props.modelValue)
                 // 存在节点
-                && $n.has(treeAll, props.modelValue)
+                && $n_has(treeAll, props.modelValue)
             ) {
                 // 获取父节点
                 function getParent({ id, pid, children }) {
 
                     // 如果是父级节点
-                    if ($n.isValidArray(children)) {
+                    if ($n_isValidArray(children)) {
                         // 设为展开
                         expanded.push(id)
                     }
 
                     // 如果有父节点, 则继续向上寻找
-                    if (pid && $n.has(treeAll, pid)) {
+                    if (pid && $n_has(treeAll, pid)) {
                         getParent(treeAll[pid])
                     }
                 }
@@ -370,7 +380,7 @@ export default {
             }
 
             if (props.expanded) {
-                expanded = $n.uniq($n.concat(expanded, props.expanded))
+                expanded = $n_uniq($n_concat(expanded, props.expanded))
             }
 
             return expanded
@@ -383,11 +393,11 @@ export default {
 
             // 如果是多选
             if (props.multiple) {
-                return $n.isValidArray(val) ? val : []
+                return $n_isValidArray(val) ? val : []
             }
 
             // 如果为有效值
-            if ($n.isRequired(val)) {
+            if ($n_isRequired(val)) {
                 return [ val ]
             }
 
@@ -406,13 +416,13 @@ export default {
         /**
          * 点击节点
          */
-        function onNode(e, { id, label, children }) {
+        function onNode(e, { id, children }) {
 
             // 如果是多选
             if (props.multiple) {
 
                 // 如果是父节点
-                if ($n.isValidArray(children)) {
+                if ($n_isValidArray(children)) {
 
                     // 则无任何操作
                     return
@@ -422,7 +432,7 @@ export default {
                 const _ticked = [...treeTicked.value]
 
                 // 获取值在树数据中的索引
-                const index = $n.indexOf(_ticked, id)
+                const index = $n_indexOf(_ticked, id)
 
                 // 如果在数据中
                 if (index > -1) {
@@ -443,7 +453,7 @@ export default {
 
                 if (
                     // 如果是父节点
-                    $n.isValidArray(children)
+                    $n_isValidArray(children)
                     // 如果仅可选择叶子节点
                     && ! props.strict
                 ) {
@@ -570,13 +580,20 @@ export default {
             }
         }
 
+        /**
+         * 树节点是否激活
+         */
+        function checkTreeNodeActive({ id }) {
+            return $n_indexOf(treeTicked.value, id) > -1
+        }
+
         // ==========【生命周期】=========================================================================================
 
         /**
          * 在组件因为响应式状态变更而更新其 DOM 树之后调用
          */
         onUpdated(function () {
-            if ($n.has(popupRef.value, 'currentComponent.ref.updatePosition')) {
+            if ($n_has(popupRef.value, 'currentComponent.ref.updatePosition')) {
                 popupRef.value.currentComponent.ref.updatePosition()
             }
         })
@@ -621,14 +638,15 @@ export default {
 
             // 弹出层显示回调
             onPopupShow,
+
+            // 节点是否激活
+            checkTreeNodeActive,
         }
     },
 }
 </script>
 
 <style lang="scss">
-@import "@/assets/sass/var.scss";
-
 .n-field-tree {
     .q-field__input--padding {
         padding-left: 4px;

package/components/input-number/index.vue

@@ -72,6 +72,9 @@
 
 <script>
 import { computed, ref, watch } from 'vue'
+import $n_filter from 'lodash/filter'
+
+import $n_isValidObject from '@netang/utils/isValidObject'
 
 export default {
 
@@ -151,7 +154,7 @@ export default {
          */
         const slotNames = computed(function() {
 
-            if ($n.isValidObject(slots)) {
+            if ($n_isValidObject(slots)) {
 
                 // 忽略插槽
                 const ignoreKeys = []
@@ -167,7 +170,7 @@ export default {
                 const keys = Object.keys(slots)
 
                 if (ignoreKeys.length) {
-                    return $n.filter(keys, e => ignoreKeys.indexOf(e) === -1)
+                    return $n_filter(keys, e => ignoreKeys.indexOf(e) === -1)
                 }
 
                 return keys
@@ -514,8 +517,6 @@ export default {
 </script>
 
 <style lang="scss">
-@import "@/assets/sass/var.scss";
-
 .n-input-number {
 
     // 居中显示

package/components/list-menu/index.vue

@@ -12,6 +12,11 @@
 <script>
 import { watch } from 'vue'
 
+import $n_has from 'lodash/has'
+import $n_isValidArray from '@netang/utils/isValidArray'
+
+import NListMenuItem from '../list-menu-item'
+
 export default {
 
     /**
@@ -19,6 +24,13 @@ export default {
      */
     name: 'NListMenu',
 
+    /**
+     * 组件
+     */
+    components: {
+        NListMenuItem,
+    },
+
     /**
      * 声明属性
      */
@@ -71,7 +83,7 @@ export default {
                     // 如果不是根节点
                     attr.pid
                     // 有父节点
-                    && $n.has(parentAll, attr.pid)
+                    && $n_has(parentAll, attr.pid)
                 ) {
                     const parentItem = parentAll[attr.pid]
 
@@ -117,7 +129,7 @@ export default {
         watch([()=>props.data, ()=>props.activeValue], function() {
 
             // 设置激活状态
-            if ($n.isValidArray(props.data)) {
+            if ($n_isValidArray(props.data)) {
                 setActive()
             }
 

package/components/power-page/index.vue

@@ -20,8 +20,11 @@
 
 <script>
 import { inject } from 'vue'
+
 import { NPowerKey } from '../../utils/symbols'
 
+import NEmpty from '../empty'
+
 export default {
 
     /**
@@ -29,6 +32,13 @@ export default {
      */
     name: 'NPowerPage',
 
+    /**
+     * 组件
+     */
+    components: {
+        NEmpty,
+    },
+
     /**
      * 组合式
      */

package/components/private/components/index.js

@@ -1,6 +1,11 @@
-import dialog from '@/components/private/dialog'
+import { configs } from '../../../utils/config'
+
+const {
+    // 对话框组件
+    dialogComponents,
+} = configs
 
 export default {
     moveToTree: () => import('./move-to-tree'),
-    ...dialog,
+    ...dialogComponents,
 }

package/components/private/components/move-to-tree/index.vue

@@ -26,7 +26,11 @@
 </template>
 
 <script>
-import { ref, isRef, toRaw, watch } from 'vue'
+import { ref, isRef, watch, inject } from 'vue'
+
+import $n_isValidArray from '@netang/utils/isValidArray'
+
+import { NDialogKey } from '../../../../utils/symbols'
 
 export default {
 
@@ -48,7 +52,7 @@ export default {
             submit,
             // 父级声明属性
             props,
-        } = $n.dialog.inject()
+        } = inject(NDialogKey)
 
         const {
             // 树节点列表
@@ -121,7 +125,7 @@ export default {
                     return ref(val.value)
                 }
 
-                if ($n.isValidArray(val)) {
+                if ($n_isValidArray(val)) {
                     return ref(val)
                 }
             }