three-trees-ui 1.0.38 → 1.0.39
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/lib/three-trees-ui.common.js +31 -31
- package/lib/three-trees-ui.css +1 -1
- package/lib/three-trees-ui.umd.js +31 -31
- package/lib/three-trees-ui.umd.min.js +1 -1
- package/package.json +1 -1
- package/packages/OrgPostDialog/src/main.vue +1 -1
- package/src/mixins/querySqlPreview.js +6 -3
- package/src/mixins/templatePreview.js +8 -5
package/package.json
CHANGED
|
@@ -894,9 +894,12 @@ export default {
|
|
|
894
894
|
const checkField = JSON.parse(
|
|
895
895
|
decode(customColumnSetting[customColumnsHashCode]) || '[]'
|
|
896
896
|
)
|
|
897
|
-
return checkField.
|
|
898
|
-
|
|
899
|
-
|
|
897
|
+
return checkField.length
|
|
898
|
+
? checkField.filter(
|
|
899
|
+
(field) =>
|
|
900
|
+
field.checked && ['序号', '操作'].indexOf(field.value) == -1
|
|
901
|
+
)
|
|
902
|
+
: customColumns
|
|
900
903
|
},
|
|
901
904
|
},
|
|
902
905
|
}
|
|
@@ -2432,7 +2432,7 @@ export default {
|
|
|
2432
2432
|
if (type === 'searchResult') {
|
|
2433
2433
|
this.curSelectParams.queryFilter.querys = this.templateSearchQuery
|
|
2434
2434
|
}
|
|
2435
|
-
|
|
2435
|
+
// 增加导出字段限制
|
|
2436
2436
|
const checkField = this.getCheckField()
|
|
2437
2437
|
if (checkField && checkField.length) {
|
|
2438
2438
|
let fieldExport = {}
|
|
@@ -4612,7 +4612,7 @@ export default {
|
|
|
4612
4612
|
return strData
|
|
4613
4613
|
}
|
|
4614
4614
|
},
|
|
4615
|
-
|
|
4615
|
+
getCheckField() {
|
|
4616
4616
|
let customColumns = this.$refs.multipleTemplateTable.customColumns || []
|
|
4617
4617
|
let customColumnSetting = JSON.parse(
|
|
4618
4618
|
localStorage.getItem('customColumnSetting') || '{}'
|
|
@@ -4622,9 +4622,12 @@ export default {
|
|
|
4622
4622
|
const checkField = JSON.parse(
|
|
4623
4623
|
decode(customColumnSetting[customColumnsHashCode]) || '[]'
|
|
4624
4624
|
)
|
|
4625
|
-
return checkField.
|
|
4626
|
-
|
|
4627
|
-
|
|
4625
|
+
return checkField.length
|
|
4626
|
+
? checkField.filter(
|
|
4627
|
+
(field) =>
|
|
4628
|
+
field.checked && ['序号', '操作'].indexOf(field.value) == -1
|
|
4629
|
+
)
|
|
4630
|
+
: customColumns
|
|
4628
4631
|
},
|
|
4629
4632
|
},
|
|
4630
4633
|
// asyncComputed: {
|