n20-common-lib 3.2.34 → 3.2.36

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": "3.2.34",
3
+ "version": "3.2.36",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "vue-cli-service serve",
@@ -12,6 +12,12 @@
12
12
  }
13
13
  }
14
14
 
15
+ // col-span-24(textarea/alone 独占整行)字段内容区恢复 shrink-to-fit,
16
+ // 否则 width:100% 会把 textarea 撑成异常宽度(普通输入框有 .input-w !important 不受影响)
17
+ .el-form-item.col-span-24 .el-form-item__content {
18
+ width: auto;
19
+ }
20
+
15
21
  // 无标签字段隐藏
16
22
  .no-label {
17
23
  display: none !important;
@@ -295,8 +295,8 @@
295
295
  :class="{ 'flex-box': align === 'left-right' }"
296
296
  :style="align === 'left-right' ? 'justify-content: space-between' : ''"
297
297
  >
298
- <span>{{ s.cfgName }}:{{ s.cfgName }}:</span>
299
- <span>{{ s.cfgText ? s.cfgText : s.cfgVal }}{{ s.cfgRemark }}</span>
298
+ <span>{{ s.cfgName }}:{{ s.cfgText ? s.cfgText : s.cfgVal }}</span>
299
+ <span>{{ s.cfgRemark }}</span>
300
300
  </div>
301
301
  </div>
302
302
  </div>
@@ -1,5 +1,9 @@
1
1
  <template>
2
- <div class="el-table-set-size flex-box" :style="{ '--hover-width': hoverWidth }">
2
+ <div
3
+ v-if="showColumn || showSetsize || showPinBtn || hasExpand"
4
+ class="el-table-set-size flex-box"
5
+ :style="{ '--hover-width': hoverWidth }"
6
+ >
3
7
  <div v-if="showColumn" class="el-table-set-size-item m-r-0">
4
8
  <i
5
9
  v-title="$lc('设置显示列')"
@@ -90,6 +94,14 @@ export default {
90
94
  })
91
95
  }
92
96
  },
97
+ data() {
98
+ let _this = this
99
+ return {
100
+ isExpand: false,
101
+ hoverIconKey: null, // 当前悬停的静态列头图标标识
102
+ sizeC: localStorage.getItem('table-size') || _this.size
103
+ }
104
+ },
93
105
  computed: {
94
106
  // 是否显示展开/折叠按钮(配置了 treeConfig 才显示)
95
107
  hasExpand() {
@@ -105,14 +117,6 @@ export default {
105
117
  return widthMap[this.activeItemCount] || '0px'
106
118
  }
107
119
  },
108
- data() {
109
- let _this = this
110
- return {
111
- isExpand: false,
112
- hoverIconKey: null, // 当前悬停的静态列头图标标识
113
- sizeC: localStorage.getItem('table-size') || _this.size
114
- }
115
- },
116
120
  watch: {
117
121
  size() {
118
122
  this.setSize(localStorage.getItem('table-size') || this.size, 'pasv')
@@ -17,6 +17,8 @@
17
17
  </template>
18
18
 
19
19
  <script>
20
+ import { $lc } from '../../../utils/i18n'
21
+
20
22
  export default {
21
23
  name: 'Header',
22
24
  props: {
@@ -30,7 +32,7 @@ export default {
30
32
  },
31
33
  title: {
32
34
  type: String,
33
- default: '返回'
35
+ default: $lc('返回')
34
36
  },
35
37
  content: {
36
38
  type: String,