n20-common-lib 2.2.39 → 2.2.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.2.39",
+  "version": "2.2.41",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/Anchor/AnchorItem.vue

@@ -38,7 +38,7 @@ export default {
     }
   },
   mounted() {
-    this.init('mount', this.id, this.title)
+    this.init('mount', this.id, this.title, this.$slots.title)
   },
   beforeDestroy() {
     this.init('destroy', this.id, this.title)

package/src/components/Anchor/index.vue

@@ -19,6 +19,7 @@ import { debounce } from 'throttle-debounce'
 import { addListener, removeListener } from 'resize-detector'
 
 import AnchorSidebar from './sidebar.vue'
+console.log(AnchorSidebar, 124)
 export default {
   name: 'Anchor',
   components: {
@@ -91,14 +92,15 @@ export default {
         }
       }
     },
-    itemWatch(type, id, title) {
+    itemWatch(type, id, title, slotT) {
       if (type === 'mount') {
         let item = this.navList.find((c) => c.id === id)
         if (!item) {
-          item = { id: id, title: title, height: 48 }
+          item = { id: id, title: title, slotT: slotT, height: 48 }
           this.navList.push(item)
         } else {
           item.title = title
+          item.slotT = slotT
         }
 
         let dom = this.$refs['anchor-content'].querySelector(`[anchor-item-id="${id}"]`)

package/src/components/Anchor/sidebar.vue

@@ -1,17 +1,3 @@
-<template>
-  <div class="p-t-m">
-    <div
-      v-for="item in navList"
-      :key="item.id"
-      class="n20-anchor2-nav"
-      :class="{ 'n20-anchor2-nav-activit': item.id === activit }"
-      @click="$emit('click', item)"
-    >
-      {{ item.title }}
-    </div>
-  </div>
-</template>
-
 <script>
 export default {
   props: {
@@ -23,6 +9,32 @@ export default {
       type: [String, Number],
       default: undefined
     }
+  },
+  render() {
+    let _vm = this
+    let { navList, activit, _c, _l, _v, _s } = _vm
+
+    return _c(
+      'div',
+      { staticClass: 'p-t-m' },
+      _l(navList, function (item) {
+        return _c(
+          'div',
+          {
+            key: item.id,
+            staticClass: 'n20-anchor2-nav',
+            class: { 'n20-anchor2-nav-activit': item.id === activit },
+            on: {
+              click: function ($event) {
+                return _vm.$emit('click', item)
+              }
+            }
+          },
+          item.slotT ? item.slotT : [_v(_s(item.title))]
+        )
+      }),
+      0
+    )
   }
 }
 </script>

package/src/components/FileImport/index.vue

@@ -16,15 +16,15 @@
       >
         <span ref="upload-trigger" slot="trigger">upload</span>
       </Upload>
-      <uploadMsg v-else
+      <uploadMsg
+        v-else
         :title="'导入文件' | $lc"
         :visible.sync="errorV"
         :validate-result="validateResult"
         :hide-percent="true"
-        :footerBtn="footer"
+        :footer-btn="footer"
         :validate-confirm="validateConfirm"
       />
-
     </div>
   </el-dropdown>
 </template>
@@ -43,6 +43,10 @@ export default {
       type: String,
       default: ''
     },
+    templateOpt: {
+      type: Object,
+      default: undefined
+    },
     fileName: {
       type: String,
       default: $lc('下载.xlsx')
@@ -84,7 +88,7 @@ export default {
   watch: {
     validateDialog(val) {
       this.errorV = val
-    },
+    }
   },
   mounted() {
     console.log(this.footer)
@@ -114,7 +118,7 @@ export default {
       })
     },
     downFn() {
-      axios.get(this.templateUrl, null, { responseType: 'blob' }).then((blob) => {
+      axios.get(this.templateUrl, null, { responseType: 'blob', ...this.templateOpt }).then((blob) => {
         downloadBlob(blob, this.fileName)
       })
     }

package/src/components/Table/index.vue

@@ -3,6 +3,7 @@
     v-if="!bigData"
     ref="el-table"
     :key="colsKey"
+    :class="{ 'cell-default-set--': cellDefault, 'clear-in-form-margin': clearInFormMargin }"
     :header-cell-style="{ 'text-align': 'center' }"
     :data="data"
     :height="height"
@@ -152,6 +153,14 @@ export default {
     showSetsize: {
       type: Boolean,
       default: false
+    },
+    cellDefault: {
+      type: Boolean,
+      default: false
+    },
+    clearInFormMargin: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -246,3 +255,11 @@ export default {
   }
 }
 </script>
+<style>
+.cell-default-set-- .el-table__body .el-table__cell .cell:empty::before {
+  content: '--';
+}
+.clear-in-form-margin .el-table__body .el-table__cell .cell .el-form-item {
+  margin-bottom: 0;
+}
+</style>