n20-common-lib 2.22.16 → 2.22.18

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.22.16",
3
+ "version": "2.22.18",
4
4
  "private": false,
5
5
  "scripts": {
6
6
  "serve": "vue-cli-service serve",
@@ -1,16 +1,16 @@
1
1
  <template>
2
2
  <div
3
3
  class="w-100p flex-box"
4
- style="
5
- flex-wrap: wrap;
6
- display: grid;
7
- grid-template-columns: repeat(2, 1fr);
8
- gap: 16px;
9
- padding: 0;
10
- overflow-x: hidden;
11
- "
4
+ :style="{
5
+ display: 'grid',
6
+ flexWrap: 'wrap',
7
+ gridTemplateColumns: `repeat(${columns}, 1fr)`,
8
+ gap: '16px',
9
+ padding: '0',
10
+ overflowX: 'hidden'
11
+ }"
12
12
  >
13
- <div v-for="(item, i) in otherAttData" :key="i" class="flex-box flex-v" style="width: 100%; padding: 0 20px">
13
+ <div v-for="(item, i) in otherAttData" :key="i" class="flex-box" style="width: 100%; padding: 0 20px">
14
14
  <el-form-item
15
15
  class="m-r-ss m-b-s"
16
16
  :label-width="labelWidth"
@@ -20,12 +20,7 @@
20
20
  <span slot="label">
21
21
  <span
22
22
  v-title="item.cfgName"
23
- style="
24
- display: inline-block;
25
- white-space: nowrap;
26
- overflow: hidden;
27
- text-overflow: ellipsis;
28
- "
23
+ style="display: inline-block; white-space: nowrap; overflow: hidden; text-overflow: ellipsis"
29
24
  :style="{ maxWidth: labelWidth }"
30
25
  >
31
26
  <span v-if="required" style="color: red">*</span>
@@ -93,13 +88,13 @@
93
88
  v-model="item.cfgVal"
94
89
  :type="'textarea'"
95
90
  placeholder="请输入"
96
- class="w-100p m-r-ss m-b-s flex-1"
91
+ class="w-100p m-r-s m-b-s flex-1"
97
92
  clearable
98
93
  />
99
94
  <el-input
100
95
  v-if="item.cfgHasRemark === '1' && !['11', '12'].includes(item.cfgType)"
101
96
  v-model="item.cfgRemark"
102
- class="w-100p m-r-ss m-b-s flex-1"
97
+ class="w-100p m-r-lg m-b-s flex-1"
103
98
  placeholder="请输入备注"
104
99
  />
105
100
  </div>
@@ -118,6 +113,10 @@ export default {
118
113
  type: [String, Number],
119
114
  default: ''
120
115
  },
116
+ columns: {
117
+ type: Number,
118
+ default: 1
119
+ },
121
120
  form: {
122
121
  type: Object,
123
122
  default: () => ({})
@@ -44,6 +44,7 @@
44
44
  :other-att-data-a="otherAttDataA"
45
45
  :proc-inst-id="procInstId || this.$route.query.processInstanceId"
46
46
  :required="true"
47
+ :columns="columns"
47
48
  :label-width="labelWidth"
48
49
  />
49
50
  </div>
@@ -74,6 +75,10 @@ export default {
74
75
  type: String,
75
76
  default: '12em'
76
77
  },
78
+ columns: {
79
+ type: Number,
80
+ default: 1
81
+ },
77
82
  afterGetConf: {
78
83
  type: Function,
79
84
  default: undefined