n20-common-lib 2.4.5 → 2.4.7

package/nstc-g6/components/NstcForm/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/NstcForm/InputAndDialog/NstcInputAndDialog.vue

@@ -8,11 +8,7 @@
 -->
 <template>
   <div class="dialog-select">
-    <div
-      style="position: relative"
-      @mouseenter="hovering = true"
-      @mouseleave="hovering = false"
-    >
+    <div style="position: relative" @mouseenter="hovering = true" @mouseleave="hovering = false">
       <el-input
         v-model="InputValue"
         v-bind="$attrs"
@@ -22,12 +18,7 @@
         v-on="$listeners"
         @change="changeValue"
       />
-      <i
-        v-if="!showClose"
-        class="search-btn el-input__icon el-icon-search"
-        @click="onSearchIconClick"
-      >
-      </i>
+      <i v-if="!showClose" class="search-btn el-input__icon el-icon-search" @click="onSearchIconClick"> </i>
       <i
         v-if="showClose"
         class="search-btn el-select__caret el-input__icon el-icon-circle-close"
@@ -35,12 +26,7 @@
       ></i>
     </div>
 
-    <DialogTable
-      ref="dialog"
-      v-model="showDialog"
-      v-bind="dialogProps"
-      @comfirm="onComfirm"
-    >
+    <DialogTable ref="dialog" v-model="showDialog" v-bind="dialogProps" @comfirm="onComfirm">
       <template slot="form">
         <slot></slot>
       </template>
@@ -58,12 +44,9 @@ export default {
   directives: {
     'nstc-lazy-load': {
       bind(el, binding) {
-        const SELECTWRAP_DOM = el.querySelector(
-          '.el-select-dropdown .el-select-dropdown__wrap'
-        )
+        const SELECTWRAP_DOM = el.querySelector('.el-select-dropdown .el-select-dropdown__wrap')
         SELECTWRAP_DOM.addEventListener('scroll', function () {
-          const condition =
-            this.scrollHeight - this.scrollTop - 2 <= this.clientHeight
+          const condition = this.scrollHeight - this.scrollTop - 2 <= this.clientHeight
           console.log('condition', condition)
           if (condition) {
             binding.value()
@@ -168,8 +151,7 @@ export default {
   },
   computed: {
     showClose() {
-      let hasValue =
-        this.value !== undefined && this.value !== null && this.value !== ''
+      let hasValue = this.value !== undefined && this.value !== null && this.value !== ''
       return this.hovering && hasValue && this.canClose
     },
     attrs: {

package/nstc-g6/components/NstcForm/InputCustom/index.vue

@@ -142,11 +142,7 @@ export default {
     },
 
     _type() {
-      return this.type === 'text'
-        ? this.isNumber
-          ? 'number'
-          : this.type
-        : this.type
+      return this.type === 'text' ? (this.isNumber ? 'number' : this.type) : this.type
     }
   },
 
@@ -186,9 +182,7 @@ export default {
         w = wArr[0].clientWidth
       }
       console.log('_wwww', w)
-      const inputArr = document.getElementsByClassName(
-        `nstc-common-form-textarea`
-      )
+      const inputArr = document.getElementsByClassName(`nstc-common-form-textarea`)
 
       for (let i = 0; i < inputArr.length; i++) {
         // 3 为了多留一点空间， 前面是计算出来的准确值

package/nstc-g6/components/NstcForm/IntervalInputCustom/index.vue

@@ -1,20 +1,8 @@
 <template>
   <div class="interval-input-custom">
-    <InputCustom
-      v-model="_value[0]"
-      :clearable="clearable"
-      :type="type"
-      :number-rule="numberRule"
-      @blur="changeNum"
-    />
+    <InputCustom v-model="_value[0]" :clearable="clearable" :type="type" :number-rule="numberRule" @blur="changeNum" />
     <span>-</span>
-    <InputCustom
-      v-model="_value[1]"
-      :clearable="clearable"
-      :type="type"
-      :number-rule="numberRule"
-      @blur="changeNum"
-    />
+    <InputCustom v-model="_value[1]" :clearable="clearable" :type="type" :number-rule="numberRule" @blur="changeNum" />
   </div>
 </template>
 
@@ -73,12 +61,8 @@ export default {
       let value1 = this._value[0]
       let value2 = this._value[1]
       if (value1 && value2) {
-        value1 = isNaN(parseFloat(this._value[0]))
-          ? 0
-          : parseFloat(this._value[0])
-        value2 = isNaN(parseFloat(this._value[1]))
-          ? 0
-          : parseFloat(this._value[1])
+        value1 = isNaN(parseFloat(this._value[0])) ? 0 : parseFloat(this._value[0])
+        value2 = isNaN(parseFloat(this._value[1])) ? 0 : parseFloat(this._value[1])
         if (value1 > value2) {
           this.$message.warning('起始值不能大于结束值')
           newVal = ['', '']
@@ -108,4 +92,3 @@ export default {
   }
 }
 </style>
-

package/nstc-g6/components/NstcForm/Item.vue

@@ -1,11 +1,7 @@
 <template>
   <div>
     <template v-if="SUPPORT_TYPE.includes(item.mold)">
-      <el-form-item
-        :ref="item.required ? item.prop : null"
-        :label="item.name"
-        :prop="item.prop"
-      >
+      <el-form-item :ref="item.required ? item.prop : null" :label="item.name" :prop="item.prop">
         <el-tooltip
           v-if="item.tooltip"
           class="item-tooltip"
@@ -102,11 +98,7 @@
               @enter-click="$emit('enter-click')"
               @treeNodeClick="treeNodeClick"
             />
-            <span
-              v-show="item.link.name"
-              class="form-item-name form-item-name-link"
-              v-html="item.link.name"
-            ></span>
+            <span v-show="item.link.name" class="form-item-name form-item-name-link" v-html="item.link.name"></span>
             <component
               :is="getComponentModel(item.mold)"
               :key="item.prop"
@@ -147,11 +139,7 @@
               @enter-click="$emit('enter-click')"
               @treeNodeClick="treeNodeClick"
             />
-            <span
-              v-show="item.link.name"
-              class="form-item-name form-item-name-link"
-              v-html="item.link.name"
-            ></span>
+            <span v-show="item.link.name" class="form-item-name form-item-name-link" v-html="item.link.name"></span>
             <component
               :is="getComponentModel(item.link.mold)"
               v-if="item.link.renderable !== false"

package/nstc-g6/components/NstcForm/ItemSecond.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :class="{ 'form-item-button':['querybutton', 'addbutton', 'otherbutton'].includes(item.mold) }">
+  <div :class="{ 'form-item-button': ['querybutton', 'addbutton', 'otherbutton'].includes(item.mold) }">
     <el-form-item v-if="item.mold === 'querybutton'">
       <el-button
         type="primary"
@@ -38,17 +38,14 @@
     </el-form-item>
 
     <template v-else-if="SUPPORT_TYPE.includes(item.mold)">
-      <el-form-item
-        :label="item.name"
-        :prop="item.prop"
-      >
+      <el-form-item :label="item.name" :prop="item.prop">
         <el-tooltip
           v-if="item.tooltip"
           class="item-tooltip"
           effect="dark"
           :content="item.tooltip"
           placement="top-start"
-          :style="{left: -tipLength + 'px'}"
+          :style="{ left: -tipLength + 'px' }"
         >
           <i class="el-icon-question" />
         </el-tooltip>
@@ -95,12 +92,11 @@
                   @enter-click="$emit('enter-click')"
                 />
               </el-form-item>
-
             </template>
           </template>
         </template>
         <!-- 单个 -->
-        <template v-else-if="item.link &&item.link.mold">
+        <template v-else-if="item.link && item.link.mold">
           <template v-if="item.link.position === 'after'">
             <component
               :is="`${item.link.mold}-custom`"
@@ -115,12 +111,7 @@
               @after-leave="$emit('after-leave', item.link.prop)"
               @enter-click="$emit('enter-click')"
             />
-            <span
-
-              v-show="item.link.name"
-              class="form-item-name form-item-name-link"
-              v-html="item.link.name"
-            />
+            <span v-show="item.link.name" class="form-item-name form-item-name-link" v-html="item.link.name" />
             <component
               :is="`${item.mold}-custom`"
               :key="item.prop"
@@ -147,12 +138,7 @@
               @after-leave="$emit('after-leave', item.prop)"
               @enter-click="$emit('enter-click')"
             />
-            <span
-
-              v-show="item.link.name"
-              class="form-item-name form-item-name-link"
-              v-html="item.link.name"
-            />
+            <span v-show="item.link.name" class="form-item-name form-item-name-link" v-html="item.link.name" />
             <component
               :is="`${item.link.mold}-custom`"
               v-if="item.link.renderable !== false"
@@ -261,9 +247,8 @@ export default {
     width: 72px;
     height: 26px;
     padding: 0px;
-    border: 1px solid #007AFF;
+    border: 1px solid #007aff;
     border-radius: 5px;
   }
 }
-
 </style>

package/nstc-g6/components/NstcForm/List.vue

@@ -2,38 +2,30 @@
   <div class="form-base-wrapper">
     <template v-for="(item, idx) in config">
       <template v-if="Array.isArray(item)">
-        <div
-          :key="'inlineItem' + idx"
-          class="form-group"
-        >
+        <div :key="'inlineItem' + idx" class="form-group">
           <template v-for="(iItem, index) in item">
             <BaseItem
               v-if="iItem.renderable !== false"
-
-              :key="iItem.mold + '-' + (iItem.prop ? iItem.prop : (idx + '-' + index))"
-
+              :key="iItem.mold + '-' + (iItem.prop ? iItem.prop : idx + '-' + index)"
               v-model="value"
               :formData="formData"
-
               :class="[
                 'form-item',
                 `form-item-${iItem.mold}`,
                 {
-                  'form-item-link': iItem.link && ((Array.isArray(iItem.link) && iItem.link.some(link => link.mold)) || iItem.link.mold)
+                  'form-item-link':
+                    iItem.link &&
+                    ((Array.isArray(iItem.link) && iItem.link.some((link) => link.mold)) || iItem.link.mold)
                 },
                 `form-item-${iItem.mold}-${iItem.prop ? iItem.prop : idx + '-' + index}`
               ]"
-
               :popper-class="popperClass"
-
               :item="iItem"
               :resets.sync="resets"
               :disableds="disableds"
-
               :loading="loading"
               :show-mode="showMode"
-
-              @after-leave="val => $emit('after-leave', val)"
+              @after-leave="(val) => $emit('after-leave', val)"
               @query-click="$emit('query-click')"
               @add-click="$emit('add-click')"
               @other-click="$emit('other-click')"
@@ -47,33 +39,26 @@
       <template v-else>
         <BaseItem
           v-if="item.renderable !== false"
-
           :key="item.mold + '-' + (item.prop ? item.prop : idx)"
-
           v-model="value"
           :formData="formData"
-
           :class="[
             'form-item',
             `form-item-${item.mold}`,
             {
-              'form-item-link': item.link && ((Array.isArray(item.link) && item.link.some(link => link.mold)) || item.link.mold)
+              'form-item-link':
+                item.link && ((Array.isArray(item.link) && item.link.some((link) => link.mold)) || item.link.mold)
             },
             `form-item-${item.mold}-${item.prop ? item.prop : idx}`
           ]"
-
           :popper-class="popperClass"
-
           :item="item"
           :resets.sync="resets"
           :disableds="disableds"
-
           :loading="loading"
-
           :from="from"
           :show-mode="showMode"
-
-          @after-leave="val => $emit('after-leave', val)"
+          @after-leave="(val) => $emit('after-leave', val)"
           @query-click="$emit('query-click')"
           @add-click="$emit('add-click')"
           @other-click="$emit('other-click')"
@@ -86,7 +71,6 @@
 </template>
 
 <script>
-
 import BaseItem from './Item'
 
 export default {
@@ -105,11 +89,11 @@ export default {
     },
     from: {
       type: String,
-      default: null,
+      default: null
     },
     config: {
       type: Array,
-      default: () => ([])
+      default: () => []
     },
 
     loading: {
@@ -141,6 +125,6 @@ export default {
       type: String,
       default: ''
     }
-  },
+  }
 }
 </script>