n20-common-lib 2.11.24 → 2.11.26

package/package.json

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

package/src/components/Table/filters.js

@@ -58,6 +58,19 @@ export function colfF(colf, map) {
   return (row) => tplFn(row, sc, mck, map)
 }
 
+export function colfFRow(row, colf, map) {
+  if (typeof colf !== 'string') return colf
+  let sc = colf.split(/{.+?}/g) || []
+  let mc = colf.match(/{.+?}/g) || []
+  let mck = []
+  mc.forEach((t) => {
+    t = t.replace(/^{|\s+|}$/g, '').split('|')
+    mck.push(t)
+  })
+
+  return tplFn(row, sc, mck, map)
+}
+
 export function colftF(colft, fMap) {
   if (typeof colft !== 'string') return colft
   return fMap[colft]

package/src/components/Upload/uploadMsg.vue

@@ -61,11 +61,11 @@
                 :width="column.width"
                 :align="column.align"
                 :show-overflow-tooltip="column.showOverflowTooltip"
-                :formatter="column.formatter | colfF(column.formatterMap)"
               >
                 <template slot-scope="scope">
+                  <span v-if="column.formatter">{{ scope.row | colfFRow(column.formatter, column.formatterMap) }}</span>
                   <!-- eslint-disable-next-line vue/no-v-html -->
-                  <span v-html="scope.row[column.prop]"></span>
+                  <span v-else v-html="scope.row[column.prop]"></span>
                 </template>
               </el-table-column>
             </el-table>
@@ -116,7 +116,7 @@
 import XEUtils from 'xe-utils'
 import { $lc } from '../../utils/i18n/index'
 import Pagination from '../Pagination/index.vue'
-import { colfF } from '../Table/filters.js'
+import { colfFRow } from '../Table/filters.js'
 export default {
   name: 'UploadMsg',
   components: { Pagination },
@@ -171,7 +171,7 @@ export default {
     }
   },
   filters: {
-    colfF
+    colfFRow
   },
   data() {
     return {