n20-common-lib 2.6.82 → 2.6.84

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -5,6 +5,13 @@
5
5
  "css_prefix_text": "n20-icon-",
6
6
  "description": "",
7
7
  "glyphs": [
8
+ {
9
+ "icon_id": "33818399",
10
+ "name": "越南语言切换_画板 1",
11
+ "font_class": "a-yuenanyuyanqiehuan_huaban1",
12
+ "unicode": "e630",
13
+ "unicode_decimal": 58928
14
+ },
8
15
  {
9
16
  "icon_id": "39632933",
10
17
  "name": "语言切换",
Binary file
Binary file
Binary file
@@ -45,7 +45,14 @@
45
45
  <!-- YSCW-end -->
46
46
  <el-dropdown v-if="!hideLang" class="m-l-lg" @command="setLang">
47
47
  <!-- <el-tooltip v-if="!hideLang" :content="'语言切换' | $lc"> -->
48
- <i v-if="langVal === 'th'" style="font-size: 20px" class="n20-icon-yuyanqiehuan"></i>
48
+ <i
49
+ v-if="['th', 'vi'].includes(langVal)"
50
+ style="font-size: 20px"
51
+ :class="{
52
+ 'n20-icon-yuyanqiehuan': langVal === 'th',
53
+ 'n20-icon-a-yuenanyuyanqiehuan_huaban1': langVal === 'vi'
54
+ }"
55
+ ></i>
49
56
  <span
50
57
  v-else
51
58
  class="set-user-btn iconfont header-color"
@@ -70,6 +77,9 @@
70
77
  <el-dropdown-item command="th"
71
78
  ><i class="n20-icon-yuyanqiehuan f-s-icon"></i>{{ '泰文' | $lc }}</el-dropdown-item
72
79
  >
80
+ <el-dropdown-item command="vi"
81
+ ><i class="n20-icon-a-yuenanyuyanqiehuan_huaban1 f-s-icon"></i>{{ '越文' | $lc }}</el-dropdown-item
82
+ >
73
83
  </el-dropdown-menu>
74
84
  </el-dropdown>
75
85
 
@@ -7,7 +7,12 @@
7
7
  :data="data"
8
8
  :height="height"
9
9
  :class="{ 'cell-default-set--': cellDefault }"
10
- :checkbox-config="{ checkField: 'checked', checkMethod: forbidSelect }"
10
+ :checkbox-config="{
11
+ checkField: 'checked',
12
+ checkMethod: forbidSelect,
13
+ ...$attrs['checkbox-config'],
14
+ ...attrs.checkboxConfig
15
+ }"
11
16
  show-header-overflow
12
17
  show-overflow
13
18
  :row-config="{ isHover: true, useKey: true, ...$attrs.rowConfig, ...$attrs['row-config'] }"
@@ -266,7 +271,8 @@ export default {
266
271
  // row当前单次勾选的哪一行数据 包含checked字段
267
272
  handleSelectionChange(row = '') {
268
273
  const val = this.$refs.vxeTable.getCheckboxRecords()
269
- this.$emit('selection-change-method', val, row)
274
+ const val1 = this.$refs.vxeTable.getCheckboxReserveRecords()
275
+ this.$emit('selection-change-method', [...val, ...val1], row)
270
276
  },
271
277
  sizeUp(size) {
272
278
  this.sizeC = size