three-trees-ui 1.0.12 → 1.0.13

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.
Files changed (8) hide show
  1. package/lib/three-trees-ui.common.js +153 -124
  2. package/lib/three-trees-ui.css +1 -1
  3. package/lib/three-trees-ui.umd.js +153 -124
  4. package/lib/three-trees-ui.umd.min.js +1 -1
  5. package/package.json +1 -1
  6. package/packages/CustomDialog/src/customDialog.vue +37 -16
  7. package/packages/CustomDialog/src/customMobileDialog.vue +7 -10
  8. package/packages/CustomDialog/src/main.vue +3 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "three-trees-ui",
3
- "version": "1.0.12",
3
+ "version": "1.0.13",
4
4
  "publicPath": "/ui",
5
5
  "author": "hotent",
6
6
  "private": false,
package/packages/CustomDialog/src/customDialog.vue CHANGED
@@ -121,21 +121,45 @@
121
121
  >
122
122
  <ht-date
123
123
  v-model="queryParams[index].startDate"
124
- :format="condition.config.inputFormat"
125
- :valueFormat="condition.config.inputFormat"
124
+ :format="
125
+ condition.config.inputFormat.includes('mm:ss')
126
+ ? 'yyyy-MM-dd HH:mm:ss'
127
+ : condition.config.inputFormat
128
+ "
129
+ :valueFormat="
130
+ condition.config.inputFormat.includes('mm:ss')
131
+ ? 'yyyy-MM-dd HH:mm:ss'
132
+ : condition.config.inputFormat
133
+ "
126
134
  ></ht-date>
127
135
  至
128
136
  <ht-date
129
137
  v-model="queryParams[index].endDate"
130
- :format="condition.config.inputFormat"
131
- :valueFormat="condition.config.inputFormat"
138
+ :format="
139
+ condition.config.inputFormat.includes('mm:ss')
140
+ ? 'yyyy-MM-dd HH:mm:ss'
141
+ : condition.config.inputFormat
142
+ "
143
+ :valueFormat="
144
+ condition.config.inputFormat.includes('mm:ss')
145
+ ? 'yyyy-MM-dd HH:mm:ss'
146
+ : condition.config.inputFormat
147
+ "
132
148
  ></ht-date>
133
149
  </div>
134
150
  <ht-date
135
151
  v-model="queryParams[index][condition.field]"
136
152
  v-else
137
- :format="condition.config.inputFormat"
138
- :valueFormat="condition.config.inputFormat"
153
+ :format="
154
+ condition.config.inputFormat.includes('mm:ss')
155
+ ? 'yyyy-MM-dd HH:mm:ss'
156
+ : condition.config.inputFormat
157
+ "
158
+ :valueFormat="
159
+ condition.config.inputFormat.includes('mm:ss')
160
+ ? 'yyyy-MM-dd HH:mm:ss'
161
+ : condition.config.inputFormat
162
+ "
139
163
  ></ht-date>
140
164
  </div>
141
165
  <!-- 选择器 -->
@@ -144,7 +168,6 @@
144
168
  class="search-item_main"
145
169
  >
146
170
  <ht-user-selector-input
147
- v-model="queryParams[index].selectName"
148
171
  v-if="condition.config.alias == 'user'"
149
172
  append-to-body
150
173
  @change="
@@ -154,7 +177,6 @@
154
177
  "
155
178
  ></ht-user-selector-input>
156
179
  <ht-org-selector-input
157
- v-model="queryParams[index].selectName"
158
180
  v-if="condition.config.alias == 'org'"
159
181
  append-to-body
160
182
  @change="
@@ -164,7 +186,6 @@
164
186
  "
165
187
  ></ht-org-selector-input>
166
188
  <ht-role-selector-input
167
- v-model="queryParams[index].selectName"
168
189
  v-if="condition.config.alias == 'role'"
169
190
  append-to-body
170
191
  @change="
@@ -174,7 +195,6 @@
174
195
  "
175
196
  ></ht-role-selector-input>
176
197
  <ht-job-selector-input
177
- v-model="queryParams[index].selectName"
178
198
  v-if="condition.config.alias == 'job'"
179
199
  append-to-body
180
200
  @change="
@@ -184,7 +204,6 @@
184
204
  "
185
205
  ></ht-job-selector-input>
186
206
  <ht-post-selector-input
187
- v-model="queryParams[index].selectName"
188
207
  v-if="condition.config.alias == 'post'"
189
208
  append-to-body
190
209
  @change="
@@ -194,7 +213,6 @@
194
213
  "
195
214
  ></ht-post-selector-input>
196
215
  <ht-dimension-selector-input
197
- v-model="queryParams[index].selectName"
198
216
  v-if="condition.config.alias == 'dimension'"
199
217
  append-to-body
200
218
  @change="
@@ -1659,12 +1677,15 @@
1659
1677
  con['target'][0].endsWith(this.modelName.split('.')[1])))
1660
1678
  ) {
1661
1679
  // 需根据key 找到对应 返回数据的返回名称
1662
- let returnMapKey = returnStr.find((k) => {
1663
- return k.field == this.jumpParamKey
1664
- }).comment
1680
+ let returnMap = returnStr.find((k) => {
1681
+ return (
1682
+ k.field.toLowerCase() == this.jumpParamKey.toLowerCase()
1683
+ )
1684
+ })
1685
+ let returnMapKey = returnMap ? returnMap.comment : ''
1665
1686
  val += `${decodeURIComponent(item[from])}¯${
1666
1687
  this.jumpParamKey
1667
- }:${item[returnMapKey]},`
1688
+ }:${decodeURIComponent(item[returnMapKey])},`
1668
1689
  } else {
1669
1690
  val += decodeURIComponent(item[from]) + ','
1670
1691
  }
package/packages/CustomDialog/src/customMobileDialog.vue CHANGED
@@ -113,7 +113,6 @@
113
113
  <!-- 选择器 -->
114
114
  <div v-if="condition.controllerType == '7'">
115
115
  <ht-user-selector-input
116
- v-model="queryParams[index].selectName"
117
116
  v-if="condition.config.alias == 'user'"
118
117
  append-to-body
119
118
  @change="
@@ -123,7 +122,6 @@
123
122
  "
124
123
  ></ht-user-selector-input>
125
124
  <ht-org-selector-input
126
- v-model="queryParams[index].selectName"
127
125
  v-if="condition.config.alias == 'org'"
128
126
  append-to-body
129
127
  @change="
@@ -133,7 +131,6 @@
133
131
  "
134
132
  ></ht-org-selector-input>
135
133
  <ht-role-selector-input
136
- v-model="queryParams[index].selectName"
137
134
  v-if="condition.config.alias == 'role'"
138
135
  append-to-body
139
136
  @change="
@@ -143,7 +140,6 @@
143
140
  "
144
141
  ></ht-role-selector-input>
145
142
  <ht-job-selector-input
146
- v-model="queryParams[index].selectName"
147
143
  v-if="condition.config.alias == 'job'"
148
144
  append-to-body
149
145
  @change="
@@ -153,7 +149,6 @@
153
149
  "
154
150
  ></ht-job-selector-input>
155
151
  <ht-post-selector-input
156
- v-model="queryParams[index].selectName"
157
152
  v-if="condition.config.alias == 'post'"
158
153
  append-to-body
159
154
  @change="
@@ -163,7 +158,6 @@
163
158
  "
164
159
  ></ht-post-selector-input>
165
160
  <ht-dimension-selector-input
166
- v-model="queryParams[index].selectName"
167
161
  v-if="condition.config.alias == 'dimension'"
168
162
  append-to-body
169
163
  @change="
@@ -1472,12 +1466,15 @@
1472
1466
  con['target'][0].endsWith(this.modelName.split('.')[1])))
1473
1467
  ) {
1474
1468
  // 需根据key 找到对应 返回数据的返回名称
1475
- let returnMapKey = returnStr.find((k) => {
1476
- return k.field == this.jumpParamKey
1477
- }).comment
1469
+ let returnMap = returnStr.find((k) => {
1470
+ return (
1471
+ k.field.toLowerCase() == this.jumpParamKey.toLowerCase()
1472
+ )
1473
+ })
1474
+ let returnMapKey = returnMap ? returnMap.comment : ''
1478
1475
  val += `${decodeURIComponent(item[from])}¯${
1479
1476
  this.jumpParamKey
1480
- }:${item[returnMapKey]},`
1477
+ }:${decodeURIComponent(item[returnMapKey])},`
1481
1478
  } else {
1482
1479
  val += decodeURIComponent(item[from]) + ','
1483
1480
  }
package/packages/CustomDialog/src/main.vue CHANGED
@@ -285,6 +285,9 @@
285
285
  }
286
286
  //获取对话框按钮名称宽度
287
287
  this.calacInputSuffixWidth()
288
+ if (this.value && this.inputWriteable) {
289
+ this.calacInputSuffixHeight()
290
+ }
288
291
  }, 50)
289
292
  },
290
293
  methods: {