three-trees-ui 1.0.9 → 1.0.11

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 (9) hide show
  1. package/lib/three-trees-ui.common.js +140 -133
  2. package/lib/three-trees-ui.css +1 -1
  3. package/lib/three-trees-ui.umd.js +140 -133
  4. package/lib/three-trees-ui.umd.min.js +1 -1
  5. package/package.json +1 -1
  6. package/packages/CustomDialog/src/customDialog.vue +6 -2
  7. package/packages/CustomDialog/src/customMobileDialog.vue +6 -2
  8. package/packages/CustomDialog/src/main.vue +9 -3
  9. package/packages/Tree/src/main.vue +7 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "three-trees-ui",
3
- "version": "1.0.9",
3
+ "version": "1.0.11",
4
4
  "publicPath": "/ui",
5
5
  "author": "hotent",
6
6
  "private": false,
package/packages/CustomDialog/src/customDialog.vue CHANGED
@@ -986,7 +986,9 @@
986
986
  if (
987
987
  this.jumpParamKey &&
988
988
  this.isHaveJumpUrl &&
989
- this.modelName == 'data.' + con['target'][0]
989
+ (this.modelName == 'data.' + con['target'][0] ||
990
+ (this.modelName.includes('item.') &&
991
+ con['target'][0].endsWith(this.modelName.split('.')[1])))
990
992
  ) {
991
993
  val += `${item[con.from]}¯${this.jumpParamKey}:${
992
994
  this.selectOrgs[index][this.jumpParamKey]
@@ -1647,7 +1649,9 @@
1647
1649
  if (
1648
1650
  this.jumpParamKey &&
1649
1651
  this.isHaveJumpUrl &&
1650
- this.modelName == 'data.' + con['target'][0]
1652
+ (this.modelName == 'data.' + con['target'][0] ||
1653
+ (this.modelName.includes('item.') &&
1654
+ con['target'][0].endsWith(this.modelName.split('.')[1])))
1651
1655
  ) {
1652
1656
  val += `${decodeURIComponent(item[from])}¯${
1653
1657
  this.jumpParamKey
package/packages/CustomDialog/src/customMobileDialog.vue CHANGED
@@ -938,7 +938,9 @@
938
938
  if (
939
939
  this.jumpParamKey &&
940
940
  this.isHaveJumpUrl &&
941
- this.modelName == 'data.' + con['target'][0]
941
+ (this.modelName == 'data.' + con['target'][0] ||
942
+ (this.modelName.includes('item.') &&
943
+ con['target'][0].endsWith(this.modelName.split('.')[1])))
942
944
  ) {
943
945
  val += `${item[con.from]}¯${this.jumpParamKey}:${
944
946
  this.selectOrgs[index][this.jumpParamKey]
@@ -1465,7 +1467,9 @@
1465
1467
  if (
1466
1468
  this.jumpParamKey &&
1467
1469
  this.isHaveJumpUrl &&
1468
- this.modelName == 'data.' + con['target'][0]
1470
+ (this.modelName == 'data.' + con['target'][0] ||
1471
+ (this.modelName.includes('item.') &&
1472
+ con['target'][0].endsWith(this.modelName.split('.')[1])))
1469
1473
  ) {
1470
1474
  val += `${decodeURIComponent(item[from])}¯${
1471
1475
  this.jumpParamKey
package/packages/CustomDialog/src/main.vue CHANGED
@@ -219,10 +219,16 @@
219
219
  let result = []
220
220
  nameAry.forEach((m) => {
221
221
  // 带url跳转参数的 使用上横杆区分参数 值格式为 名称¯跳转key:跳转value
222
+ // 上横向保存数据库后 有可能被改变此处兼容写了一种上横线
222
223
  let n = {}
223
- if (m.includes('¯') && m.split('¯')[1]) {
224
- n.value = m.split('¯')[0]
225
- let jumpParamStr = m.split('¯')[1]
224
+ if (
225
+ (m.includes('¯') && m.split('¯')[1]) ||
226
+ (m.includes('ˉ') && m.split('ˉ')[1])
227
+ ) {
228
+ let val1 = m.includes('¯') ? m.split('¯')[0] : m.split('ˉ')[0]
229
+ let val2 = m.includes('¯') ? m.split('¯')[1] : m.split('ˉ')[1]
230
+ n.value = val1
231
+ let jumpParamStr = val2
226
232
  if (jumpParamStr) {
227
233
  let jumpParam = jumpParamStr.split(':')
228
234
  n.jumpParamKey = jumpParam[0]
package/packages/Tree/src/main.vue CHANGED
@@ -267,13 +267,18 @@
267
267
  return (
268
268
  this.data &&
269
269
  this.data.length < 1 &&
270
- this.treeData && this.treeData.length < 1
270
+ this.treeData &&
271
+ this.treeData.length < 1
271
272
  )
272
273
  },
273
274
  },
274
275
  watch: {
275
276
  filterText(val) {
276
- this.$refs.elTree.filter(val)
277
+ if (this.lazy) {
278
+ this.$emit('loadALL', val)
279
+ } else {
280
+ this.$refs.elTree.filter(val)
281
+ }
277
282
  },
278
283
  defaultCheckedKeys(val) {
279
284
  this.$refs.elTree.setCheckedKeys(val)