n20-common-lib 2.4.5 → 2.4.7

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

@@ -9,20 +9,12 @@
       :show-pagination="showPagination"
       :pagination.sync="_pagination"
       @selection-change="handleSelectionChange"
-      @pagination-change="val => $emit('pagination-change', val)"
+      @pagination-change="(val) => $emit('pagination-change', val)"
     >
       <template v-if="!multiple" v-slot:before>
-        <el-table-column
-          :width="45"
-          align="center"
-          header-align="center"
-        >
+        <el-table-column :width="45" align="center" header-align="center">
           <template v-slot="{ row, $index }">
-            <el-radio
-              v-model="_value"
-              :label="$index"
-              :disabled="row.disabled"
-            >{{ '' }}</el-radio>
+            <el-radio v-model="_value" :label="$index" :disabled="row.disabled">{{ '' }}</el-radio>
           </template>
         </el-table-column>
       </template>
@@ -98,16 +90,14 @@ export default {
 
   data() {
     return {
-      key: `TableRadioCustomID-${Math.random()
-        .toString(36)
-        .slice(2)}`
+      key: `TableRadioCustomID-${Math.random().toString(36).slice(2)}`
     }
   },
 
   computed: {
     _value: {
       get() {
-        return this.data.findIndex(row => this.value && row[this.valueKey] === this.value[this.valueKey])
+        return this.data.findIndex((row) => this.value && row[this.valueKey] === this.value[this.valueKey])
       },
       set(val) {
         const row = this.data[val]
@@ -125,12 +115,12 @@ export default {
     _columns() {
       return this.multiple
         ? [
-          {
-            type: 'selection',
-            width: 35
-          },
-          ...this.columns
-        ]
+            {
+              type: 'selection',
+              width: 35
+            },
+            ...this.columns
+          ]
         : this.columns
     },
 
@@ -157,15 +147,16 @@ export default {
 
   methods: {
     setSelectedRow(data) {
-      this.value && this.value.forEach((item) => {
-        const index = data.findIndex(row => row[this.valueKey] === item[this.valueKey])
+      this.value &&
+        this.value.forEach((item) => {
+          const index = data.findIndex((row) => row[this.valueKey] === item[this.valueKey])
 
-        this.$refs.tableSelect.$refs.elTable.toggleRowSelection(data[index], true)
-      })
+          this.$refs.tableSelect.$refs.elTable.toggleRowSelection(data[index], true)
+        })
     },
 
     handleSelectionChange(val) {
-      const res = val.map(item => ({
+      const res = val.map((item) => ({
         ...item,
         [this.valueKey]: item[this.valueKey],
         [this.labelKey]: item[this.labelKey]

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

@@ -1,5 +1,5 @@
 <template>
-  <span class="text-custom" :style="{width:parseFloat(width) + 'px'}">{{ getValue(value) }}</span>
+  <span class="text-custom" :style="{ width: parseFloat(width) + 'px' }">{{ getValue(value) }}</span>
 </template>
 
 <script>
@@ -20,7 +20,7 @@ export default {
 
   methods: {
     getValue(value) {
-      if(value instanceof Array) {
+      if (value instanceof Array) {
         return value.toString().replace(/,/g, '')
       } else {
         return value

package/nstc-g6/components/Form/UploadCustom/demo/index.vue

@@ -26,6 +26,4 @@ export default {
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

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

@@ -1,16 +1,10 @@
 <template>
   <div
     :key="key"
-    :class="['upload-custom',{ 'is-multiple': multiple || valueClassification.img.length }]"
+    :class="['upload-custom', { 'is-multiple': multiple || valueClassification.img.length }]"
     :style="{ width: `${_width}px` }"
   >
-    <input
-      v-if="isChoosing"
-      ref="fileInput"
-      type="file"
-      :multiple="multiple"
-      @change="handleFileChange"
-    >
+    <input v-if="isChoosing" ref="fileInput" type="file" :multiple="multiple" @change="handleFileChange" />
     <el-button
       v-if="!isView"
       :loading="loading"
@@ -24,60 +18,28 @@
 
     <template v-if="showFile">
       <template v-if="!multiple && valueClassification.other.length">
-        <div
-          v-if="fileName"
-          class="upload-file-name"
-          :title="fileName"
-        >
+        <div v-if="fileName" class="upload-file-name" :title="fileName">
           {{ fileName }}
         </div>
-        <el-button
-          v-if="fileName"
-          class="upload-file-delete"
-          type="text"
-          @click="handleClickFileBtn"
-        >
+        <el-button v-if="fileName" class="upload-file-delete" type="text" @click="handleClickFileBtn">
           {{ fileBtnName }}
         </el-button>
       </template>
       <template v-else>
         <div class="upload-file-other">
-          <div
-            v-for="(item,index) in valueClassification.other"
-            :key="index"
-            class="upload-file-other-item"
-          >
-            <div
-              class="upload-file-name"
-              :title="item.fileName"
-            >
+          <div v-for="(item, index) in valueClassification.other" :key="index" class="upload-file-other-item">
+            <div class="upload-file-name" :title="item.fileName">
               {{ item.fileName }}
             </div>
-            <el-button
-              class="upload-file-other-delete"
-              type="text"
-              @click="handleClickFileBtn(item) "
-            >
+            <el-button class="upload-file-other-delete" type="text" @click="handleClickFileBtn(item)">
               {{ fileBtnName }}
             </el-button>
           </div>
         </div>
         <div class="upload-file-img">
-          <div
-            v-for="(item,index) in valueClassification.img"
-            :key="index"
-            class="upload-file-img-item"
-          >
-            <el-image
-              :src="item.fileUrl"
-              :preview-src-list="getPreviewSrcList(index)"
-            />
-            <img
-              v-if="!isView"
-              :src="closeImg"
-              alt="#"
-              @click="handleDelete(item)"
-            >
+          <div v-for="(item, index) in valueClassification.img" :key="index" class="upload-file-img-item">
+            <el-image :src="item.fileUrl" :preview-src-list="getPreviewSrcList(index)" />
+            <img v-if="!isView" :src="closeImg" alt="#" @click="handleDelete(item)" />
           </div>
         </div>
       </template>
@@ -109,37 +71,44 @@ export default {
       default: undefined
     },
 
-    value: { // 值格式为单选{ fileName,fileUrl }/{ fileName,file },或者多选[{ fileName,fileUrl }]/[{ fileName,file }]
+    value: {
+      // 值格式为单选{ fileName,fileUrl }/{ fileName,file },或者多选[{ fileName,fileUrl }]/[{ fileName,file }]
       type: [Object, Array],
       default: null
     },
 
-    valueIsFileUrl: { // true时，值返回格式为{ fileName,fileUrl }；false时，值返回格式为{ fileName,file }（file为文件类型）
+    valueIsFileUrl: {
+      // true时，值返回格式为{ fileName,fileUrl }；false时，值返回格式为{ fileName,file }（file为文件类型）
       type: Boolean,
       default: false
     },
 
-    url: { // 上传到自定义服务器的url
+    url: {
+      // 上传到自定义服务器的url
       type: String,
       default: null
     },
 
-    disabled: { // 是否禁用
+    disabled: {
+      // 是否禁用
       type: Boolean,
       default: false
     },
 
-    showFile: { // 是否展示长传结果
+    showFile: {
+      // 是否展示长传结果
       type: Boolean,
       default: true
     },
 
-    validator: { // 上传前的验证，参数为typeCode（文件头前8位，用于检测文件真实格式）, raw（文件buffer对象）
+    validator: {
+      // 上传前的验证，参数为typeCode（文件头前8位，用于检测文件真实格式）, raw（文件buffer对象）
       type: Function,
       default: null
     },
 
-    beforeChooseFile: { // 选择文件前的前置函数
+    beforeChooseFile: {
+      // 选择文件前的前置函数
       type: Function,
       default: null
     },
@@ -149,22 +118,26 @@ export default {
       default: undefined
     },
 
-    max: { // 多选时，最大上传文件个数
+    max: {
+      // 多选时，最大上传文件个数
       type: Number,
       default: 5
     },
 
-    multiple: { // 是否支持多选
+    multiple: {
+      // 是否支持多选
       type: Boolean,
       default: false
     },
 
-    isView: { // 是否仅查看
+    isView: {
+      // 是否仅查看
       type: Boolean,
       default: false
     },
 
-    storeAsPrefix: { // ali-oss上传路径前缀
+    storeAsPrefix: {
+      // ali-oss上传路径前缀
       type: String,
       default: ''
     }
@@ -172,9 +145,7 @@ export default {
 
   data() {
     return {
-      key: `UploadCustomID-${Math.random()
-        .toString(36)
-        .slice(2)}`,
+      key: `UploadCustomID-${Math.random().toString(36).slice(2)}`,
 
       loading: false,
       isChoosing: false,
@@ -195,9 +166,7 @@ export default {
     },
 
     fileName() {
-      return !this.multiple && this._value && this._value.fileName
-        ? this._value.fileName
-        : ''
+      return !this.multiple && this._value && this._value.fileName ? this._value.fileName : ''
     },
 
     _width() {
@@ -216,36 +185,39 @@ export default {
       const _value = this.multiple ? this._value : this._value ? [this._value] : []
       const reg = /\.(png|jpg|gif|jpeg)$/
 
-      return _value.reduce((prev, file, index) => {
-        if (reg.test(file.fileName)) {
-          let fileUrl = ''
+      return _value.reduce(
+        (prev, file, index) => {
+          if (reg.test(file.fileName)) {
+            let fileUrl = ''
 
-          if (file.fileUrl) {
-            fileUrl = file.fileUrl
+            if (file.fileUrl) {
+              fileUrl = file.fileUrl
+            } else {
+              fileUrl = window.URL.createObjectURL(file.file)
+              this.revokeObjectURL.push(fileUrl)
+            }
+
+            prev.img.push({
+              fileUrl,
+              index,
+              ...file
+            })
           } else {
-            fileUrl = window.URL.createObjectURL(file.file)
-            this.revokeObjectURL.push(fileUrl)
+            prev.other.push({
+              ...file,
+              index
+            })
           }
 
-          prev.img.push({
-            fileUrl,
-            index,
-            ...file
-          })
-        } else {
-          prev.other.push({
-            ...file,
-            index
-          })
-        }
-
-        return prev
-      }, { img: [], other: [] })
+          return prev
+        },
+        { img: [], other: [] }
+      )
     },
 
     getPreviewSrcList() {
-      return index => {
-        const imgUrls = this.valueClassification.img.map(item => item.fileUrl)
+      return (index) => {
+        const imgUrls = this.valueClassification.img.map((item) => item.fileUrl)
 
         return imgUrls.slice(index).concat(imgUrls.slice(0, index))
       }
@@ -257,14 +229,14 @@ export default {
   },
 
   beforeDestroy() {
-    this.revokeObjectURL.forEach(fileUrl => window.URL.revokeObjectURL(fileUrl))
+    this.revokeObjectURL.forEach((fileUrl) => window.URL.revokeObjectURL(fileUrl))
   },
 
   methods: {
     async chooseFile() {
       try {
         this.isChoosing = true
-        this.beforeChooseFile && await this.beforeChooseFile()
+        this.beforeChooseFile && (await this.beforeChooseFile())
 
         await this.$nextTick()
 
@@ -283,13 +255,11 @@ export default {
         const files = Array.from(e.target.files)
 
         await this.fileMaxCheck(files)
-        await Promise.all(files.map(file => this.fileTypeCheck(file)))
+        await Promise.all(files.map((file) => this.fileTypeCheck(file)))
 
-        const value = await Promise.all(files.map(file => this.singleFileUpload(file)))
+        const value = await Promise.all(files.map((file) => this.singleFileUpload(file)))
 
-        this._value = this.multiple
-          ? [...this._value, ...value]
-          : value[0]
+        this._value = this.multiple ? [...this._value, ...value] : value[0]
       } catch (err) {
         // this.$$message(err.reason || '上传失败')
       }
@@ -376,7 +346,7 @@ export default {
       return new Promise((resolve, reject) => {
         const reader = new FileReader()
 
-        reader.onload = async function(r) {
+        reader.onload = async function (r) {
           try {
             const buffer = r.target.result
             const dataview = new DataView(buffer)
@@ -407,7 +377,7 @@ export default {
 
     fileMaxCheck(files) {
       return new Promise((resolve, reject) => {
-        if (this.multiple && (files.length + this._value.length > this.max)) {
+        if (this.multiple && files.length + this._value.length > this.max) {
           reject({ reason: `最多上传文件数：${this.max}` })
         }
 
@@ -419,88 +389,88 @@ export default {
 </script>
 
 <style lang="scss">
-    .upload-custom {
-        display: inline-flex;
-        align-items: center;
-        position: relative;
-        padding-right: 32px;
-        &.is-multiple {
-            display: inline-block;
-        }
+.upload-custom {
+  display: inline-flex;
+  align-items: center;
+  position: relative;
+  padding-right: 32px;
+  &.is-multiple {
+    display: inline-block;
+  }
 
-        .button-cancel {
-            flex: none;
-            padding: 0 15px 0 12px;
-            width: auto;
-            display: inline-flex;
-            align-items: center;
-            i {
-                margin-right: 6px;
-                font-size: 9px;
-            }
-        }
+  .button-cancel {
+    flex: none;
+    padding: 0 15px 0 12px;
+    width: auto;
+    display: inline-flex;
+    align-items: center;
+    i {
+      margin-right: 6px;
+      font-size: 9px;
+    }
+  }
 
-        input {
-            display: none;
-        }
+  input {
+    display: none;
+  }
 
-        .upload-file {
-            &-name {
-                font-size: 14px;
-                padding-left: 10px;
-                flex: auto;
-                overflow: hidden;
-                white-space: nowrap;
-                text-overflow: ellipsis;
-            }
+  .upload-file {
+    &-name {
+      font-size: 14px;
+      padding-left: 10px;
+      flex: auto;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
 
-            &-delete {
-                position: absolute;
-                top: 9px;
-                right: 0;
-            }
+    &-delete {
+      position: absolute;
+      top: 9px;
+      right: 0;
+    }
 
-            &-other {
-                display: flex;
-                flex-wrap: wrap;
-                margin-top: 5px;
-                &-item {
-                    flex: none;
-                    display: flex;
-                    align-items: center;
-                    margin-right: 40px;
-                    .upload-file-name {
-                        padding-left: 0;
-                        padding-right: 10px;
-                    }
-                }
-            }
+    &-other {
+      display: flex;
+      flex-wrap: wrap;
+      margin-top: 5px;
+      &-item {
+        flex: none;
+        display: flex;
+        align-items: center;
+        margin-right: 40px;
+        .upload-file-name {
+          padding-left: 0;
+          padding-right: 10px;
+        }
+      }
+    }
 
-            &-img {
-                display: flex;
-                margin-top: 5px;
-                flex-wrap: wrap;
-                &-item {
-                    flex: none;
-                    margin-right: 10px;
-                    position: relative;
-                    .el-image {
-                        width: 72px;
-                        height: 72px;
-                        background-color: #fff;
-                        border-radius: 2px;
-                        border: #CFD8E6;
-                    }
-                    & > img {
-                        position: absolute;
-                        right: 0;
-                        top: 0;
-                        width: 16px;
-                        height: 16px;
-                        cursor: pointer;
-                    }
-                }
-            }
+    &-img {
+      display: flex;
+      margin-top: 5px;
+      flex-wrap: wrap;
+      &-item {
+        flex: none;
+        margin-right: 10px;
+        position: relative;
+        .el-image {
+          width: 72px;
+          height: 72px;
+          background-color: #fff;
+          border-radius: 2px;
+          border: #cfd8e6;
         }
+        & > img {
+          position: absolute;
+          right: 0;
+          top: 0;
+          width: 16px;
+          height: 16px;
+          cursor: pointer;
+        }
+      }
     }
+  }
+}
 </style>

package/nstc-g6/components/Form/configs.js

@@ -18,7 +18,6 @@
 // const FormTooltips = () => ('../FormCreate/component/FormTooltips')
 // const nstcselecttreeCustom = () => import('../SelectTree/src/main')
 
-
 import DatepickerCustom from './DatepickerCustom'
 import InputCustom from './InputCustom'
 import IntervalinputCustom from './IntervalinputCustom'
@@ -45,7 +44,6 @@ import selectsubjectCustom from '^/Form/SelectSubject'
 import payeePersonSelect from '^/Form/payeePersonSelect'
 import inputAndDialog from '^/Form/InputAndDialog'
 
-
 // 定义支持的类型
 export const SUPPORT_TYPE = [
   'datepicker',
@@ -108,7 +106,7 @@ export function getDefaultValue({ mold, multiple, type, default: def }) {
     case 'nstcBankBanchTree':
     case 'selecttreedialog':
       _def = {
-        value: isEmpty(def) ? multiple ? [] : null : def
+        value: isEmpty(def) ? (multiple ? [] : null) : def
       }
       break
 
@@ -127,13 +125,7 @@ export function getDefaultValue({ mold, multiple, type, default: def }) {
 
     case 'upload':
       _def = {
-        value: isEmpty(def)
-          ? multiple
-            ? []
-            : null
-          : multiple
-            ? [...def]
-            : def
+        value: isEmpty(def) ? (multiple ? [] : null) : multiple ? [...def] : def
       }
       break
 
@@ -158,9 +150,7 @@ export function getDefaultValue({ mold, multiple, type, default: def }) {
     case 'datewmqy':
     case 'datepicker':
       _def = {
-        value: type && type.includes('range')
-          ? isEmpty(def) ? [] : [...def]
-          : isEmpty(def) ? null : def
+        value: type && type.includes('range') ? (isEmpty(def) ? [] : [...def]) : isEmpty(def) ? null : def
       }
       break
 
@@ -188,4 +178,3 @@ export function getDefaultValue({ mold, multiple, type, default: def }) {
 export function isEmpty(def) {
   return def === null || def === undefined
 }
-