three-trees-ui 1.0.52 → 1.0.53
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/demo.html +10 -0
- package/lib/three-trees-ui.common.js +50588 -0
- package/lib/three-trees-ui.css +1 -0
- package/lib/three-trees-ui.umd.js +50598 -0
- package/lib/three-trees-ui.umd.min.js +1 -0
- package/package.json +2 -11
- package/packages/CustomDialog/src/customDialog.js +6 -12
- package/packages/CustomDialog/src/customDialog.vue +382 -28
- package/packages/Icon/src/icons/drag.js +14 -0
- package/packages/Icon/src/icons/index.js +1 -0
- package/packages/Subtable/src/SubExportDialog.vue +2 -2
- package/packages/Table/src/Table.vue +1 -3
- package/packages/TemplatePreview/src/TemplatePreview.vue +3 -3
- package/src/mixins/templatePreview.js +0 -5
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
},
|
|
38
38
|
},
|
|
39
39
|
computed: {
|
|
40
|
-
columns: function
|
|
40
|
+
columns: function() {
|
|
41
41
|
return eval(decode(this.dataColumns))
|
|
42
42
|
},
|
|
43
43
|
},
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
rows.forEach((row) => {
|
|
53
53
|
var exportRow = {}
|
|
54
54
|
this.columns.forEach((col) => {
|
|
55
|
-
if (
|
|
55
|
+
if (col.ctrlType != 'suntable') {
|
|
56
56
|
exportRow[col.desc] = row[col.name]
|
|
57
57
|
}
|
|
58
58
|
})
|
|
@@ -426,9 +426,7 @@
|
|
|
426
426
|
return this.$allPaginationJustify || this.paginationJustify
|
|
427
427
|
},
|
|
428
428
|
isLoading() {
|
|
429
|
-
return this
|
|
430
|
-
? false
|
|
431
|
-
: this.loading && !this.noLoading
|
|
429
|
+
return this.loading && !this.noLoading
|
|
432
430
|
},
|
|
433
431
|
},
|
|
434
432
|
watch: {
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div name="data-view" class="template-preview-container"
|
|
2
|
+
<div name="data-view" class="template-preview-container">
|
|
3
3
|
<span v-if="html" class="template-content">
|
|
4
4
|
<div v-if="showDateView" class="data_view">
|
|
5
|
-
<ht-dataview-runtime-template
|
|
5
|
+
<ht-dataview-runtime-template
|
|
6
6
|
:key="refreshTime"
|
|
7
7
|
:template-key="templateKey"
|
|
8
8
|
:html="html"
|
|
9
|
-
:
|
|
9
|
+
:search-form="searchForm"
|
|
10
10
|
:template-info="templateInfo"
|
|
11
11
|
:single="single"
|
|
12
12
|
:task-type="taskType"
|
|
@@ -414,8 +414,6 @@ export default {
|
|
|
414
414
|
}
|
|
415
415
|
})
|
|
416
416
|
}
|
|
417
|
-
} else {
|
|
418
|
-
this.multipleTemplateTableloading = false
|
|
419
417
|
}
|
|
420
418
|
this.filterOldSummaryValByType('currentPage')
|
|
421
419
|
this.summaryTableData.unshift({
|
|
@@ -1593,7 +1591,6 @@ export default {
|
|
|
1593
1591
|
Array.prototype.push.apply(params.pagination.querys, querys)
|
|
1594
1592
|
},
|
|
1595
1593
|
getBpmTemplateByPagination(params, cb1, cb2) {
|
|
1596
|
-
this.multipleTemplateTableloading = true
|
|
1597
1594
|
const dataTemplateQueryVo = {
|
|
1598
1595
|
templateId: params.templateId,
|
|
1599
1596
|
queryFilter: params.pagination,
|
|
@@ -1637,7 +1634,6 @@ export default {
|
|
|
1637
1634
|
})
|
|
1638
1635
|
})
|
|
1639
1636
|
.finally(() => {
|
|
1640
|
-
this.multipleTemplateTableloading = false
|
|
1641
1637
|
cb1 && cb1()
|
|
1642
1638
|
cb2 && cb2()
|
|
1643
1639
|
})
|
|
@@ -4382,7 +4378,6 @@ export default {
|
|
|
4382
4378
|
let { instId } = item
|
|
4383
4379
|
this.$set(this.flowBtnPermission, instId, item)
|
|
4384
4380
|
})
|
|
4385
|
-
this.multipleTemplateTableloading = false
|
|
4386
4381
|
})
|
|
4387
4382
|
}
|
|
4388
4383
|
}
|