agilebuilder-ui 1.1.39-sit1 → 1.1.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/{401-994c9198.js → 401-10773a45.js} +1 -1
- package/lib/{404-529e9d04.js → 404-bc7b5bc4.js} +1 -1
- package/lib/{iframe-page-8416d7e7.js → iframe-page-593fe033.js} +1 -1
- package/lib/{index-f2020c47.js → index-5276895e.js} +9189 -9222
- package/lib/super-ui.css +1 -1
- package/lib/super-ui.js +1 -1
- package/lib/super-ui.umd.cjs +63 -63
- package/lib/{tab-content-iframe-index-b9c23a8b.js → tab-content-iframe-index-12a5a7c2.js} +1 -1
- package/lib/{tab-content-index-289ae3af.js → tab-content-index-6901441f.js} +1 -1
- package/lib/{tache-subprocess-history-3ad4baa1.js → tache-subprocess-history-8fd8d5f7.js} +1 -1
- package/package.json +1 -1
- package/packages/department-tree-inline/src/department-single-tree-inline.vue +1 -3
- package/packages/department-user-tree-inline/src/department-user-multiple-tree-inline.vue +1 -5
- package/packages/department-user-tree-inline/src/department-user-single-tree-inline.vue +1 -2
- package/packages/department-user-tree-inline/src/department-user-tree-multi-service.js +1 -0
- package/packages/department-user-tree-mobile/src/department-user-tree-inline-app.vue +1 -3
- package/packages/fs-preview/src/fs-preview.vue +8 -40
- package/packages/fs-upload-list/src/fs-upload-list.vue +23 -42
- package/packages/fs-upload-new/src/fs-button-upload.vue +4 -4
- package/packages/fs-upload-new/src/fs-drag-upload.vue +4 -4
- package/packages/fs-upload-new/src/fs-preview-new.vue +7 -6
- package/packages/fs-upload-new/src/fs-upload-new.vue +12 -12
- package/packages/organization-input/src/organization-input.vue +3 -3
- package/packages/super-grid/src/components/mobile-table-card.jsx +1 -0
- package/packages/super-grid/src/custom-formatter.js +1 -1
- package/packages/super-grid/src/normal-column-content.vue +12 -17
- package/packages/super-grid/src/row-operation.vue +9 -13
- package/packages/super-grid/src/search-form-item.vue +4 -47
- package/packages/super-grid/src/search-form-mobile.vue +0 -5
- package/packages/super-grid/src/search-form-ordinarySearch.vue +0 -5
- package/packages/super-grid/src/search-methods.js +1 -3
- package/packages/utils/organization.ts +40 -56
- package/packages/workflow-history-list/src/workflow-history-list.vue +3 -41
- package/src/directives/permission/permission.js +1 -7
- package/src/i18n/langs/cn.js +3 -10
- package/src/i18n/langs/en.js +3 -10
- package/src/utils/file-util.ts +4 -12
- package/src/utils/jump-page-utils.js +0 -1
- package/src/utils/permission.js +2 -2
- package/src/utils/permissionAuth.js +2 -4
- package/src/views/dsc-component/Sidebar/Item.vue +3 -3
- package/src/views/dsc-component/Sidebar/index.vue +2 -0
- package/src/views/layout/components/Menubar/Item.vue +0 -6
- package/src/views/layout/components/Menubar/SidebarItem.vue +17 -37
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
|
|
2
|
-
import { _ as s } from "./index-
|
|
2
|
+
import { _ as s } from "./index-5276895e.js";
|
|
3
3
|
const u = ["src"], f = s({ data: () => ({ src: null }), watch: { $route(n, c) {
|
|
4
4
|
this.src = this.$route.query.src;
|
|
5
5
|
} }, mounted() {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-
|
|
1
|
+
import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-5276895e.js";
|
|
2
2
|
import { resolveComponent as u, openBlock as l, createBlock as b, withCtx as g, createVNode as v, TransitionGroup as L, createElementBlock as p, Fragment as C, renderList as T, createElementVNode as m, toDisplayString as w, normalizeClass as S, createCommentVNode as y } from "vue";
|
|
3
3
|
const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ levelList: null }), computed: { levelListWithTitle() {
|
|
4
4
|
return this.levelList.filter((e) => e.meta.title !== void 0 && e.meta.title !== null);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { resolveComponent as t, openBlock as a, createElementBlock as s, createElementVNode as y, createVNode as l, withCtx as r, createTextVNode as n, toDisplayString as p, createCommentVNode as c, createBlock as h } from "vue";
|
|
2
|
-
import { _ as I } from "./index-
|
|
2
|
+
import { _ as I } from "./index-5276895e.js";
|
|
3
3
|
const g = { style: { "padding-bottom": "10px" } }, k = { key: 0, class: "graphDiv" }, N = I({ name: "TacheSubprocessHistory", data: () => ({ type: "graph", workflowId: null }), created() {
|
|
4
4
|
const o = this.$route.query.workflowId;
|
|
5
5
|
o && (this.workflowId = parseInt(o));
|
package/package.json
CHANGED
|
@@ -253,9 +253,7 @@ export default {
|
|
|
253
253
|
containBranch: this.containBranch,
|
|
254
254
|
zhName: department.name,
|
|
255
255
|
enName: department.enName,
|
|
256
|
-
department: department
|
|
257
|
-
leader: department.leader,
|
|
258
|
-
leaderName: department.leaderName
|
|
256
|
+
department: department
|
|
259
257
|
}
|
|
260
258
|
this.selectNodeInfo = selectNodeInfo
|
|
261
259
|
},
|
|
@@ -609,8 +609,7 @@ export default {
|
|
|
609
609
|
emails: [],
|
|
610
610
|
telephones: [],
|
|
611
611
|
users: [],
|
|
612
|
-
divisionManager: []
|
|
613
|
-
divisionManagerName: []
|
|
612
|
+
divisionManager: []
|
|
614
613
|
}
|
|
615
614
|
// 是否需要显示提示框,默认不显示
|
|
616
615
|
var showTip = false
|
|
@@ -626,9 +625,6 @@ export default {
|
|
|
626
625
|
if (userData.divisionManager && userData.divisionManager !== '') {
|
|
627
626
|
selectNodeInfo.divisionManager.push(userData.divisionManager)
|
|
628
627
|
}
|
|
629
|
-
if (userData.divisionManagerName && userData.divisionManagerName !== '') {
|
|
630
|
-
selectNodeInfo.divisionManagerName.push(userData.divisionManagerName)
|
|
631
|
-
}
|
|
632
628
|
if (userData.email && userData.email !== '') {
|
|
633
629
|
selectNodeInfo.emails.push(userData.email)
|
|
634
630
|
}
|
|
@@ -252,8 +252,7 @@ export default {
|
|
|
252
252
|
user: user,
|
|
253
253
|
enName: user.enName,
|
|
254
254
|
subCompanyName: user.subCompanyName,
|
|
255
|
-
divisionManager: user.divisionManager
|
|
256
|
-
divisionManagerName: user.divisionManagerName
|
|
255
|
+
divisionManager: user.divisionManager
|
|
257
256
|
}
|
|
258
257
|
// 表示是勾选单选按钮或 选中树节点
|
|
259
258
|
this.selectNodeInfo = selectNodeInfo
|
|
@@ -183,6 +183,7 @@ const departmentUserTreeMultiService = {
|
|
|
183
183
|
},
|
|
184
184
|
// 加载指定部门节点
|
|
185
185
|
loadPointDepartments() {
|
|
186
|
+
debugger
|
|
186
187
|
let url = window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/point-department-users'
|
|
187
188
|
if (this.limitFilterColumn) {
|
|
188
189
|
url += '/' + this.limitFilterColumn
|
|
@@ -1,20 +1,14 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div v-if="label">
|
|
3
|
-
<div
|
|
4
|
-
ref="filePreviewRef"
|
|
5
|
-
@dblclick="dblclickEvent"
|
|
6
|
-
style="display: flex; align-items: center; gap: 5px"
|
|
7
|
-
:style="{ cursor: disabled && fileSetObj.disabledNoPreview ? 'not-allowed' : 'pointer' }"
|
|
8
|
-
@click="previewMuti()"
|
|
9
|
-
>
|
|
3
|
+
<div ref="filePreviewRef" @dblclick="dblclickEvent" style="display: flex; align-items: center; gap: 5px">
|
|
10
4
|
<el-icon><el-icon-paperclip /></el-icon>
|
|
11
5
|
{{ label }}
|
|
12
|
-
<el-tooltip v-if="!disabled ||
|
|
6
|
+
<el-tooltip v-if="!disabled || fileSetObj.absolutePreview" :content="$t('imatrixUIPublicModel.preview')">
|
|
13
7
|
<el-icon style="cursor: pointer; color: #409eff; padding-right: 5px" @click="previewMuti()"
|
|
14
8
|
><el-icon-view
|
|
15
9
|
/></el-icon>
|
|
16
10
|
</el-tooltip>
|
|
17
|
-
<el-tooltip v-if="!disabled ||
|
|
11
|
+
<el-tooltip v-if="!disabled || fileSetObj.absoluteDownloadable" :content="$t('imatrixUIPublicModel.download')">
|
|
18
12
|
<el-icon style="cursor: pointer; color: #409eff" @click="donwloadViewFile()">
|
|
19
13
|
<el-icon-download />
|
|
20
14
|
</el-icon>
|
|
@@ -46,10 +40,8 @@
|
|
|
46
40
|
<el-table-column prop="showName" show-overflow-tooltip>
|
|
47
41
|
<template v-slot="scope">
|
|
48
42
|
<div style="display: flex; align-items: center">
|
|
49
|
-
<
|
|
50
|
-
|
|
51
|
-
</span>
|
|
52
|
-
<span class="amb-list-preivew-name" @click="previewSingle(scope.row)">
|
|
43
|
+
<super-icon :iconValue="getFileIconByName(scope.row.showName)" />
|
|
44
|
+
<span style="margin-left: 10px; cursor: pointer" @click="previewSingle(scope.row)">
|
|
53
45
|
{{ scope.row.showName }}
|
|
54
46
|
</span>
|
|
55
47
|
</div>
|
|
@@ -58,24 +50,12 @@
|
|
|
58
50
|
<el-table-column width="80" align="center">
|
|
59
51
|
<template v-slot="scope">
|
|
60
52
|
<div style="margin: -10px 0">
|
|
61
|
-
<el-tooltip
|
|
62
|
-
v-if="!fileSetObj.disabledNoPreview"
|
|
63
|
-
:content="$t('imatrixUIPublicModel.preview')"
|
|
64
|
-
class="item"
|
|
65
|
-
effect="dark"
|
|
66
|
-
placement="top"
|
|
67
|
-
>
|
|
53
|
+
<el-tooltip :content="$t('imatrixUIPublicModel.preview')" class="item" effect="dark" placement="top">
|
|
68
54
|
<el-button type="text" @click="previewSingle(scope.row)">
|
|
69
55
|
<el-icon style="cursor: pointer"><el-icon-view /></el-icon>
|
|
70
56
|
</el-button>
|
|
71
57
|
</el-tooltip>
|
|
72
|
-
<el-tooltip
|
|
73
|
-
v-if="!fileSetObj.disabledNoDownload"
|
|
74
|
-
:content="$t('imatrixUIPublicModel.download')"
|
|
75
|
-
class="item"
|
|
76
|
-
effect="dark"
|
|
77
|
-
placement="top"
|
|
78
|
-
>
|
|
58
|
+
<el-tooltip :content="$t('imatrixUIPublicModel.download')" class="item" effect="dark" placement="top">
|
|
79
59
|
<el-button type="text" @click="donwloadFile(scope.$index, fileList)">
|
|
80
60
|
<el-icon v-if="downloadable" style="cursor: pointer">
|
|
81
61
|
<el-icon-download />
|
|
@@ -188,19 +168,14 @@ export default {
|
|
|
188
168
|
serverPath = getEntityFieldValue(this.entity, this.keyValueParam.serverPath)
|
|
189
169
|
showName = getEntityFieldValue(this.entity, this.keyValueParam.showName)
|
|
190
170
|
}
|
|
191
|
-
if (!serverPath) {
|
|
192
|
-
ElMessage.error(this.$t('imatrixUIMessage.filePathNotFound'))
|
|
193
|
-
}
|
|
194
171
|
return {
|
|
195
172
|
showName: showName,
|
|
196
173
|
serverPath: serverPath
|
|
197
174
|
}
|
|
198
175
|
},
|
|
199
176
|
previewMuti() {
|
|
200
|
-
if (this.disabled && this.fileSetObj.disabledNoPreview) {
|
|
201
|
-
return
|
|
202
|
-
}
|
|
203
177
|
const { showName, serverPath } = this.getShowNameAndUuidKey()
|
|
178
|
+
debugger
|
|
204
179
|
if (serverPath) {
|
|
205
180
|
const uuids = serverPath.split(',')
|
|
206
181
|
if (uuids.length > 1) {
|
|
@@ -338,11 +313,4 @@ export default {
|
|
|
338
313
|
width: 30px;
|
|
339
314
|
height: 30px;
|
|
340
315
|
}
|
|
341
|
-
.amb-list-preivew-name {
|
|
342
|
-
margin-left: 10px;
|
|
343
|
-
cursor: pointer;
|
|
344
|
-
overflow: hidden;
|
|
345
|
-
text-overflow: ellipsis;
|
|
346
|
-
white-space: nowrap;
|
|
347
|
-
}
|
|
348
316
|
</style>
|
|
@@ -81,49 +81,37 @@
|
|
|
81
81
|
<!-- <i v-if="deleteable" class="el-icon-delete" style="padding-left:5px;cursor:pointer;color:#F56C6C" @click="deleteFile()" /> -->
|
|
82
82
|
</span>
|
|
83
83
|
</template>
|
|
84
|
-
<el-table :
|
|
85
|
-
<el-table-column prop="showName" show-overflow-tooltip>
|
|
84
|
+
<el-table :data="showFileList" :show-header="false">
|
|
85
|
+
<el-table-column prop="showName" width="300" show-overflow-tooltip>
|
|
86
86
|
<template v-slot="scope">
|
|
87
87
|
<div style="display: flex; align-items: center">
|
|
88
|
-
<
|
|
89
|
-
|
|
90
|
-
</span>
|
|
91
|
-
<span class="amb-list-preivew-name" @click="previewSingle(scope.row)">
|
|
88
|
+
<super-icon :iconValue="getFileIconByName(scope.row.showName)" />
|
|
89
|
+
<span style="margin-left: 10px; cursor: pointer" @click="previewSingle(scope.row)">
|
|
92
90
|
{{ scope.row.showName }}
|
|
93
91
|
</span>
|
|
94
92
|
</div>
|
|
95
93
|
</template>
|
|
96
94
|
</el-table-column>
|
|
97
|
-
<el-table-column
|
|
95
|
+
<el-table-column align="right">
|
|
98
96
|
<template v-slot="scope">
|
|
99
|
-
<
|
|
100
|
-
<el-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
effect="dark"
|
|
118
|
-
placement="top"
|
|
119
|
-
>
|
|
120
|
-
<el-button type="text" @click="deleteRow(scope.$index)">
|
|
121
|
-
<el-icon style="cursor: pointer">
|
|
122
|
-
<el-icon-delete />
|
|
123
|
-
</el-icon>
|
|
124
|
-
</el-button>
|
|
125
|
-
</el-tooltip>
|
|
126
|
-
</div>
|
|
97
|
+
<el-tooltip :content="$t('imatrixUIPublicModel.preview')" class="item" effect="dark" placement="top">
|
|
98
|
+
<el-button type="text" @click="previewSingle(scope.row)">
|
|
99
|
+
<el-icon style="cursor: pointer">
|
|
100
|
+
<el-icon-view />
|
|
101
|
+
</el-icon>
|
|
102
|
+
</el-button>
|
|
103
|
+
</el-tooltip>
|
|
104
|
+
</template>
|
|
105
|
+
</el-table-column>
|
|
106
|
+
<el-table-column v-if="!disabled">
|
|
107
|
+
<template v-slot="scope">
|
|
108
|
+
<el-tooltip :content="$t('imatrixUIPublicModel.delete')" class="item" effect="dark" placement="top">
|
|
109
|
+
<el-button type="text" @click="deleteRow(scope.$index)">
|
|
110
|
+
<el-icon style="cursor: pointer">
|
|
111
|
+
<el-icon-delete />
|
|
112
|
+
</el-icon>
|
|
113
|
+
</el-button>
|
|
114
|
+
</el-tooltip>
|
|
127
115
|
</template>
|
|
128
116
|
</el-table-column>
|
|
129
117
|
</el-table>
|
|
@@ -464,11 +452,4 @@ export default {
|
|
|
464
452
|
width: 30px;
|
|
465
453
|
height: 30px;
|
|
466
454
|
}
|
|
467
|
-
.amb-list-preivew-name {
|
|
468
|
-
margin-left: 10px;
|
|
469
|
-
cursor: pointer;
|
|
470
|
-
overflow: hidden;
|
|
471
|
-
text-overflow: ellipsis;
|
|
472
|
-
white-space: nowrap;
|
|
473
|
-
}
|
|
474
455
|
</style>
|
|
@@ -27,8 +27,8 @@
|
|
|
27
27
|
<template v-if="fileList && fileList.length > 0">
|
|
28
28
|
<fs-preview-new
|
|
29
29
|
:disabled="disabled"
|
|
30
|
-
:
|
|
31
|
-
:
|
|
30
|
+
:absolute-preview="absolutePreview"
|
|
31
|
+
:absolute-downloadable="absoluteDownloadable"
|
|
32
32
|
:file-list="fileList"
|
|
33
33
|
:system-code="systemCode"
|
|
34
34
|
:before-remove="beforeRemove"
|
|
@@ -121,12 +121,12 @@ const props = defineProps({
|
|
|
121
121
|
default: () => {}
|
|
122
122
|
},
|
|
123
123
|
// 是否禁用时也可预览
|
|
124
|
-
|
|
124
|
+
absolutePreview: {
|
|
125
125
|
type: Boolean,
|
|
126
126
|
default: false
|
|
127
127
|
},
|
|
128
128
|
// 是否禁用时也可下载
|
|
129
|
-
|
|
129
|
+
absoluteDownloadable: {
|
|
130
130
|
type: Boolean,
|
|
131
131
|
default: false
|
|
132
132
|
}
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
<template v-if="fileList && fileList.length > 0">
|
|
25
25
|
<fs-preview-new
|
|
26
26
|
:disabled="disabled"
|
|
27
|
-
:
|
|
28
|
-
:
|
|
27
|
+
:absolute-preview="absolutePreview"
|
|
28
|
+
:absolute-downloadable="absoluteDownloadable"
|
|
29
29
|
:file-list="fileList"
|
|
30
30
|
:system-code="systemCode"
|
|
31
31
|
:before-remove="beforeRemove"
|
|
@@ -118,12 +118,12 @@ const props = defineProps({
|
|
|
118
118
|
default: () => {}
|
|
119
119
|
},
|
|
120
120
|
// 是否禁用时也可预览
|
|
121
|
-
|
|
121
|
+
absolutePreview: {
|
|
122
122
|
type: Boolean,
|
|
123
123
|
default: false
|
|
124
124
|
},
|
|
125
125
|
// 是否禁用时也可下载
|
|
126
|
-
|
|
126
|
+
absoluteDownloadable: {
|
|
127
127
|
type: Boolean,
|
|
128
128
|
default: false
|
|
129
129
|
}
|
|
@@ -7,19 +7,19 @@
|
|
|
7
7
|
<div style="display: flex; align-items: center">
|
|
8
8
|
<!-- 'amb-color-icon-XLS' -->
|
|
9
9
|
<super-icon :iconValue="getFileIconByName(file.showName)" />
|
|
10
|
-
<template v-if="disabled &&
|
|
10
|
+
<template v-if="disabled && !absolutePreview">
|
|
11
11
|
<span style="cursor: no-drop">
|
|
12
12
|
<span style="margin-left: 6.5px">{{ file.showName }}</span>
|
|
13
13
|
</span>
|
|
14
14
|
</template>
|
|
15
|
-
<template v-if="!disabled ||
|
|
15
|
+
<template v-if="!disabled || absolutePreview">
|
|
16
16
|
<el-tooltip content="预览" placement="top">
|
|
17
17
|
<span style="cursor: pointer" @click="preview(file.showName, file.serverPath)">
|
|
18
18
|
<span style="margin-left: 6.5px">{{ file.showName }}</span>
|
|
19
19
|
</span>
|
|
20
20
|
</el-tooltip>
|
|
21
21
|
</template>
|
|
22
|
-
<el-tooltip v-if="!disabled ||
|
|
22
|
+
<el-tooltip v-if="!disabled || absoluteDownloadable" content="下载" placement="top">
|
|
23
23
|
<el-icon style="margin-left: 10px" @click="handleDownload(file)">
|
|
24
24
|
<Download />
|
|
25
25
|
</el-icon>
|
|
@@ -113,12 +113,12 @@ const props = defineProps({
|
|
|
113
113
|
default: null
|
|
114
114
|
},
|
|
115
115
|
// 是否禁用时也可预览
|
|
116
|
-
|
|
116
|
+
absolutePreview: {
|
|
117
117
|
type: Boolean,
|
|
118
118
|
default: false
|
|
119
119
|
},
|
|
120
120
|
// 是否禁用时也可下载
|
|
121
|
-
|
|
121
|
+
absoluteDownloadable: {
|
|
122
122
|
type: Boolean,
|
|
123
123
|
default: false
|
|
124
124
|
}
|
|
@@ -195,8 +195,9 @@ const isPromise = (p: any) => {
|
|
|
195
195
|
return p && Object.prototype.toString.call(p) === '[object Promise]'
|
|
196
196
|
}
|
|
197
197
|
const preview = (showName: string, serverPath: string) => {
|
|
198
|
+
debugger
|
|
198
199
|
console.log('preview----props.fileList=', props.fileList)
|
|
199
|
-
if (props.disabled && props.
|
|
200
|
+
if (props.disabled && !props.absolutePreview) {
|
|
200
201
|
return
|
|
201
202
|
}
|
|
202
203
|
let isImg = false
|
|
@@ -8,8 +8,8 @@
|
|
|
8
8
|
:openFsUpload="openFsUpload"
|
|
9
9
|
:fileSetObj="{
|
|
10
10
|
accept: accept,
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
absolutePreview: absolutePreview,
|
|
12
|
+
absoluteDownloadable: absoluteDownloadable,
|
|
13
13
|
multiple: multiple,
|
|
14
14
|
limitFileSize: limitFileSize,
|
|
15
15
|
limit: limitNum,
|
|
@@ -25,8 +25,8 @@
|
|
|
25
25
|
:systemCode="systemCode"
|
|
26
26
|
:accept="accept"
|
|
27
27
|
:multiple="multiple"
|
|
28
|
-
:
|
|
29
|
-
:
|
|
28
|
+
:absolute-preview="absolutePreview"
|
|
29
|
+
:absolute-downloadable="absoluteDownloadable"
|
|
30
30
|
:limit="limitNum"
|
|
31
31
|
:limitFileSize="limitFileSize"
|
|
32
32
|
:placeholder="placeholder"
|
|
@@ -51,8 +51,8 @@
|
|
|
51
51
|
:multiple="multiple"
|
|
52
52
|
:limit="limitNum"
|
|
53
53
|
:limitFileSize="limitFileSize"
|
|
54
|
-
:
|
|
55
|
-
:
|
|
54
|
+
:absolute-preview="absolutePreview"
|
|
55
|
+
:absolute-downloadable="absoluteDownloadable"
|
|
56
56
|
:placeholder="placeholder"
|
|
57
57
|
:action="action"
|
|
58
58
|
:headers="headers"
|
|
@@ -76,8 +76,8 @@
|
|
|
76
76
|
:multiple="multiple"
|
|
77
77
|
:limit="limitNum"
|
|
78
78
|
:limitFileSize="limitFileSize"
|
|
79
|
-
:
|
|
80
|
-
:
|
|
79
|
+
:absolute-preview="absolutePreview"
|
|
80
|
+
:absolute-downloadable="absoluteDownloadable"
|
|
81
81
|
:placeholder="placeholder"
|
|
82
82
|
:action="action"
|
|
83
83
|
:headers="headers"
|
|
@@ -105,8 +105,8 @@
|
|
|
105
105
|
:multiple="multiple"
|
|
106
106
|
:limit="limitNum"
|
|
107
107
|
:limitFileSize="limitFileSize"
|
|
108
|
-
:
|
|
109
|
-
:
|
|
108
|
+
:absolute-preview="absolutePreview"
|
|
109
|
+
:absolute-downloadable="absoluteDownloadable"
|
|
110
110
|
:placeholder="placeholder"
|
|
111
111
|
:action="action"
|
|
112
112
|
:headers="headers"
|
|
@@ -264,12 +264,12 @@ const props = defineProps({
|
|
|
264
264
|
default: 'openCameraAndChoosePhoto'
|
|
265
265
|
},
|
|
266
266
|
// 是否禁用时也可预览
|
|
267
|
-
|
|
267
|
+
absolutePreview: {
|
|
268
268
|
type: Boolean,
|
|
269
269
|
default: false
|
|
270
270
|
},
|
|
271
271
|
// 是否禁用时也可下载
|
|
272
|
-
|
|
272
|
+
absoluteDownloadable: {
|
|
273
273
|
type: Boolean,
|
|
274
274
|
default: false
|
|
275
275
|
}
|
|
@@ -428,11 +428,11 @@ export default {
|
|
|
428
428
|
}
|
|
429
429
|
}
|
|
430
430
|
return branchDeptIds.join(this.separator)
|
|
431
|
-
} else if (orgDataType === 'divisionManager'
|
|
431
|
+
} else if (orgDataType === 'divisionManager') {
|
|
432
432
|
let divisionManagerArr = []
|
|
433
433
|
if (isUserTree) {
|
|
434
|
-
if (selectNodeInfo
|
|
435
|
-
divisionManagerArr = selectNodeInfo
|
|
434
|
+
if (selectNodeInfo.divisionManager && selectNodeInfo.divisionManager.length > 0) {
|
|
435
|
+
divisionManagerArr = selectNodeInfo.divisionManager
|
|
436
436
|
}
|
|
437
437
|
}
|
|
438
438
|
if (divisionManagerArr && divisionManagerArr.length > 0) {
|
|
@@ -212,7 +212,7 @@ const customFormatter = {
|
|
|
212
212
|
// console.log('getHyperLinkSetting--resut=', result)
|
|
213
213
|
if (result && result.label && result.label !== '') {
|
|
214
214
|
console.log('label存在')
|
|
215
|
-
} else
|
|
215
|
+
} else {
|
|
216
216
|
result.label = this.objectPropValueTwo(row, column)
|
|
217
217
|
}
|
|
218
218
|
if (result && result.title && result.title !== '') {
|
|
@@ -107,7 +107,6 @@
|
|
|
107
107
|
:is-show="operation.isShow"
|
|
108
108
|
:label="operation.props.label ? operation.props.label : row[column.prop]"
|
|
109
109
|
:on-click="operation.onClick"
|
|
110
|
-
:operation="operation"
|
|
111
110
|
:operation-index="operationIndex"
|
|
112
111
|
:operation-setting="operation.props"
|
|
113
112
|
:event-name="operation.eventName"
|
|
@@ -239,17 +238,15 @@
|
|
|
239
238
|
:title="getMyHyperLinkSetting(row, rowIndex).title"
|
|
240
239
|
:class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
|
|
241
240
|
>{{ getMyHyperLinkSetting(row, rowIndex).label }}
|
|
242
|
-
<
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
></SuperIcon>
|
|
241
|
+
<el-icon v-if="getMyHyperLinkSetting(row, rowIndex).icon">
|
|
242
|
+
<component :is="(getMyHyperLinkSetting(row), rowIndex.icon)" />
|
|
243
|
+
</el-icon>
|
|
246
244
|
</span>
|
|
247
245
|
<span v-else :id="column.prop + 'DomData' + rowIndex" :class="isShowForm ? '' : 'cell--span'"
|
|
248
246
|
>{{ getMyHyperLinkSetting(row, rowIndex).label }}
|
|
249
|
-
<
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
></SuperIcon>
|
|
247
|
+
<el-icon v-if="getMyHyperLinkSetting(row, rowIndex).icon">
|
|
248
|
+
<component :is="getMyHyperLinkSetting(row, rowIndex).icon" />
|
|
249
|
+
</el-icon>
|
|
253
250
|
</span>
|
|
254
251
|
</el-link>
|
|
255
252
|
<span
|
|
@@ -322,17 +319,15 @@
|
|
|
322
319
|
:title="$escapeHtml(getMyHyperLinkSetting(row, rowIndex).title)"
|
|
323
320
|
:class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
|
|
324
321
|
>{{ $escapeHtml(getMyHyperLinkSetting(row, rowIndex).label) }}
|
|
325
|
-
<
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
></SuperIcon>
|
|
322
|
+
<el-icon v-if="getMyHyperLinkSetting(row, rowIndex).icon">
|
|
323
|
+
<component :is="getMyHyperLinkSetting(row, rowIndex).icon" />
|
|
324
|
+
</el-icon>
|
|
329
325
|
</span>
|
|
330
326
|
<span v-else :id="column.prop + 'DomData' + rowIndex" :class="isShowForm ? '' : 'cell--span'"
|
|
331
327
|
>{{ $escapeHtml(getMyHyperLinkSetting(row, rowIndex).label) }}
|
|
332
|
-
<
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
></SuperIcon>
|
|
328
|
+
<el-icon v-if="getMyHyperLinkSetting(row, rowIndex).icon">
|
|
329
|
+
<component :is="getMyHyperLinkSetting(row, rowIndex).icon" />
|
|
330
|
+
</el-icon>
|
|
336
331
|
</span>
|
|
337
332
|
</el-link>
|
|
338
333
|
<!-- 富文本 -->
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<!--将@click改为@mousedown.native是因为操作列保存按钮时事件和input等组件的@blur冲突,导致保存需要保存两次,因为
|
|
3
3
|
@blur先于@click执行的,所以只会执行@blur,@click就失效了,@mousedown是先于@blur执行的-->
|
|
4
|
-
<span
|
|
4
|
+
<span :style="myStyle">
|
|
5
5
|
<template v-if="isShowButton()">
|
|
6
6
|
<el-tooltip :disabled="tooltipDisabled" :content="label" placement="top">
|
|
7
|
-
<template v-if="operationSettingData
|
|
7
|
+
<template v-if="operationSettingData.permission">
|
|
8
8
|
<component
|
|
9
9
|
v-bind="operationSettingData"
|
|
10
10
|
:is="isElementType"
|
|
@@ -77,13 +77,9 @@ export default {
|
|
|
77
77
|
type: String,
|
|
78
78
|
default: null,
|
|
79
79
|
},
|
|
80
|
-
operation: {
|
|
81
|
-
type: Object,
|
|
82
|
-
default: () => ({}),
|
|
83
|
-
},
|
|
84
80
|
operationSetting: {
|
|
85
81
|
type: Object,
|
|
86
|
-
default:
|
|
82
|
+
default: null,
|
|
87
83
|
},
|
|
88
84
|
operationIndex: {
|
|
89
85
|
type: Number,
|
|
@@ -152,16 +148,16 @@ export default {
|
|
|
152
148
|
},
|
|
153
149
|
// 后置图标
|
|
154
150
|
suffixIcon() {
|
|
155
|
-
if(['right'].includes(this.
|
|
151
|
+
if(['right'].includes(this.operationSettingData.iconPosition)) return this.operationSetting.iconValue
|
|
156
152
|
return undefined
|
|
157
153
|
},
|
|
158
154
|
// 是否显示文字按钮 > 图标模式
|
|
159
155
|
isTextIcon() {
|
|
160
156
|
if (this.isTableBtnLinkShow) {
|
|
161
|
-
if (this.
|
|
157
|
+
if (this.operationSettingData.isTextIcon === undefined) {
|
|
162
158
|
return this.isSaveRow || this.isDeleteRow || this.isEditRow || this.isRestoreRow
|
|
163
159
|
}
|
|
164
|
-
return this.
|
|
160
|
+
return this.operationSettingData.isTextIcon
|
|
165
161
|
} else {
|
|
166
162
|
return false
|
|
167
163
|
}
|
|
@@ -176,14 +172,14 @@ export default {
|
|
|
176
172
|
},
|
|
177
173
|
// 是否自动开启表格 按钮 转 文字按钮
|
|
178
174
|
isTableBtnLinkShow() {
|
|
179
|
-
if (this.operationSetting
|
|
175
|
+
if (this.operationSetting.text) return true
|
|
180
176
|
if (this.isTableBtnLink && this.elementType === 'el-button') {
|
|
181
|
-
return [this.operationSetting
|
|
177
|
+
return [this.operationSetting.text, this.operationSetting.plain, this.operationSetting.round].every(v => v === undefined)
|
|
182
178
|
}
|
|
183
179
|
return false
|
|
184
180
|
},
|
|
185
181
|
operationSettingData() {
|
|
186
|
-
const dataList = { ...
|
|
182
|
+
const dataList = { ...this.operationSetting }
|
|
187
183
|
if (this.isTableBtnLinkShow) {
|
|
188
184
|
dataList.underline = false
|
|
189
185
|
delete dataList.text
|