n20-common-lib 2.4.4 → 2.4.6

package/nstc-g6/components/Form/CheckboxCustom/index.vue

@@ -3,17 +3,12 @@
     v-model="_value"
     v-bind="$attrs"
     class="checkbox-group"
-    :style="{width:parseFloat(width) + 'px'}"
+    :style="{ width: parseFloat(width) + 'px' }"
     v-on="$listeners"
   >
     <template v-for="item in options">
-      <el-checkbox-button
-        v-if="type === 'button'"
-        :key="item.value"
-        :label="item.value"
-        :disabled="item.disabled"
-      >
-        {{ item.label}}
+      <el-checkbox-button v-if="type === 'button'" :key="item.value" :label="item.value" :disabled="item.disabled">
+        {{ item.label }}
       </el-checkbox-button>
       <el-checkbox
         v-else
@@ -42,7 +37,7 @@ export default {
 
     type: {
       default: 'normal',
-      validator: function(val) {
+      validator: function (val) {
         return ['normal', 'border', 'button'].includes(val)
       }
     },
@@ -61,7 +56,6 @@ export default {
       type: Boolean,
       default: false
     }
-
   },
 
   computed: {
@@ -78,7 +72,7 @@ export default {
 </script>
 
 <style scoped>
-.checkbox-group /deep/ .el-checkbox{
+.checkbox-group /deep/ .el-checkbox {
   margin-right: 40px;
 }
 </style>

package/nstc-g6/components/Form/Component.vue

@@ -23,7 +23,7 @@
       :popper-class="computedPopperClass"
       :formData="formData"
       :show-mode="showMode"
-      @after-leave="val => $emit('after-leave', val)"
+      @after-leave="(val) => $emit('after-leave', val)"
       @query-click="handleExpectQuery"
       @add-click="$emit('add-click')"
       @other-click="$emit('other-click')"
@@ -31,19 +31,8 @@
       @tree-node-click="(prop, data, node) => $emit('tree-node-click', prop, data, node)"
     />
 
-    <div
-      v-if="isVertical && queryBtn"
-      :class="[
-        `form-item`,
-        `form-item-button`
-      ]"
-    >
-      <el-button
-        v-bind="queryBtn"
-        :loading="queryLoading"
-        :disabled="disableds.querybutton"
-        @click="handleExpectQuery"
-      >
+    <div v-if="isVertical && queryBtn" :class="[`form-item`, `form-item-button`]">
+      <el-button v-bind="queryBtn" :loading="queryLoading" :disabled="disableds.querybutton" @click="handleExpectQuery">
         {{ queryBtn.name || '查询' }}
       </el-button>
     </div>
@@ -121,7 +110,7 @@ export default {
     // 样式 ： 水平 | 垂直
     mode: {
       default: 'horizontal',
-      validator: function(val) {
+      validator: function (val) {
         return ['horizontal', 'vertical'].includes(val)
       }
     },
@@ -177,9 +166,7 @@ export default {
         querybutton: false
       },
 
-      formID: `formID-${Math.random()
-        .toString(36)
-        .slice(2)}`,
+      formID: `formID-${Math.random().toString(36).slice(2)}`,
 
       linkItems: [],
       unwatchers: [],
@@ -219,15 +206,14 @@ export default {
     innerLabelWidth() {
       return (this.labelWidth + '').replace(/px/, '') + 'px'
     }
-
   },
 
   watch: {
     config: {
       deep: true,
       immediate: true,
-      handler: function(newVal) {
-        if (!this.isRendering  && newVal.length) {
+      handler: function (newVal) {
+        if (!this.isRendering && newVal.length) {
           this.init()
         }
       }
@@ -236,7 +222,7 @@ export default {
     value: {
       deep: true,
       immediate: true,
-      handler: function(newVal) {
+      handler: function (newVal) {
         if (!this.isEmptyObject(newVal) && !this.isRendering && this.innerMountAndQuery) {
           this.innerMountAndQuery = false
           this.handleExpectQuery()
@@ -292,10 +278,7 @@ export default {
           querybutton: this.disabled
         }
 
-        const {
-          querybutton,
-          normalItems = []
-        } = this.separateAdvanceAndNormal(this.config)
+        const { querybutton, normalItems = [] } = this.separateAdvanceAndNormal(this.config)
         this.normalConfig = normalItems
 
         this.generateFormModel(normalItems)
@@ -314,15 +297,15 @@ export default {
 
     generateFormModel(config) {
       if (Array.isArray(config)) {
-        config.forEach(item => {
+        config.forEach((item) => {
           if (Array.isArray(item)) {
             this.generateFormModel(item)
           } else {
             if (!item.mold) {
               throw Error(
-                `Each config's child must has a 'mold' prop, it could be ${SUPPORT_TYPE.concat(
-                  'querybutton'
-                ).join('|')}`
+                `Each config's child must has a 'mold' prop, it could be ${SUPPORT_TYPE.concat('querybutton').join(
+                  '|'
+                )}`
               )
             }
 
@@ -342,9 +325,7 @@ export default {
 
         if (!config.mold) {
           throw Error(
-            `Each config's child must has a 'mold' prop, it could be ${SUPPORT_TYPE.concat(
-              'querybutton'
-            ).join('|')}`
+            `Each config's child must has a 'mold' prop, it could be ${SUPPORT_TYPE.concat('querybutton').join('|')}`
           )
         }
 
@@ -359,7 +340,7 @@ export default {
         this.unwatchers.pop()()
       }
 
-      this.linkItems.map(item => {
+      this.linkItems.map((item) => {
         this.setWatchers(item)
       })
 
@@ -373,7 +354,8 @@ export default {
     setModel(item) {
       let { prop, mold } = item
 
-      if (this.pureable) { // 纯净模式
+      if (this.pureable) {
+        // 纯净模式
         if (item.renderable === false) {
           this.$delete(this.model, prop)
           return
@@ -398,19 +380,18 @@ export default {
     setWatchers(item) {
       const { link, prop: itemProp } = item
       let isOneToLinkAll = false
-      let links; let isComplex
+      let links
+      let isComplex
 
       if (Array.isArray(link)) {
         links = link
-        isOneToLinkAll = links.every(item => item.mold)
-        isComplex = !!(links.find(item => item.mold) && links.find(item => !item.mold))
+        isOneToLinkAll = links.every((item) => item.mold)
+        isComplex = !!(links.find((item) => item.mold) && links.find((item) => !item.mold))
       } else {
         links = [link]
       }
 
-      links.forEach(link =>
-        this.setSingleLinkWatch(link, itemProp, isOneToLinkAll, isComplex, link.mold)
-      )
+      links.forEach((link) => this.setSingleLinkWatch(link, itemProp, isOneToLinkAll, isComplex, link.mold))
     },
 
     setSingleLinkWatch(link, itemProp, isOneToLinkAll, isComplex, isModelEverGenerated) {
@@ -446,7 +427,7 @@ export default {
       const unwatcher = this.$watch(`model.${targetProp}`, {
         immediate: true,
         deep: true,
-        handler: async function(newVal, oldVal) {
+        handler: async function (newVal, oldVal) {
           if (watchedProp) {
             if (!deepEquals(newVal, oldVal)) {
               const defaultAndOptions = await handler(newVal)
@@ -514,7 +495,7 @@ export default {
       if (prop) {
         this.resets[prop] = val
       } else {
-        Object.keys(this.resets).forEach(key => {
+        Object.keys(this.resets).forEach((key) => {
           this.resets[key] = val
         })
       }
@@ -527,7 +508,7 @@ export default {
       if (prop) {
         this.disableds[prop] = val
       } else {
-        Object.keys(this.disableds).forEach(key => {
+        Object.keys(this.disableds).forEach((key) => {
           this.disableds[key] = val
         })
       }
@@ -536,40 +517,41 @@ export default {
     separateAdvanceAndNormal(config = this.config) {
       const isVertical = this.isVertical
 
-      const reducer = config => config.reduce(
-        (prev, item) => {
-          if (Array.isArray(item)) {
-            const { normalItems, ...rest } = reducer(item)
+      const reducer = (config) =>
+        config.reduce(
+          (prev, item) => {
+            if (Array.isArray(item)) {
+              const { normalItems, ...rest } = reducer(item)
 
-            normalItems.length && prev.normalItems.push(normalItems)
+              normalItems.length && prev.normalItems.push(normalItems)
 
-            return {
-              ...prev,
-              ...rest
-            }
-          } else {
-            const { mold } = item
-            //            if (mold === "upload") {
-            //              this.uploadKeys.add(prop);
-            //            }
-
-            if (isVertical) {
-              if (mold === 'querybutton') {
-                prev[mold] = item
+              return {
+                ...prev,
+                ...rest
+              }
+            } else {
+              const { mold } = item
+              //            if (mold === "upload") {
+              //              this.uploadKeys.add(prop);
+              //            }
+
+              if (isVertical) {
+                if (mold === 'querybutton') {
+                  prev[mold] = item
+                } else {
+                  prev.normalItems.push(item)
+                }
               } else {
                 prev.normalItems.push(item)
               }
-            } else {
-              prev.normalItems.push(item)
             }
-          }
 
-          return prev
-        },
-        {
-          normalItems: []
-        }
-      )
+            return prev
+          },
+          {
+            normalItems: []
+          }
+        )
 
       return reducer(config)
     },
@@ -606,9 +588,7 @@ export default {
 
           await this.$listeners.query(model, config)
         } else {
-          throw new Error(
-            'must specify @query event when there is a query button'
-          )
+          throw new Error('must specify @query event when there is a query button')
         }
       } catch (err) {
         console.error('form custom error -> handleExpectQuery:', err)
@@ -648,14 +628,12 @@ export default {
      * 生成formId
      */
     createFormId() {
-      return `formID-${Math.random()
-        .toString(36)
-        .slice(2)}`
+      return `formID-${Math.random().toString(36).slice(2)}`
     }
   }
 }
 </script>
 
 <style lang="scss">
-@import "index";
+@import 'index';
 </style>

package/nstc-g6/components/Form/ComponentSecond.vue

@@ -22,26 +22,15 @@
       :disableds="disableds"
       :popper-class="computedPopperClass"
       :from="from"
-      @after-leave="val => $emit('after-leave', val)"
+      @after-leave="(val) => $emit('after-leave', val)"
       @query-click="handleExpectQuery"
       @add-click="$emit('add-click')"
       @other-click="$emit('other-click')"
       @enter-click="handleExpectQuery"
     />
 
-    <div
-      v-if="isVertical && queryBtn"
-      :class="[
-        `form-item`,
-        `form-item-button`
-      ]"
-    >
-      <el-button
-        v-bind="queryBtn"
-        :loading="queryLoading"
-        :disabled="disableds.querybutton"
-        @click="handleExpectQuery"
-      >
+    <div v-if="isVertical && queryBtn" :class="[`form-item`, `form-item-button`]">
+      <el-button v-bind="queryBtn" :loading="queryLoading" :disabled="disableds.querybutton" @click="handleExpectQuery">
         {{ queryBtn.name || '查询' }}
       </el-button>
     </div>
@@ -115,7 +104,7 @@ export default {
     // 样式 ： 水平 | 垂直
     mode: {
       default: 'horizontal',
-      validator: function(val) {
+      validator: function (val) {
         return ['horizontal', 'vertical'].includes(val)
       }
     },
@@ -165,9 +154,7 @@ export default {
         querybutton: false
       },
 
-      formID: `formID-${Math.random()
-        .toString(36)
-        .slice(2)}`,
+      formID: `formID-${Math.random().toString(36).slice(2)}`,
 
       linkItems: [],
       unwatchers: [],
@@ -207,14 +194,13 @@ export default {
     innerLabelWidth() {
       return (this.labelWidth + '').replace(/px/, '') + 'px'
     }
-
   },
 
   watch: {
     config: {
       deep: true,
       immediate: true,
-      handler: function(newVal, oldVal) {
+      handler: function (newVal, oldVal) {
         if (!this.isRendering && newVal !== oldVal && newVal.length) {
           this.init()
         }
@@ -224,7 +210,7 @@ export default {
     value: {
       deep: true,
       immediate: true,
-      handler: function(newVal) {
+      handler: function (newVal) {
         if (!this.isEmptyObject(newVal) && !this.isRendering && this.innerMountAndQuery) {
           this.innerMountAndQuery = false
           this.handleExpectQuery()
@@ -280,10 +266,7 @@ export default {
           querybutton: this.disabled
         }
 
-        const {
-          querybutton,
-          normalItems = []
-        } = this.separateAdvanceAndNormal(this.config)
+        const { querybutton, normalItems = [] } = this.separateAdvanceAndNormal(this.config)
 
         this.normalConfig = normalItems
 
@@ -303,15 +286,15 @@ export default {
 
     generateFormModel(config) {
       if (Array.isArray(config)) {
-        config.forEach(item => {
+        config.forEach((item) => {
           if (Array.isArray(item)) {
             this.generateFormModel(item)
           } else {
             if (!item.mold) {
               throw Error(
-                `Each config's child must has a 'mold' prop, it could be ${SUPPORT_TYPE.concat(
-                  'querybutton'
-                ).join('|')}`
+                `Each config's child must has a 'mold' prop, it could be ${SUPPORT_TYPE.concat('querybutton').join(
+                  '|'
+                )}`
               )
             }
 
@@ -331,9 +314,7 @@ export default {
 
         if (!config.mold) {
           throw Error(
-            `Each config's child must has a 'mold' prop, it could be ${SUPPORT_TYPE.concat(
-              'querybutton'
-            ).join('|')}`
+            `Each config's child must has a 'mold' prop, it could be ${SUPPORT_TYPE.concat('querybutton').join('|')}`
           )
         }
 
@@ -348,7 +329,7 @@ export default {
         this.unwatchers.pop()()
       }
 
-      this.linkItems.map(item => {
+      this.linkItems.map((item) => {
         this.setWatchers(item)
       })
 
@@ -362,7 +343,8 @@ export default {
     setModel(item) {
       let { prop, mold } = item
 
-      if (this.pureable) { // 纯净模式
+      if (this.pureable) {
+        // 纯净模式
         if (item.renderable === false) {
           this.$delete(this.model, prop)
           return
@@ -387,19 +369,18 @@ export default {
     setWatchers(item) {
       const { link, prop: itemProp } = item
       let isOneToLinkAll = false
-      let links; let isComplex
+      let links
+      let isComplex
 
       if (Array.isArray(link)) {
         links = link
-        isOneToLinkAll = links.every(item => item.mold)
-        isComplex = !!(links.find(item => item.mold) && links.find(item => !item.mold))
+        isOneToLinkAll = links.every((item) => item.mold)
+        isComplex = !!(links.find((item) => item.mold) && links.find((item) => !item.mold))
       } else {
         links = [link]
       }
 
-      links.forEach(link =>
-        this.setSingleLinkWatch(link, itemProp, isOneToLinkAll, isComplex, link.mold)
-      )
+      links.forEach((link) => this.setSingleLinkWatch(link, itemProp, isOneToLinkAll, isComplex, link.mold))
     },
 
     setSingleLinkWatch(link, itemProp, isOneToLinkAll, isComplex, isModelEverGenerated) {
@@ -435,7 +416,7 @@ export default {
       const unwatcher = this.$watch(`model.${targetProp}`, {
         immediate: true,
         deep: true,
-        handler: async function(newVal, oldVal) {
+        handler: async function (newVal, oldVal) {
           if (watchedProp) {
             if (!deepEquals(newVal, oldVal)) {
               const defaultAndOptions = await handler(newVal)
@@ -503,7 +484,7 @@ export default {
       if (prop) {
         this.resets[prop] = val
       } else {
-        Object.keys(this.resets).forEach(key => {
+        Object.keys(this.resets).forEach((key) => {
           this.resets[key] = val
         })
       }
@@ -516,7 +497,7 @@ export default {
       if (prop) {
         this.disableds[prop] = val
       } else {
-        Object.keys(this.disableds).forEach(key => {
+        Object.keys(this.disableds).forEach((key) => {
           this.disableds[key] = val
         })
       }
@@ -525,40 +506,41 @@ export default {
     separateAdvanceAndNormal(config = this.config) {
       const isVertical = this.isVertical
 
-      const reducer = config => config.reduce(
-        (prev, item) => {
-          if (Array.isArray(item)) {
-            const { normalItems, ...rest } = reducer(item)
+      const reducer = (config) =>
+        config.reduce(
+          (prev, item) => {
+            if (Array.isArray(item)) {
+              const { normalItems, ...rest } = reducer(item)
 
-            normalItems.length && prev.normalItems.push(normalItems)
+              normalItems.length && prev.normalItems.push(normalItems)
 
-            return {
-              ...prev,
-              ...rest
-            }
-          } else {
-            const { mold } = item
-            //            if (mold === "upload") {
-            //              this.uploadKeys.add(prop);
-            //            }
-
-            if (isVertical) {
-              if (mold === 'querybutton') {
-                prev[mold] = item
+              return {
+                ...prev,
+                ...rest
+              }
+            } else {
+              const { mold } = item
+              //            if (mold === "upload") {
+              //              this.uploadKeys.add(prop);
+              //            }
+
+              if (isVertical) {
+                if (mold === 'querybutton') {
+                  prev[mold] = item
+                } else {
+                  prev.normalItems.push(item)
+                }
               } else {
                 prev.normalItems.push(item)
               }
-            } else {
-              prev.normalItems.push(item)
             }
-          }
 
-          return prev
-        },
-        {
-          normalItems: []
-        }
-      )
+            return prev
+          },
+          {
+            normalItems: []
+          }
+        )
 
       return reducer(config)
     },
@@ -595,9 +577,7 @@ export default {
 
           await this.$listeners.query(model, config)
         } else {
-          throw new Error(
-            'must specify @query event when there is a query button'
-          )
+          throw new Error('must specify @query event when there is a query button')
         }
       } catch (err) {
         console.error('form custom error -> handleExpectQuery:', err)
@@ -637,14 +617,12 @@ export default {
      * 生成formId
      */
     createFormId() {
-      return `formID-${Math.random()
-        .toString(36)
-        .slice(2)}`
+      return `formID-${Math.random().toString(36).slice(2)}`
     }
   }
 }
 </script>
 
 <style lang="scss">
-@import "index";
+@import 'index';
 </style>

package/nstc-g6/components/Form/InputAndDialog/index.js

@@ -6,10 +6,10 @@
  * @Description: 下拉+弹窗
  * @FilePath: \nstc_g6_common\packages\Form\SelectAndDialog\index.js
  */
-import NstcInputAndDialog from "./src/main.vue";
+import NstcInputAndDialog from './src/main.vue'
 
-NstcInputAndDialog.install = function(Vue) {
-  Vue.component(NstcInputAndDialog.name, NstcInputAndDialog);
-};
+NstcInputAndDialog.install = function (Vue) {
+  Vue.component(NstcInputAndDialog.name, NstcInputAndDialog)
+}
 
-export default NstcInputAndDialog;
+export default NstcInputAndDialog