n20-common-lib 2.9.7 → 2.9.9

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "n20-common-lib",
3
- "version": "2.9.7",
3
+ "version": "2.9.9",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "vue-cli-service serve",
@@ -27,6 +27,12 @@
27
27
  v-bind="formItem"
28
28
  :class="{ 'col-span-24': formItem.type === 'textarea' || formItem.alone }"
29
29
  >
30
+ <!-- 表头插槽 -->
31
+ <template slot="label">
32
+ <slot :name="'label_' + key">
33
+ <span>{{ formItem.label }}</span>
34
+ </slot>
35
+ </template>
30
36
  <!--编辑状态-->
31
37
  <template v-if="edit">
32
38
  <div class="flex-box flex-v">
@@ -35,12 +41,6 @@
35
41
  :content="(formItem.tooltip && formItem.tooltip.content) || String(formItem.value)"
36
42
  placement="top"
37
43
  >
38
- <!-- 表头插槽 -->
39
- <div slot="label">
40
- <slot :name="'label_' + key">
41
- <span>{{ formItem.label }}</span>
42
- </slot>
43
- </div>
44
44
  <!-- 插槽 -->
45
45
  <template v-if="formItem.type === 'slot'">
46
46
  <slot :name="key" :formItem="formItem"></slot>
@@ -59,6 +59,14 @@
59
59
  v-bind="formItem"
60
60
  @change="(value) => $emit('valueChange', value, key)"
61
61
  />
62
+ <el-button
63
+ v-if="showBtn"
64
+ type="primary"
65
+ size="mini"
66
+ class="m-l-s"
67
+ @click="$emit('showBtnClick', formItem, key)"
68
+ >{{ formItem.btnText || showBtnText }}</el-button
69
+ >
62
70
  </template>
63
71
  <!-- 金额 -->
64
72
  <template v-else-if="formItem.type === 'input-number'">
@@ -226,6 +234,14 @@
226
234
  :clearable="formItem.clearable === false ? false : true"
227
235
  @change="(value) => $emit('valueChange', value, key)"
228
236
  />
237
+ <el-button
238
+ v-if="showBtn"
239
+ type="primary"
240
+ size="mini"
241
+ class="m-l-s"
242
+ @click="$emit('showBtnClick', formItem, key)"
243
+ >{{ formItem.btnText || showBtnText }}</el-button
244
+ >
229
245
  </template>
230
246
  <!--模糊搜索下拉-->
231
247
  <template v-else-if="formItem.type === 'searchSelect'">
@@ -377,6 +393,14 @@ export default {
377
393
  disabled: {
378
394
  type: Boolean,
379
395
  default: false
396
+ },
397
+ showBtn: {
398
+ type: Boolean,
399
+ default: false
400
+ },
401
+ showBtnText: {
402
+ type: String,
403
+ default: ''
380
404
  }
381
405
  },
382
406
  data() {
@@ -53,7 +53,7 @@
53
53
  '回到应用' | $lc
54
54
  }}</el-button>
55
55
  <!-- YSCW-end -->
56
- <el-dropdown v-if="!hideLang && langMap.length > 1" class="m-l-lg" @command="setLang">
56
+ <el-dropdown v-if="!hideLang && langMap && langMap.length > 1" class="m-l-lg" @command="setLang">
57
57
  <i
58
58
  v-if="['th', 'vi'].includes(langVal)"
59
59
  style="font-size: 20px"
@@ -501,7 +501,7 @@ export default {
501
501
  this.hideTheme = _layoutData.hideTheme
502
502
  this.showNavigation = _layoutData.showNavigation
503
503
  this.systemChange = _layoutData.systemChange
504
- if (this.langMap?.lang?.length) {
504
+ if (this.langMap && this.langMap.lang && this.langMap.lang.length > 0) {
505
505
  window.localStorage.setItem('pageLang', this.jsonData?.lang[0])
506
506
  }
507
507
  if (_loginSetting !== 'JSON') {