n20-common-lib 3.1.16 → 3.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "3.1.16",
+  "version": "3.1.18",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/assets/css/expandable-pane.scss

@@ -1,12 +1,14 @@
 .n20-form-expandable-pane {
-  padding-bottom: 8px;
+  margin-top: 24px;
+  padding-bottom: 24px;
+  border-bottom: 1px solid #e5e6eb;
   .n20-title {
     height: auto;
     line-height: 24px;
     color: #1d2129;
-    padding: 0 12px;
+    padding: 0 8px;
     margin-bottom: 12px;
-    margin-top: 8px;
+
     font-size: 16px;
     font-weight: 500;
     &__algin_l {

package/src/assets/css/v3/anchor.scss

@@ -20,8 +20,8 @@
     flex-direction: column;
     align-items: center;
     padding: 12px 8px;
-    background: #fff;
-    border: 1px solid var(--border-2, #e5e6eb);
+    background: $--color-white;
+    border: 1px solid $--border-color-base;
     border-radius: 15.5px;
     filter: drop-shadow(0px 8px 10px rgba(0, 0, 0, 0.1));
   }
@@ -30,7 +30,7 @@
     flex-shrink: 0;
     width: 2px;
     height: 4px;
-    background: var(--fill-4, #c9cdd4);
+    background: $--color-text-placeholder;
     transition: height 0.2s ease, background 0.2s ease;
 
     & + & {
@@ -39,7 +39,7 @@
 
     &.is-active {
       height: 16px;
-      background: var(--primary-6, #007aff);
+      background: $--color-primary;
     }
   }
 
@@ -48,8 +48,8 @@
     flex-direction: column;
     align-items: flex-start;
     padding: 8px;
-    background: #fff;
-    border: 1px solid var(--border-2, #e5e6eb);
+    background: $--color-white;
+    border: 1px solid $--border-color-base;
     border-radius: 4px;
     filter: drop-shadow(0px 8px 10px rgba(0, 0, 0, 0.1));
   }
@@ -77,16 +77,16 @@
     }
 
     &:not(.is-active):not(.is-disabled):hover {
-      background: var(--fill-1, #f7f8fa);
+      background: $--background-color-base;
     }
 
     &.is-active {
       .n20-anchor-v3__bar {
         height: 12px;
-        background: var(--primary-6, #007aff);
+        background: $--color-primary;
       }
       .n20-anchor-v3__label {
-        color: var(--primary-6, #007aff);
+        color: $--color-primary;
       }
     }
 
@@ -101,7 +101,7 @@
     flex-shrink: 0;
     width: 2px;
     height: 2px;
-    background: var(--fill-4, #c9cdd4);
+    background: $--color-text-placeholder;
     border-radius: 0 4px 4px 0;
     transition: height 0.15s ease, background 0.15s ease;
   }
@@ -112,7 +112,7 @@
     font-size: 13px;
     font-weight: 400;
     line-height: 22px;
-    color: var(--text-1, #1d2129);
+    color: $--color-text-primary;
     white-space: nowrap;
     word-break: break-word;
   }

package/src/components/v3/UploadList/index.vue

@@ -288,30 +288,31 @@ export default {
       previewName: undefined,
       previewSameOrg: false,
       seeRow: {},
-      uploadProgressMap: {}
+      uploadProgressMap: {},
+      tableKey: 0
     }
   },
   computed: {
     fileAccept() {
-      return this.dataProp.fileAccept || undefined
+      return this.dataProp?.fileAccept || undefined
     },
     fileSize() {
-      return this.dataProp.fileSize || undefined
+      return this.dataProp?.fileSize || undefined
     },
     fileData() {
-      return this.dataProp.fileData || undefined
+      return this.dataProp?.fileData || undefined
     },
     typeOptions() {
-      return this.dataProp.typeOptions.map((item, index) => ({ no: index + 1, ...item })) ?? []
+      return this.dataProp?.typeOptions?.map((item, index) => ({ no: index + 1, ...item })) ?? []
     },
     keys() {
-      return this.dataProp.keys || keysDefault
+      return this.dataProp?.keys || keysDefault
     },
     multiple() {
-      return this.dataProp.multiple ?? true
+      return this.dataProp?.multiple ?? true
     },
     uploadedCount() {
-      return this.tableData.filter((row) => row[this.keys.url] || row._name).length
+      return this.tableData?.filter((row) => row[this.keys.url] || row._name).length
     },
     typeRowsMap() {
       const map = Object.create(null)
@@ -332,11 +333,11 @@ export default {
         this.showAllTypes && !this.readonly
           ? this.typeOptions
           : this.typeOptions.filter((item) => {
-              const typeValue = item[this.typeMap.value]
+              const typeValue = item[this.typeMap?.value]
               return (this.typeRowsMap[typeValue] || []).length > 0
             })
       return options.map((item) => {
-        const typeValue = item[this.typeMap.value]
+        const typeValue = item[this.typeMap?.value]
         return {
           item,
           typeValue,
@@ -346,7 +347,7 @@ export default {
     },
     typeMap() {
       return (
-        this.dataProp.typeMap || {
+        this.dataProp?.typeMap || {
           label: 'attname',
           value: 'attno'
         }
@@ -377,48 +378,59 @@ export default {
       // isOptionAiCheck为true,业务组件自己调ai校验
       if (this.AIOptions.isOptionAiCheck) {
         this.$emit('AiCheckFn', row, (result) => {
-          row.aiCheckStatus = result.aiCheckStatus
+          if (result) {
+            row.aiCheckStatus = result.aiCheckStatus
+          }
           this.tableKey++
-          this.$refs.aiCheckDialog.setView(result.list, row.beid)
+          this.$refs.aiCheckDialog && this.$refs.aiCheckDialog.setView(result && result.list, row.beid)
         })
       } else {
         if (!this.AIOptions.bussType) {
           this.$message.error('请先配置bussType')
-          return false
+          return
         }
-        let { data, code } = await axios.post(
-          this.apiPrefix ? `${this.apiPrefix}/neams/eamsbaserecord/aiAttaFile` : `/neams/eamsbaserecord/aiAttaFile`,
-          {
-            ...this.AIOptions,
-            beid: row.beid,
-            bussType: this.AIOptions.bussType,
-            extendPrompt: ''
+        try {
+          let { data, code } = await axios.post(
+            this.apiPrefix ? `${this.apiPrefix}/neams/eamsbaserecord/aiAttaFile` : `/neams/eamsbaserecord/aiAttaFile`,
+            {
+              ...this.AIOptions,
+              beid: row.beid,
+              bussType: this.AIOptions.bussType,
+              extendPrompt: ''
+            }
+          )
+          if (code === 200) {
+            this.$emit('AiCheckFn', data, (result) => {
+              if (result) {
+                row.aiCheckStatus = result.aiCheckStatus
+              }
+              this.tableKey++
+              this.$refs.aiCheckDialog && this.$refs.aiCheckDialog.setView(result && result.list, row.beid)
+            })
           }
-        )
-        if (code === 200) {
-          this.$emit('AiCheckFn', data, (result) => {
-            row.aiCheckStatus = result.aiCheckStatus
-            this.tableKey++
-            this.$refs.aiCheckDialog.setView(result.list, row.beid)
-          })
+        } catch (e) {
+          this.$message.error('AI校验请求失败')
         }
       }
     },
     async getFileTypes() {
-      if (this.dataProp?.bussValues?.length) {
+      if (!this.dataProp?.bussValues?.length) return
+      try {
         const { code, data } = await this.$axios.post(
           `/neams/eamsattachfile/getByBussValues`,
           this.dataProp?.bussValues
         )
-        if (code !== 200) return
+        if (code !== 200 || !data) return
         const { label, value } = this.typeMap
-        this.dataProp.typeOptions = data?.map((item) => {
+        this.dataProp.typeOptions = data.map((item) => {
           return {
             ...item,
             [label]: item.attname,
             [value]: item.attno
           }
         })
+      } catch (e) {
+        // 获取附件类型失败，使用已有的 typeOptions
       }
     },
     /**
@@ -466,9 +478,15 @@ export default {
      * @returns {Object} 供上传回调处理的行对象。
      */
     buildUploadRow(item) {
+      let uname = ''
+      try {
+        uname = JSON.parse(sessionStorage.getItem('userInfo') || '{}').uname || ''
+      } catch (e) {
+        // sessionStorage 不可用时忽略
+      }
       const row = {
         [this.keys.type]: item.type || item.attno,
-        [this.keys.user]: JSON.parse(sessionStorage.getItem('userInfo') || '{}').uname || ''
+        [this.keys.user]: uname
       }
       return row
     },
@@ -519,17 +537,23 @@ export default {
      * @returns {void}
      */
     onTypeUploadSuccess(response, file, fileList, item) {
+      let uname = ''
+      try {
+        uname = JSON.parse(sessionStorage.getItem('userInfo') || '{}').uname || ''
+      } catch (e) {
+        // sessionStorage 不可用时忽略
+      }
       const row = {
         id: 'n' + Math.random(),
         _name: file.name,
-        [this.keys.rowKey]: response.data,
+        [this.keys.rowKey]: response?.data,
         [this.keys.type]: item.type || item.attno,
         [this.keys.time]: dayjs().format('YYYY-MM-DD HH:mm:ss'),
-        [this.keys.user]: JSON.parse(sessionStorage.getItem('userInfo') || '{}').uname || '',
-        [this.keys.url]: response.data,
+        [this.keys.user]: uname,
+        [this.keys.url]: response?.data,
         [this.keys.name]: file.name,
-        _percent: response.code >= 900 || response.code === -1 ? 99 : 100,
-        _status: response.code >= 900 || response.code === -1 ? 'error' : 'success',
+        _percent: response?.code >= 900 || response?.code === -1 ? 99 : 100,
+        _status: response?.code >= 900 || response?.code === -1 ? 'error' : 'success',
         _typeDisabled: true
       }