n20-common-lib 2.8.13 → 2.8.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.8.13",
+  "version": "2.8.15",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -64,6 +64,7 @@
     "v-viewer": "1.6.4",
     "vue-jsonp": "2.0.0",
     "vuedraggable": "*",
+    "webpack-duplicate-relano-plugin": "^0.1.0",
     "xe-utils": "^3.5.11"
   },
   "devDependencies": {

package/src/components/AdvancedFilter/filterItem.vue

@@ -52,7 +52,7 @@ export default {
   methods: {
     checkChange(keys) {
       if (keys.length > this.maxLength) {
-        return this.$message.warning(`最多只能添加${this.maxLength}个筛选条件!`)
+        return this.$message.warning(`${$lc('最多只能添加')}${this.maxLength}${$lc('个')}${$lc('筛选条件!')}`)
       }
       this.$emit('checked', keys)
     },

package/src/components/AdvancedFilter/index.vue

@@ -36,9 +36,9 @@
           <el-input v-model="keyword" clearable class="input-w m-b-s" :placeholder="$lc('搜索筛选条件')" />
           <div class="flex-box flex-lr">
             <el-button type="text" @click="allCheck">{{
-              checkList.length === filterListS.length ? '取消全选' : '全选'
+              checkList.length === filterListS.length ? $lc('取消全选') : $lc('全选')
             }}</el-button>
-            <el-button type="text" @click="defaultCheck"> 恢复默认</el-button>
+            <el-button type="text" @click="defaultCheck">{{ $lc('恢复默认') }}</el-button>
           </div>
           <filterItem
             :filter-list="filterListS"
@@ -47,8 +47,8 @@
             @checked="check"
           />
           <div class="flex-box flex-c m-t-m">
-            <el-button size="mini" type="primary" @click="savaCheck">确认</el-button>
-            <el-button plain type="primary" @click="cancel">取消</el-button>
+            <el-button size="mini" type="primary" @click="savaCheck">{{ $lc('确认') }}</el-button>
+            <el-button plain type="primary" @click="cancel">{{ $l('取消') }}</el-button>
           </div>
         </el-popover>
         <el-link class="m-l-s color-primary" :underline="false" icon="n20-icon-query" @click="$emit('search')">

package/src/components/LoginTemporary/form.vue

@@ -182,6 +182,10 @@ export default {
       type: String,
       default: ''
     },
+    syncRelated: {
+      type: Function,
+      default: undefined
+    },
     asyncRelaNos: {
       type: Boolean,
       default: false
@@ -582,6 +586,7 @@ export default {
         } else {
           this.$router.replace('/')
         }
+        this.syncRelated && this.syncRelated()
       })
     },
     // 获取用户基本信息

package/src/components/LoginTemporary/index.vue

@@ -6,6 +6,7 @@
       :before-login="beforeLogin"
       :login-types="loginTypes"
       :login-then="loginThen"
+      :syncRelated="syncRelated"
       :async-rela-nos="asyncRelaNos"
       :show-forget-btn="showForgetBtn"
       style="display: none"
@@ -25,6 +26,7 @@
       :before-login="beforeLogin"
       :login-types="loginTypes"
       :login-then="loginThen"
+      :syncRelated="syncRelated"
       :async-rela-nos="asyncRelaNos"
       :show-image-code="showImageCode"
       :show-forget-btn="showForgetBtn"
@@ -86,6 +88,10 @@ export default {
       type: Object,
       default: undefined
     },
+    syncRelated: {
+      type: Function,
+      default: undefined
+    },
     asyncRelaNos: {
       type: Boolean,
       default: false

package/src/components/LoginTemporary/indexN.vue

@@ -7,6 +7,7 @@
         :login-types="loginTypes"
         :login-then="loginThen"
         :async-rela-nos="asyncRelaNos"
+        :syncRelated="syncRelated"
         :show-forget-btn="showForgetBtn"
         :extra-form="extraForm"
         style="display: none"
@@ -87,6 +88,7 @@
         :login-types="loginTypes"
         :login-then="loginThenT"
         :async-rela-nos="asyncRelaNos"
+        :syncRelated="syncRelated"
         :extra-form="extraForm"
         :show-image-code="imgCode"
         :show-forget-btn="showForgetBtn"
@@ -187,6 +189,10 @@ export default {
       type: Object,
       default: undefined
     },
+    syncRelated: {
+      type: Function,
+      default: undefined
+    },
     asyncRelaNos: {
       type: Boolean,
       default: false

package/src/components/TablePro/index.vue

@@ -92,7 +92,7 @@
       </template>
       <template #empty>
         <slot name="empty">
-          <empty type="empty" content="暂无数据" :height="200" :width="200" />
+          <empty type="empty" :content="$lc('暂无数据')" :height="200" :width="200" />
         </slot>
       </template>
     </vxe-table>
@@ -271,6 +271,7 @@ export default {
     // row当前单次勾选的哪一行数据 包含checked字段
     handleSelectionChange(row = '') {
       const val = this.$refs.vxeTable.getCheckboxRecords()
+      // 支持跨页勾选
       const val1 = this.$refs.vxeTable.getCheckboxReserveRecords()
       this.$emit('selection-change-method', [...val, ...val1], row)
     },

package/src/i18n.json

@@ -789,6 +789,21 @@
     "th": "ล้าง",
     "vi": "Trống"
   },
+  "最多只能添加": {
+    "en": "Can only add up to",
+    "th": "สามารถเพิ่มได้สูงสุด",
+    "vi": "Chỉ có thể thêm tối đa"
+  },
+  "个": {
+    "en": "a",
+    "th": "คน",
+    "vi": "cái"
+  },
+  "筛选条件!": {
+    "en": "Filter conditions!",
+    "th": "เงื่อนไขการกรอง!",
+    "vi": "Điều kiện lọc!"
+  },
   "暂存": {
     "en": "Temporary storage",
     "th": "การจัดเก็บชั่วคราว",
@@ -3269,6 +3284,16 @@
     "th": "เลือกแล้ว",
     "vi": "Đã chọn"
   },
+  "全选": {
+    "en": "Select all",
+    "th": "เลือกทั้งหมด",
+    "vi": "Chọn tất cả"
+  },
+  "取消全选": {
+    "en": "Deselect all",
+    "th": "ยกเลิกการเลือกทั้งหมด",
+    "vi": "Bỏ chọn tất cả"
+  },
   "导入进度": {
     "en": "Import progress",
     "th": "ความคืบหน้าการนำเข้า",