agilebuilder-ui 1.1.39 → 1.1.40
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-10773a45.js → 401-7bd60242.js} +1 -1
- package/lib/{404-bc7b5bc4.js → 404-d2daf8d0.js} +1 -1
- package/lib/{iframe-page-593fe033.js → iframe-page-4c181c23.js} +1 -1
- package/lib/{index-5276895e.js → index-e9efe5c2.js} +9215 -9186
- 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-12a5a7c2.js → tab-content-iframe-index-77bf55ca.js} +1 -1
- package/lib/{tab-content-index-6901441f.js → tab-content-index-8157438c.js} +1 -1
- package/lib/{tache-subprocess-history-8fd8d5f7.js → tache-subprocess-history-bc9f1bea.js} +1 -1
- package/package.json +1 -1
- package/packages/department-tree-inline/src/department-single-tree-inline.vue +3 -1
- package/packages/department-user-tree-inline/src/department-user-multiple-tree-inline.vue +5 -1
- package/packages/department-user-tree-inline/src/department-user-single-tree-inline.vue +2 -1
- package/packages/department-user-tree-inline/src/department-user-tree-multi-service.js +0 -1
- package/packages/department-user-tree-mobile/src/department-user-tree-inline-app.vue +3 -1
- package/packages/fs-preview/src/fs-preview.vue +40 -8
- package/packages/fs-upload-list/src/fs-upload-list.vue +42 -23
- 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 +6 -7
- 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 +0 -1
- package/packages/super-grid/src/custom-formatter.js +1 -1
- package/packages/super-grid/src/normal-column-content.vue +16 -12
- package/packages/super-grid/src/search-form-item.vue +47 -4
- package/packages/super-grid/src/search-form-mobile.vue +5 -0
- package/packages/super-grid/src/search-form-ordinarySearch.vue +5 -0
- package/packages/super-grid/src/search-methods.js +3 -1
- package/packages/super-grid/src/super-grid.vue +13 -0
- package/packages/utils/organization.ts +56 -40
- package/packages/workflow-history-list/src/workflow-history-list.vue +41 -3
- package/src/directives/permission/permission.js +7 -1
- package/src/i18n/langs/cn.js +10 -3
- package/src/i18n/langs/en.js +10 -3
- package/src/styles/mixin.scss +2 -2
- package/src/styles/table.scss +8 -7
- package/src/styles/theme/dark-blue/scrollbar-style.scss +2 -2
- package/src/styles/theme/gray/scrollbar-style.scss +2 -2
- package/src/styles/theme/green/scrollbar-style.scss +2 -2
- package/src/styles/theme/ocean-blue/scrollbar-style.scss +2 -2
- package/src/styles/theme/tiffany-blue-mobile/scrollbar-style.scss +2 -2
- package/src/utils/file-util.ts +12 -4
- package/src/utils/jump-page-utils.js +1 -0
- package/src/utils/permission.js +2 -2
- package/src/utils/permissionAuth.js +4 -2
- package/src/views/dsc-component/Sidebar/Item.vue +3 -3
- package/src/views/dsc-component/Sidebar/index.vue +0 -2
- package/src/views/layout/components/Menubar/Item.vue +6 -0
- package/src/views/layout/components/Menubar/SidebarItem.vue +37 -17
|
@@ -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-e9efe5c2.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-e9efe5c2.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-e9efe5c2.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,7 +253,9 @@ export default {
|
|
|
253
253
|
containBranch: this.containBranch,
|
|
254
254
|
zhName: department.name,
|
|
255
255
|
enName: department.enName,
|
|
256
|
-
department: department
|
|
256
|
+
department: department,
|
|
257
|
+
leader: department.leader,
|
|
258
|
+
leaderName: department.leaderName
|
|
257
259
|
}
|
|
258
260
|
this.selectNodeInfo = selectNodeInfo
|
|
259
261
|
},
|
|
@@ -609,7 +609,8 @@ export default {
|
|
|
609
609
|
emails: [],
|
|
610
610
|
telephones: [],
|
|
611
611
|
users: [],
|
|
612
|
-
divisionManager: []
|
|
612
|
+
divisionManager: [],
|
|
613
|
+
divisionManagerName: []
|
|
613
614
|
}
|
|
614
615
|
// 是否需要显示提示框,默认不显示
|
|
615
616
|
var showTip = false
|
|
@@ -625,6 +626,9 @@ export default {
|
|
|
625
626
|
if (userData.divisionManager && userData.divisionManager !== '') {
|
|
626
627
|
selectNodeInfo.divisionManager.push(userData.divisionManager)
|
|
627
628
|
}
|
|
629
|
+
if (userData.divisionManagerName && userData.divisionManagerName !== '') {
|
|
630
|
+
selectNodeInfo.divisionManagerName.push(userData.divisionManagerName)
|
|
631
|
+
}
|
|
628
632
|
if (userData.email && userData.email !== '') {
|
|
629
633
|
selectNodeInfo.emails.push(userData.email)
|
|
630
634
|
}
|
|
@@ -252,7 +252,8 @@ export default {
|
|
|
252
252
|
user: user,
|
|
253
253
|
enName: user.enName,
|
|
254
254
|
subCompanyName: user.subCompanyName,
|
|
255
|
-
divisionManager: user.divisionManager
|
|
255
|
+
divisionManager: user.divisionManager,
|
|
256
|
+
divisionManagerName: user.divisionManagerName
|
|
256
257
|
}
|
|
257
258
|
// 表示是勾选单选按钮或 选中树节点
|
|
258
259
|
this.selectNodeInfo = selectNodeInfo
|
|
@@ -183,7 +183,6 @@ const departmentUserTreeMultiService = {
|
|
|
183
183
|
},
|
|
184
184
|
// 加载指定部门节点
|
|
185
185
|
loadPointDepartments() {
|
|
186
|
-
debugger
|
|
187
186
|
let url = window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/point-department-users'
|
|
188
187
|
if (this.limitFilterColumn) {
|
|
189
188
|
url += '/' + this.limitFilterColumn
|
|
@@ -1,14 +1,20 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div v-if="label">
|
|
3
|
-
<div
|
|
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
|
+
>
|
|
4
10
|
<el-icon><el-icon-paperclip /></el-icon>
|
|
5
11
|
{{ label }}
|
|
6
|
-
<el-tooltip v-if="!disabled || fileSetObj.
|
|
12
|
+
<el-tooltip v-if="!disabled || !fileSetObj.disabledNoPreview" :content="$t('imatrixUIPublicModel.preview')">
|
|
7
13
|
<el-icon style="cursor: pointer; color: #409eff; padding-right: 5px" @click="previewMuti()"
|
|
8
14
|
><el-icon-view
|
|
9
15
|
/></el-icon>
|
|
10
16
|
</el-tooltip>
|
|
11
|
-
<el-tooltip v-if="!disabled || fileSetObj.
|
|
17
|
+
<el-tooltip v-if="!disabled || !fileSetObj.disabledNoDownload" :content="$t('imatrixUIPublicModel.download')">
|
|
12
18
|
<el-icon style="cursor: pointer; color: #409eff" @click="donwloadViewFile()">
|
|
13
19
|
<el-icon-download />
|
|
14
20
|
</el-icon>
|
|
@@ -40,8 +46,10 @@
|
|
|
40
46
|
<el-table-column prop="showName" show-overflow-tooltip>
|
|
41
47
|
<template v-slot="scope">
|
|
42
48
|
<div style="display: flex; align-items: center">
|
|
43
|
-
<
|
|
44
|
-
|
|
49
|
+
<span>
|
|
50
|
+
<super-icon :iconValue="getFileIconByName(scope.row.showName)" />
|
|
51
|
+
</span>
|
|
52
|
+
<span class="amb-list-preivew-name" @click="previewSingle(scope.row)">
|
|
45
53
|
{{ scope.row.showName }}
|
|
46
54
|
</span>
|
|
47
55
|
</div>
|
|
@@ -50,12 +58,24 @@
|
|
|
50
58
|
<el-table-column width="80" align="center">
|
|
51
59
|
<template v-slot="scope">
|
|
52
60
|
<div style="margin: -10px 0">
|
|
53
|
-
<el-tooltip
|
|
61
|
+
<el-tooltip
|
|
62
|
+
v-if="!fileSetObj.disabledNoPreview"
|
|
63
|
+
:content="$t('imatrixUIPublicModel.preview')"
|
|
64
|
+
class="item"
|
|
65
|
+
effect="dark"
|
|
66
|
+
placement="top"
|
|
67
|
+
>
|
|
54
68
|
<el-button type="text" @click="previewSingle(scope.row)">
|
|
55
69
|
<el-icon style="cursor: pointer"><el-icon-view /></el-icon>
|
|
56
70
|
</el-button>
|
|
57
71
|
</el-tooltip>
|
|
58
|
-
<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
|
+
>
|
|
59
79
|
<el-button type="text" @click="donwloadFile(scope.$index, fileList)">
|
|
60
80
|
<el-icon v-if="downloadable" style="cursor: pointer">
|
|
61
81
|
<el-icon-download />
|
|
@@ -168,14 +188,19 @@ export default {
|
|
|
168
188
|
serverPath = getEntityFieldValue(this.entity, this.keyValueParam.serverPath)
|
|
169
189
|
showName = getEntityFieldValue(this.entity, this.keyValueParam.showName)
|
|
170
190
|
}
|
|
191
|
+
if (!serverPath) {
|
|
192
|
+
ElMessage.error(this.$t('imatrixUIMessage.filePathNotFound'))
|
|
193
|
+
}
|
|
171
194
|
return {
|
|
172
195
|
showName: showName,
|
|
173
196
|
serverPath: serverPath
|
|
174
197
|
}
|
|
175
198
|
},
|
|
176
199
|
previewMuti() {
|
|
200
|
+
if (this.disabled && this.fileSetObj.disabledNoPreview) {
|
|
201
|
+
return
|
|
202
|
+
}
|
|
177
203
|
const { showName, serverPath } = this.getShowNameAndUuidKey()
|
|
178
|
-
debugger
|
|
179
204
|
if (serverPath) {
|
|
180
205
|
const uuids = serverPath.split(',')
|
|
181
206
|
if (uuids.length > 1) {
|
|
@@ -313,4 +338,11 @@ export default {
|
|
|
313
338
|
width: 30px;
|
|
314
339
|
height: 30px;
|
|
315
340
|
}
|
|
341
|
+
.amb-list-preivew-name {
|
|
342
|
+
margin-left: 10px;
|
|
343
|
+
cursor: pointer;
|
|
344
|
+
overflow: hidden;
|
|
345
|
+
text-overflow: ellipsis;
|
|
346
|
+
white-space: nowrap;
|
|
347
|
+
}
|
|
316
348
|
</style>
|
|
@@ -81,37 +81,49 @@
|
|
|
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 :data="showFileList"
|
|
85
|
-
<el-table-column prop="showName"
|
|
84
|
+
<el-table :show-header="false" :data="showFileList" max-height="60vh">
|
|
85
|
+
<el-table-column prop="showName" show-overflow-tooltip>
|
|
86
86
|
<template v-slot="scope">
|
|
87
87
|
<div style="display: flex; align-items: center">
|
|
88
|
-
<
|
|
89
|
-
|
|
88
|
+
<span>
|
|
89
|
+
<super-icon :iconValue="getFileIconByName(scope.row.showName)" />
|
|
90
|
+
</span>
|
|
91
|
+
<span class="amb-list-preivew-name" @click="previewSingle(scope.row)">
|
|
90
92
|
{{ scope.row.showName }}
|
|
91
93
|
</span>
|
|
92
94
|
</div>
|
|
93
95
|
</template>
|
|
94
96
|
</el-table-column>
|
|
95
|
-
<el-table-column align="
|
|
96
|
-
<template v-slot="scope">
|
|
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">
|
|
97
|
+
<el-table-column width="80" align="center">
|
|
107
98
|
<template v-slot="scope">
|
|
108
|
-
<
|
|
109
|
-
<el-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
99
|
+
<div style="margin: -10px 0">
|
|
100
|
+
<el-tooltip
|
|
101
|
+
v-if="!fileSetObj.disabledNoPreview"
|
|
102
|
+
:content="$t('imatrixUIPublicModel.preview')"
|
|
103
|
+
class="item"
|
|
104
|
+
effect="dark"
|
|
105
|
+
placement="top"
|
|
106
|
+
>
|
|
107
|
+
<el-button type="text" @click="previewSingle(scope.row)">
|
|
108
|
+
<el-icon style="cursor: pointer">
|
|
109
|
+
<el-icon-view />
|
|
110
|
+
</el-icon>
|
|
111
|
+
</el-button>
|
|
112
|
+
</el-tooltip>
|
|
113
|
+
<el-tooltip
|
|
114
|
+
v-if="!disabled"
|
|
115
|
+
:content="$t('imatrixUIPublicModel.delete')"
|
|
116
|
+
class="item"
|
|
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>
|
|
115
127
|
</template>
|
|
116
128
|
</el-table-column>
|
|
117
129
|
</el-table>
|
|
@@ -452,4 +464,11 @@ export default {
|
|
|
452
464
|
width: 30px;
|
|
453
465
|
height: 30px;
|
|
454
466
|
}
|
|
467
|
+
.amb-list-preivew-name {
|
|
468
|
+
margin-left: 10px;
|
|
469
|
+
cursor: pointer;
|
|
470
|
+
overflow: hidden;
|
|
471
|
+
text-overflow: ellipsis;
|
|
472
|
+
white-space: nowrap;
|
|
473
|
+
}
|
|
455
474
|
</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
|
+
:disabled-no-preview="disabledNoPreview"
|
|
31
|
+
:disabled-no-download="disabledNoDownload"
|
|
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
|
+
disabledNoPreview: {
|
|
125
125
|
type: Boolean,
|
|
126
126
|
default: false
|
|
127
127
|
},
|
|
128
128
|
// 是否禁用时也可下载
|
|
129
|
-
|
|
129
|
+
disabledNoDownload: {
|
|
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
|
+
:disabled-no-preview="disabledNoPreview"
|
|
28
|
+
:disabled-no-download="disabledNoDownload"
|
|
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
|
+
disabledNoPreview: {
|
|
122
122
|
type: Boolean,
|
|
123
123
|
default: false
|
|
124
124
|
},
|
|
125
125
|
// 是否禁用时也可下载
|
|
126
|
-
|
|
126
|
+
disabledNoDownload: {
|
|
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 && disabledNoPreview">
|
|
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 || !disabledNoPreview">
|
|
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 || !disabledNoDownload" 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
|
+
disabledNoPreview: {
|
|
117
117
|
type: Boolean,
|
|
118
118
|
default: false
|
|
119
119
|
},
|
|
120
120
|
// 是否禁用时也可下载
|
|
121
|
-
|
|
121
|
+
disabledNoDownload: {
|
|
122
122
|
type: Boolean,
|
|
123
123
|
default: false
|
|
124
124
|
}
|
|
@@ -195,9 +195,8 @@ 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
|
|
199
198
|
console.log('preview----props.fileList=', props.fileList)
|
|
200
|
-
if (props.disabled &&
|
|
199
|
+
if (props.disabled && props.disabledNoPreview) {
|
|
201
200
|
return
|
|
202
201
|
}
|
|
203
202
|
let isImg = false
|
|
@@ -8,8 +8,8 @@
|
|
|
8
8
|
:openFsUpload="openFsUpload"
|
|
9
9
|
:fileSetObj="{
|
|
10
10
|
accept: accept,
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
disabledNoPreview: disabledNoPreview,
|
|
12
|
+
disabledNoDownload: disabledNoDownload,
|
|
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
|
+
:disabled-no-preview="disabledNoPreview"
|
|
29
|
+
:disabled-no-download="disabledNoDownload"
|
|
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
|
+
:disabled-no-preview="disabledNoPreview"
|
|
55
|
+
:disabled-no-download="disabledNoDownload"
|
|
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
|
+
:disabled-no-preview="disabledNoPreview"
|
|
80
|
+
:disabled-no-download="disabledNoDownload"
|
|
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
|
+
:disabled-no-preview="disabledNoPreview"
|
|
109
|
+
:disabled-no-download="disabledNoDownload"
|
|
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
|
+
disabledNoPreview: {
|
|
268
268
|
type: Boolean,
|
|
269
269
|
default: false
|
|
270
270
|
},
|
|
271
271
|
// 是否禁用时也可下载
|
|
272
|
-
|
|
272
|
+
disabledNoDownload: {
|
|
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' || orgDataType === 'divisionManagerName') {
|
|
432
432
|
let divisionManagerArr = []
|
|
433
433
|
if (isUserTree) {
|
|
434
|
-
if (selectNodeInfo
|
|
435
|
-
divisionManagerArr = selectNodeInfo
|
|
434
|
+
if (selectNodeInfo[orgDataType] && selectNodeInfo[orgDataType].length > 0) {
|
|
435
|
+
divisionManagerArr = selectNodeInfo[orgDataType]
|
|
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 if(result && (result.displayTextJudge === undefined || result.displayTextJudge)){
|
|
216
216
|
result.label = this.objectPropValueTwo(row, column)
|
|
217
217
|
}
|
|
218
218
|
if (result && result.title && result.title !== '') {
|
|
@@ -238,15 +238,17 @@
|
|
|
238
238
|
:title="getMyHyperLinkSetting(row, rowIndex).title"
|
|
239
239
|
:class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
|
|
240
240
|
>{{ getMyHyperLinkSetting(row, rowIndex).label }}
|
|
241
|
-
<
|
|
242
|
-
|
|
243
|
-
|
|
241
|
+
<SuperIcon
|
|
242
|
+
v-if="getMyHyperLinkSetting(row, rowIndex).icon"
|
|
243
|
+
:iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
|
|
244
|
+
></SuperIcon>
|
|
244
245
|
</span>
|
|
245
246
|
<span v-else :id="column.prop + 'DomData' + rowIndex" :class="isShowForm ? '' : 'cell--span'"
|
|
246
247
|
>{{ getMyHyperLinkSetting(row, rowIndex).label }}
|
|
247
|
-
<
|
|
248
|
-
|
|
249
|
-
|
|
248
|
+
<SuperIcon
|
|
249
|
+
v-if="getMyHyperLinkSetting(row, rowIndex).icon"
|
|
250
|
+
:iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
|
|
251
|
+
></SuperIcon>
|
|
250
252
|
</span>
|
|
251
253
|
</el-link>
|
|
252
254
|
<span
|
|
@@ -319,15 +321,17 @@
|
|
|
319
321
|
:title="$escapeHtml(getMyHyperLinkSetting(row, rowIndex).title)"
|
|
320
322
|
:class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
|
|
321
323
|
>{{ $escapeHtml(getMyHyperLinkSetting(row, rowIndex).label) }}
|
|
322
|
-
<
|
|
323
|
-
|
|
324
|
-
|
|
324
|
+
<SuperIcon
|
|
325
|
+
v-if="getMyHyperLinkSetting(row, rowIndex).icon"
|
|
326
|
+
:iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
|
|
327
|
+
></SuperIcon>
|
|
325
328
|
</span>
|
|
326
329
|
<span v-else :id="column.prop + 'DomData' + rowIndex" :class="isShowForm ? '' : 'cell--span'"
|
|
327
330
|
>{{ $escapeHtml(getMyHyperLinkSetting(row, rowIndex).label) }}
|
|
328
|
-
<
|
|
329
|
-
|
|
330
|
-
|
|
331
|
+
<SuperIcon
|
|
332
|
+
v-if="getMyHyperLinkSetting(row, rowIndex).icon"
|
|
333
|
+
:iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
|
|
334
|
+
></SuperIcon>
|
|
331
335
|
</span>
|
|
332
336
|
</el-link>
|
|
333
337
|
<!-- 富文本 -->
|
|
@@ -213,7 +213,18 @@
|
|
|
213
213
|
:style="column.searchControlWidth"
|
|
214
214
|
@keyup.enter="submitForm('searchForm')"
|
|
215
215
|
@input="setValueToModelProp(column.prop, $event)"
|
|
216
|
-
|
|
216
|
+
@focus="showEmpty()"
|
|
217
|
+
@blur="hiddenEmpty()"
|
|
218
|
+
>
|
|
219
|
+
<template #suffix>
|
|
220
|
+
<el-tooltip
|
|
221
|
+
:content="$t('superGrid.searchEmpty')"
|
|
222
|
+
placement="bottom"
|
|
223
|
+
>
|
|
224
|
+
<el-checkbox v-if="isShowEmtpty" v-model="checkedEmpty" @change="checkEmptyChange"/>
|
|
225
|
+
</el-tooltip>
|
|
226
|
+
</template>
|
|
227
|
+
</el-input>
|
|
217
228
|
</el-form-item>
|
|
218
229
|
</template>
|
|
219
230
|
|
|
@@ -281,7 +292,9 @@ export default {
|
|
|
281
292
|
dataTwo: null,
|
|
282
293
|
moduleConfig: {},
|
|
283
294
|
dateVal: this.getFormItemValue(this.column.prop),
|
|
284
|
-
controlConfig: getControlConfig(this.column)
|
|
295
|
+
controlConfig: getControlConfig(this.column),
|
|
296
|
+
isShowEmtptyFlag: false,
|
|
297
|
+
// checkedEmpty: false,
|
|
285
298
|
}
|
|
286
299
|
},
|
|
287
300
|
computed: {
|
|
@@ -291,6 +304,23 @@ export default {
|
|
|
291
304
|
return data.listToolbarFormData
|
|
292
305
|
}
|
|
293
306
|
return null
|
|
307
|
+
},
|
|
308
|
+
isShowEmtpty() {
|
|
309
|
+
return this.isShowEmtptyFlag
|
|
310
|
+
},
|
|
311
|
+
checkedEmpty(){
|
|
312
|
+
if(this.column._emptyValue && this.column._emptyValue === '#blank#'){
|
|
313
|
+
return true
|
|
314
|
+
}
|
|
315
|
+
if(this.column._resetValue || this.column._resetValue === undefined){
|
|
316
|
+
if(this.column._resetValue){
|
|
317
|
+
this.column._resetValue = undefined
|
|
318
|
+
this.isShowEmtptyFlag = false
|
|
319
|
+
}
|
|
320
|
+
return false
|
|
321
|
+
} else {
|
|
322
|
+
return true
|
|
323
|
+
}
|
|
294
324
|
}
|
|
295
325
|
},
|
|
296
326
|
created() {
|
|
@@ -480,12 +510,25 @@ export default {
|
|
|
480
510
|
if (arr.indexOf('saveAll') !== -1) {
|
|
481
511
|
if (this.searchForm[this.column.prop] && typeof this.searchForm[this.column.prop] === 'string') {
|
|
482
512
|
this.searchForm[this.column.prop] = this.searchForm[this.column.prop].split(',')
|
|
483
|
-
} else {
|
|
484
|
-
this.searchForm[this.column.prop] = []
|
|
485
513
|
}
|
|
486
514
|
} else {
|
|
487
515
|
this.searchForm[this.column.prop] = arr
|
|
488
516
|
}
|
|
517
|
+
},
|
|
518
|
+
showEmpty(){
|
|
519
|
+
this.isShowEmtptyFlag = true
|
|
520
|
+
},
|
|
521
|
+
hiddenEmpty(){
|
|
522
|
+
if(!this.checkedEmpty){
|
|
523
|
+
this.isShowEmtptyFlag = false
|
|
524
|
+
}
|
|
525
|
+
},
|
|
526
|
+
checkEmptyChange(newValue) {
|
|
527
|
+
if(newValue){
|
|
528
|
+
this.column._emptyValue='#blank#'
|
|
529
|
+
} else {
|
|
530
|
+
this.column._emptyValue=undefined
|
|
531
|
+
}
|
|
489
532
|
}
|
|
490
533
|
},
|
|
491
534
|
emits: ['submit-form']
|
|
@@ -157,6 +157,11 @@ export default {
|
|
|
157
157
|
}
|
|
158
158
|
this.setDefaultQueryValue(column, this.searchForm)
|
|
159
159
|
}
|
|
160
|
+
// 清空空值状态
|
|
161
|
+
if(column._emptyValue){
|
|
162
|
+
column._emptyValue=undefined
|
|
163
|
+
column._resetValue=true
|
|
164
|
+
}
|
|
160
165
|
})
|
|
161
166
|
// 取消当前选中的条件列表的信息
|
|
162
167
|
// this.$refs.searchConditionList.editConditionId = null
|
|
@@ -162,6 +162,11 @@ export default {
|
|
|
162
162
|
}
|
|
163
163
|
this.setDefaultQueryValue(column, this.searchForm)
|
|
164
164
|
}
|
|
165
|
+
// 清空空值状态
|
|
166
|
+
if(column._emptyValue){
|
|
167
|
+
column._emptyValue=undefined
|
|
168
|
+
column._resetValue=true
|
|
169
|
+
}
|
|
165
170
|
})
|
|
166
171
|
// 取消当前选中的条件列表的信息
|
|
167
172
|
// this.$refs.searchConditionList.editConditionId = null
|