n20-common-lib 2.4.5 → 2.4.7

package/nstc-g6/components/FormGroup/src/main.vue

@@ -4,49 +4,24 @@
       <div class="form-group-custom-body-ap" v-if="anchorPoint">
         <el-tabs v-model="activeName" :tab-position="tabPosition" @tab-click="tabClickAction">
           <el-tab-pane
-              v-for="(item,index) in anchorPointArr.filter(item => item.title)"
-              :key="index"
-              :label="item.name || item.title"
+            v-for="(item, index) in anchorPointArr.filter((item) => item.title)"
+            :key="index"
+            :label="item.name || item.title"
           />
         </el-tabs>
       </div>
-      <div :class="{ 'form-group-custom-body-form': true, 'form-group-custom-body-form-anchor-point': anchorPoint}">
+      <div :class="{ 'form-group-custom-body-form': true, 'form-group-custom-body-form-anchor-point': anchorPoint }">
         <slot name="before" />
 
         <div
-            v-for="(form,index) in innerConfig"
-            :key="index"
-            :class="['form-group-item', { 'is-upload': getIsUpload(form) }]"
+          v-for="(form, index) in innerConfig"
+          :key="index"
+          :class="['form-group-item', { 'is-upload': getIsUpload(form) }]"
         >
           <template v-if="form.renderable !== false">
             <a :id="`nstc-form-group-${form.anchorPoint}`" />
-            <ExpandCollapse
-                v-if="form.title"
-                :is-can-collapse="isCanCollapse"
-            >
+            <ExpandCollapse v-if="form.title" :is-can-collapse="isCanCollapse">
               <NstcForm
-                  :ref="`formCustom${index}`"
-                  v-model="model[index]"
-                  :reset.sync="form.formReset"
-                  :config="form.formConfig"
-                  :mount-and-query="false"
-                  :rules="rules"
-                  :disabled="disabled"
-                  pureable
-                  :label-width="labelWidth"
-                  :show-mode="showMode"
-              />
-              <template v-slot:title>
-                <template v-if="typeof form.title === 'object'">
-                  <component :is="compile(form.title.component, form, model[index])" v-if="'template' in form.title.component" />
-                  <component :is="form.title.component" v-else />
-                </template>
-
-                <span v-else>{{ form.title }}</span>
-              </template>
-            </ExpandCollapse>
-            <NstcForm
-                v-else
                 :ref="`formCustom${index}`"
                 v-model="model[index]"
                 :reset.sync="form.formReset"
@@ -57,6 +32,31 @@
                 pureable
                 :label-width="labelWidth"
                 :show-mode="showMode"
+              />
+              <template v-slot:title>
+                <template v-if="typeof form.title === 'object'">
+                  <component
+                    :is="compile(form.title.component, form, model[index])"
+                    v-if="'template' in form.title.component"
+                  />
+                  <component :is="form.title.component" v-else />
+                </template>
+
+                <span v-else>{{ form.title }}</span>
+              </template>
+            </ExpandCollapse>
+            <NstcForm
+              v-else
+              :ref="`formCustom${index}`"
+              v-model="model[index]"
+              :reset.sync="form.formReset"
+              :config="form.formConfig"
+              :mount-and-query="false"
+              :rules="rules"
+              :disabled="disabled"
+              pureable
+              :label-width="labelWidth"
+              :show-mode="showMode"
             />
           </template>
         </div>
@@ -65,48 +65,40 @@
       </div>
     </div>
 
-    <div
-        v-if="customSubmit"
-        :class="[
-        isFix ? 'form-group-footer form-group-footer-form' : 'form-group-footer' ]"
-    >
+    <div v-if="customSubmit" :class="[isFix ? 'form-group-footer form-group-footer-form' : 'form-group-footer']">
       <slot name="submit" />
     </div>
 
     <div
-        v-if="!customSubmit &&showFooter"
-        :class="[
-        isFix ? 'form-group-footer form-group-footer-form' : 'form-group-footer' ]"
+      v-if="!customSubmit && showFooter"
+      :class="[isFix ? 'form-group-footer form-group-footer-form' : 'form-group-footer']"
     >
       <el-button
-          v-if="handlers.submit"
-          type="primary"
-          :loading="loading.submit"
-          :class="handlers.submit.className || ''"
-          @click="handleQuery('submit')"
+        v-if="handlers.submit"
+        type="primary"
+        :loading="loading.submit"
+        :class="handlers.submit.className || ''"
+        @click="handleQuery('submit')"
       >
         {{ handlers.submit.label }}
       </el-button>
       <el-button
-          v-if="handlers.save"
-          :loading="loading.save"
-          :class="handlers.save.className || ''"
-          @click="handleQuery('save')"
+        v-if="handlers.save"
+        :loading="loading.save"
+        :class="handlers.save.className || ''"
+        @click="handleQuery('save')"
       >
         {{ handlers.save.label }}
       </el-button>
       <el-button
-          v-if="handlers.reset"
-          class="assist-button"
-          @click="handleReset"
-          :class="handlers.reset.className || ''"
+        v-if="handlers.reset"
+        class="assist-button"
+        @click="handleReset"
+        :class="handlers.reset.className || ''"
       >
         {{ handlers.reset.label }}
       </el-button>
-      <el-button
-          v-if="handlers.cancel"
-          @click="handleCancel('cancel')"
-      >
+      <el-button v-if="handlers.cancel" @click="handleCancel('cancel')">
         {{ handlers.cancel.label }}
       </el-button>
     </div>
@@ -218,7 +210,7 @@ export default {
     },
 
     // 重置
-    reset:{
+    reset: {
       type: Boolean,
       default: false
     }
@@ -240,7 +232,7 @@ export default {
       // validateObj: {
       //   inputwithunit: validInputWithUnit
       // },
-    validateObj: {
+      validateObj: {
         inputwithunit: validInputWithUnit
       },
       // 表单配置更新
@@ -253,11 +245,15 @@ export default {
 
   computed: {
     getIsUpload() {
-      return form => {
-        return form.formConfig && form.formConfig[0] &&
-            (form.formConfig[0].mold === 'nstcupload' || form.formConfig[0].length && form.formConfig[0][0].mold === 'nstcupload')
+      return (form) => {
+        return (
+          form.formConfig &&
+          form.formConfig[0] &&
+          (form.formConfig[0].mold === 'nstcupload' ||
+            (form.formConfig[0].length && form.formConfig[0][0].mold === 'nstcupload'))
+        )
       }
-    },
+    }
   },
 
   watch: {
@@ -271,7 +267,7 @@ export default {
     config: {
       immediate: true,
       deep: true,
-      handler(val,oldValue) {
+      handler(val, oldValue) {
         this.$bus.$emit('nstc_custom_form_config_update', val)
         if (val !== oldValue) {
           this.init(val)
@@ -291,14 +287,14 @@ export default {
         // console.log('00')
         this.loading[action] = true
         // 动态更新 formCustom 的 config 文件时 form[0]可能为空
-        this.rules && await Promise.all(Object.values(this.$refs).map(form => form[0] && form[0].validate()))
+        this.rules && (await Promise.all(Object.values(this.$refs).map((form) => form[0] && form[0].validate())))
         // console.log('11')
 
         if (this.$listeners.query) {
-        // console.log('22')
+          // console.log('22')
           // this.$listeners.query需返回promise
           await this.$listeners.query(JSON.parse(JSON.stringify(this.model)), action)
-        // console.log('33')
+          // console.log('33')
         }
         // console.log('444',err,JSON.parse(JSON.stringify(this.model)),action,form)
       } catch (err) {
@@ -328,7 +324,7 @@ export default {
     async triggerQuery(action) {
       try {
         this.loading[action] = true
-        this.rules && await Promise.all(Object.values(this.$refs).map(form => form[0].validate()))
+        this.rules && (await Promise.all(Object.values(this.$refs).map((form) => form[0].validate())))
         // if (this.$listeners.query) {
         //   // this.$listeners.query需返回promise
         //   await this.$listeners.query(JSON.parse(JSON.stringify(this.model)), action)
@@ -353,9 +349,11 @@ export default {
     },
 
     async handleReset() {
-      this.innerConfig.forEach(item => { item.formReset = true })
+      this.innerConfig.forEach((item) => {
+        item.formReset = true
+      })
       await this.$nextTick()
-      Object.values(this.$refs).forEach(form => form[0] && form[0].clearValidate())
+      Object.values(this.$refs).forEach((form) => form[0] && form[0].clearValidate())
 
       if (this.$listeners.reset) {
         await this.$listeners.reset(JSON.parse(JSON.stringify(this.model)))
@@ -363,7 +361,7 @@ export default {
     },
 
     setModel(index, model) {
-      Object.keys(model).map(k => {
+      Object.keys(model).map((k) => {
         this.$set(this.model[index], k, model[k])
       })
     },
@@ -375,14 +373,12 @@ export default {
       }
       this.getRules()
       this.$nextTick(() => {
-        this.innerConfig = config.map(item => ({
+        this.innerConfig = config.map((item) => ({
           ...item,
           formReset: false,
-          anchorPoint: `ap-${Math.random()
-              .toString(36)
-              .slice(2)}`
+          anchorPoint: `ap-${Math.random().toString(36).slice(2)}`
         }))
-        this.anchorPointArr = this.innerConfig.map(item => ({
+        this.anchorPointArr = this.innerConfig.map((item) => ({
           title: item.name || item.title,
           anchorPoint: item[`anchorPoint`]
         }))
@@ -418,58 +414,45 @@ export default {
      * 获取表单验证规则
      */
     getRules() {
-        const that = this
-        const tempConfig = JSON.parse(JSON.stringify(this.config))
-        this.rules = {}
-        this.rules = tempConfig
-            .reduce((prev, next) => ([
-              ...prev,
-              ...next.formConfig
-            ]), [])
-            .reduce((prev, next) => ([
-              ...prev,
-              ...Array.isArray(next) ? next : [next]
-            ]), [])
-            .reduce((prev, next) => {
-              if (next.link) {
-                const links = next.link.filter(item => !!item.mold)
-
-                return [
-                  ...prev,
-                  next,
-                  ...links
-                ]
-              }
-
-              return [
-                ...prev,
-                next
-              ]
-            }, [])
-            .filter(item => item.isRequired)
-            .reduce((res, curr) => {
-              const isInput = (curr.mold === 'input') || (curr.prop === 'dueDate' || curr.prop ==='lastShipmentDate')
-
-              // 自定义校验
-              const hasSpecificValid = that.validateObj[curr.mold]
-              return {
-                ...res,
-                [curr.prop]: {
-                  required: true,
-                  [`${hasSpecificValid ? 'nstc-': ''}message`]: `请${isInput ? '输入' : '选择'}${curr.name}`,
-                  trigger: isInput ? 'blur' : 'change',
-                  ...(hasSpecificValid ? { validator: hasSpecificValid } : {})
-                  // whitespace: isInput || undefined,
-                  // ...isInput
-                  //   ? {
-                  //     transform(val) {
-                  //       return typeof val === 'string' ? val.trim() : val
-                  //     }
-                  //   }
-                  //   : {}
-                }
-              }
-            }, {})
+      const that = this
+      const tempConfig = JSON.parse(JSON.stringify(this.config))
+      this.rules = {}
+      this.rules = tempConfig
+        .reduce((prev, next) => [...prev, ...next.formConfig], [])
+        .reduce((prev, next) => [...prev, ...(Array.isArray(next) ? next : [next])], [])
+        .reduce((prev, next) => {
+          if (next.link) {
+            const links = next.link.filter((item) => !!item.mold)
+
+            return [...prev, next, ...links]
+          }
+
+          return [...prev, next]
+        }, [])
+        .filter((item) => item.isRequired)
+        .reduce((res, curr) => {
+          const isInput = curr.mold === 'input' || curr.prop === 'dueDate' || curr.prop === 'lastShipmentDate'
+
+          // 自定义校验
+          const hasSpecificValid = that.validateObj[curr.mold]
+          return {
+            ...res,
+            [curr.prop]: {
+              required: true,
+              [`${hasSpecificValid ? 'nstc-' : ''}message`]: `请${isInput ? '输入' : '选择'}${curr.name}`,
+              trigger: isInput ? 'blur' : 'change',
+              ...(hasSpecificValid ? { validator: hasSpecificValid } : {})
+              // whitespace: isInput || undefined,
+              // ...isInput
+              //   ? {
+              //     transform(val) {
+              //       return typeof val === 'string' ? val.trim() : val
+              //     }
+              //   }
+              //   : {}
+            }
+          }
+        }, {})
     },
 
     /**
@@ -500,25 +483,25 @@ export default {
   border-radius: 10px;
   padding-bottom: 30px;
   height: 100%;
-  &-body{
+  &-body {
     display: flex;
     flex-direction: row;
     height: 100%;
-    &-ap{
+    &-ap {
       width: 152px;
       margin-right: 20px;
-      .el-tabs__header{
+      .el-tabs__header {
         width: 100%;
       }
     }
-    &-form{
+    &-form {
       flex: 1;
       overflow-y: auto;
     }
     &-form-anchor-point {
       .form-group-item:nth-child(1) {
         margin-top: 0;
-        padding-top: 0!important;
+        padding-top: 0 !important;
       }
     }
   }
@@ -530,10 +513,10 @@ export default {
       font-size: 14px;
     }
     > i {
-      color: #F5F5F5;
+      color: #f5f5f5;
       // margin-left: 19px;
     }
-    &::after{
+    &::after {
       content: '';
       flex: 1;
     }
@@ -548,10 +531,10 @@ export default {
       width: 400px;
     }
     .form-item:nth-child(1) {
-      margin-left: calc((50% - 400px)* 0.64);
+      margin-left: calc((50% - 400px) * 0.64);
     }
     .form-item:nth-child(2) {
-      margin-left: calc((50% - 400px)* 0.745);
+      margin-left: calc((50% - 400px) * 0.745);
     }
   }
   .form-custom {
@@ -592,7 +575,7 @@ export default {
     height: 61px;
     transition: width 0.3s;
     background-color: #fff;
-    box-shadow: 0px -2px 6px 0px rgba(92,100,113,0.11);
+    box-shadow: 0px -2px 6px 0px rgba(92, 100, 113, 0.11);
     .sider-close {
       background-color: #fff;
       width: calc(100% - 103px) !important;
@@ -633,7 +616,5 @@ export default {
     border: 1px solid #dcdfe6;
     color: #606266;
   }
-
 }
-
 </style>

package/nstc-g6/components/FormGroup/src/validate.js

@@ -2,22 +2,20 @@
  * 占位 不校验
  */
 export function notValid(rule, value, callback) {
-    callback()
+  callback()
 }
 
-
 /**
  * 校验 【融资】 - 【期限】
  */
 export function validInputWithUnit(rule, value, callback) {
-    if (value[0] && value[1]) {
-        // if (/^[0-9]*$/.test(value[0])) {
-        callback()
-        // } else {
-        //     callback(new Error('请输入正整数'))
-        // }
-
-    } else {
-        callback(new Error('请输入期限'))
-    }
-}
+  if (value[0] && value[1]) {
+    // if (/^[0-9]*$/.test(value[0])) {
+    callback()
+    // } else {
+    //     callback(new Error('请输入正整数'))
+    // }
+  } else {
+    callback(new Error('请输入期限'))
+  }
+}