agilebuilder-ui 1.1.36-sit1 → 1.1.36-sit3

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.
@@ -1,5 +1,5 @@
1
1
  import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
2
- import { _ as s } from "./index-8c6ab0ba.js";
2
+ import { _ as s } from "./index-e982c337.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-8c6ab0ba.js";
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-e982c337.js";
2
2
  import { resolveComponent as u, openBlock as d, createBlock as b, withCtx as g, createVNode as v, TransitionGroup as L, createElementBlock as p, Fragment as T, renderList as C, 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-8c6ab0ba.js";
2
+ import { _ as I } from "./index-e982c337.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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "agilebuilder-ui",
3
- "version": "1.1.36-sit1",
3
+ "version": "1.1.36-sit3",
4
4
  "type": "module",
5
5
  "private": false,
6
6
  "main": "./lib/super-ui.js",
@@ -19,6 +19,7 @@
19
19
  :department-info="departmentInfo"
20
20
  :height="height"
21
21
  :is-need-virtual-user="isNeedVirtualUser"
22
+ :limit-filter-column="limitFilterColumn"
22
23
  :search-field="searchField"
23
24
  :select-user-info="selectUserInfo"
24
25
  :separator="separator"
@@ -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
@@ -7,8 +7,7 @@ const departmentUserTreeSingleService = {
7
7
  filterAppendNodes(value) {
8
8
  this.$http
9
9
  .post(
10
- window.$vueApp.config.globalProperties.baseAPI +
11
- '/component/organization-trees/search-users',
10
+ window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/search-users',
12
11
  this.searchParam
13
12
  )
14
13
  .then((result) => {
@@ -19,7 +18,7 @@ const departmentUserTreeSingleService = {
19
18
  this.$message({
20
19
  showClose: true,
21
20
  type: 'error',
22
- message: getI18n().t('imatrixUIMessage.queryResultIsEmpty'),
21
+ message: getI18n().t('imatrixUIMessage.queryResultIsEmpty')
23
22
  })
24
23
  return
25
24
  }
@@ -29,7 +28,7 @@ const departmentUserTreeSingleService = {
29
28
  this.$message({
30
29
  showClose: true,
31
30
  type: 'error',
32
- message: getI18n().t('imatrixUIMessage.queryResultIsEmpty'),
31
+ message: getI18n().t('imatrixUIMessage.queryResultIsEmpty')
33
32
  })
34
33
  return
35
34
  }
@@ -48,11 +47,7 @@ const departmentUserTreeSingleService = {
48
47
  // this.handleSelectUtil(item, localStorage)
49
48
  // 查询最新用户信息替换,缓存为历史数据 数据库可能发生变化
50
49
  this.$http
51
- .get(
52
- window.$vueApp.config.globalProperties.baseAPI +
53
- '/api/users?loginName=' +
54
- item.loginName
55
- )
50
+ .get(window.$vueApp.config.globalProperties.baseAPI + '/api/users?loginName=' + item.loginName)
56
51
  .then((userDTO) => {
57
52
  if (userDTO !== null) {
58
53
  for (const dtoKey in userDTO) {
@@ -100,17 +95,13 @@ const departmentUserTreeSingleService = {
100
95
  // 表示没有加载过该父节点的子节点集合时
101
96
  const param = {
102
97
  parentId: parentId,
103
- needVirtualUser: this.isNeedVirtualUser,
98
+ needVirtualUser: this.isNeedVirtualUser
104
99
  }
105
100
  if (node.data) {
106
101
  param.branchId = node.data.branchId
107
102
  }
108
103
  this.$http
109
- .post(
110
- window.$vueApp.config.globalProperties.baseAPI +
111
- '/component/organization-trees/department-users',
112
- param
113
- )
104
+ .post(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/department-users', param)
114
105
  .then((data) => {
115
106
  resolve(data)
116
107
  // 更新当前点击的节点的子节点,必须加该方法,否则会导致子节点无法选中
@@ -134,41 +125,30 @@ const departmentUserTreeSingleService = {
134
125
  loadDepartment(parentId, parentNodeId, isSearch, searchValue) {
135
126
  const param = {
136
127
  parentId: parentId,
137
- needVirtualUser: this.isNeedVirtualUser,
128
+ needVirtualUser: this.isNeedVirtualUser
138
129
  }
139
130
  this.$http
140
- .post(
141
- window.$vueApp.config.globalProperties.baseAPI +
142
- '/component/organization-trees/department-users',
143
- param
144
- )
145
- .then((children) => {
146
- if (this.$refs.deparmentUserTree) {
147
- this.$refs.deparmentUserTree.updateKeyChildren(parentNodeId, children)
148
- if (this.$refs.deparmentUserTree.store.nodesMap[parentNodeId]) {
149
- this.$refs.deparmentUserTree.store.nodesMap[parentNodeId].expanded = true
150
- }
151
- }
152
- })
153
- },
154
- loadPointDepartments() {
155
- this.$http
156
- .post(
157
- window.$vueApp.config.globalProperties.baseAPI +
158
- '/component/organization-trees/point-department-users',
159
- this.departmentInfo
160
- )
131
+ .post(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/department-users', param)
161
132
  .then((children) => {
162
- this.$refs.deparmentUserTree.updateKeyChildren(
163
- this.tenantNodeId,
164
- children
165
- )
166
- if (this.$refs.deparmentUserTree.store.nodesMap[this.tenantNodeId]) {
167
- this.$refs.deparmentUserTree.store.nodesMap[
168
- this.tenantNodeId
169
- ].expanded = true
133
+ if (this.$refs.deparmentUserTree) {
134
+ this.$refs.deparmentUserTree.updateKeyChildren(parentNodeId, children)
135
+ if (this.$refs.deparmentUserTree.store.nodesMap[parentNodeId]) {
136
+ this.$refs.deparmentUserTree.store.nodesMap[parentNodeId].expanded = true
137
+ }
170
138
  }
171
139
  })
172
140
  },
141
+ loadPointDepartments() {
142
+ let url = window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/point-department-users'
143
+ if (this.limitFilterColumn) {
144
+ url += '/' + this.limitFilterColumn
145
+ }
146
+ this.$http.post(url, this.departmentInfo).then((children) => {
147
+ this.$refs.deparmentUserTree.updateKeyChildren(this.tenantNodeId, children)
148
+ if (this.$refs.deparmentUserTree.store.nodesMap[this.tenantNodeId]) {
149
+ this.$refs.deparmentUserTree.store.nodesMap[this.tenantNodeId].expanded = true
150
+ }
151
+ })
152
+ }
173
153
  }
174
154
  export default departmentUserTreeSingleService
@@ -220,14 +220,15 @@
220
220
  }
221
221
  }
222
222
 
223
- .sidebar-container-popper .el-menu{
224
- // height: 100vh;
225
- height: auto;
226
- max-height: 100vh;
227
- overflow-y: auto;
228
- overflow-x: hidden;
229
- scroll-behavior: smooth;
230
- }
223
+ // 注释的原因:会导致孙子菜单显示的位置不正确
224
+ // .sidebar-container-popper .el-menu{
225
+ // // height: 100vh;
226
+ // height: auto;
227
+ // max-height: 100vh;
228
+ // overflow-y: auto;
229
+ // overflow-x: hidden;
230
+ // scroll-behavior: smooth;
231
+ // }
231
232
  .sidebar-container-popper .el-submenu__title:not(.is-disabled):hover {
232
233
  background: #F7F7F8;
233
234
  color: rgba(0, 13, 31, 0.85);
@@ -189,14 +189,15 @@
189
189
  }
190
190
  }
191
191
 
192
- .sidebar-container-popper .el-menu{
193
- // height: 100vh;
194
- height: auto;
195
- max-height: 100vh;
196
- overflow-y: auto;
197
- overflow-x: hidden;
198
- scroll-behavior: smooth;
199
- }
192
+ // 注释的原因:会导致孙子菜单显示的位置不正确
193
+ // .sidebar-container-popper .el-menu{
194
+ // // height: 100vh;
195
+ // height: auto;
196
+ // max-height: 100vh;
197
+ // overflow-y: auto;
198
+ // overflow-x: hidden;
199
+ // scroll-behavior: smooth;
200
+ // }
200
201
 
201
202
  .sidebar-container-popper .el-submenu__title:not(.is-disabled):hover {
202
203
  background: #F7F7F8;
@@ -223,14 +223,15 @@
223
223
  }
224
224
  }
225
225
 
226
- .sidebar-container-popper .el-menu{
227
- // height: 100vh;
228
- height: auto;
229
- max-height: 100vh;
230
- overflow-y: auto;
231
- overflow-x: hidden;
232
- scroll-behavior: smooth;
233
- }
226
+ // 注释的原因:会导致孙子菜单显示的位置不正确
227
+ // .sidebar-container-popper .el-menu{
228
+ // // height: 100vh;
229
+ // height: auto;
230
+ // max-height: 100vh;
231
+ // overflow-y: auto;
232
+ // overflow-x: hidden;
233
+ // scroll-behavior: smooth;
234
+ // }
234
235
 
235
236
  .sidebar-container-popper .el-submenu__title:not(.is-disabled):hover {
236
237
  background: #F7F7F8;
@@ -217,14 +217,15 @@
217
217
  }
218
218
  }
219
219
 
220
- .sidebar-container-popper .el-menu{
221
- // height: 100vh;
222
- height: auto;
223
- max-height: 100vh;
224
- overflow-y: auto;
225
- overflow-x: hidden;
226
- scroll-behavior: smooth;
227
- }
220
+ // 注释的原因:会导致孙子菜单显示的位置不正确
221
+ // .sidebar-container-popper .el-menu{
222
+ // // height: 100vh;
223
+ // height: auto;
224
+ // max-height: 100vh;
225
+ // overflow-y: auto;
226
+ // overflow-x: hidden;
227
+ // scroll-behavior: smooth;
228
+ // }
228
229
  .sidebar-container-popper .el-submenu__title:not(.is-disabled):hover {
229
230
  background: #F7F7F8;
230
231
  color: rgba(0, 13, 31, 0.85);
@@ -219,14 +219,15 @@
219
219
  }
220
220
  }
221
221
 
222
- .sidebar-container-popper .el-menu{
223
- // height: 100vh;
224
- height: auto;
225
- max-height: 100vh;
226
- overflow-y: auto;
227
- overflow-x: hidden;
228
- scroll-behavior: smooth;
229
- }
222
+ // 注释的原因:会导致孙子菜单显示的位置不正确
223
+ // .sidebar-container-popper .el-menu{
224
+ // // height: 100vh;
225
+ // height: auto;
226
+ // max-height: 100vh;
227
+ // overflow-y: auto;
228
+ // overflow-x: hidden;
229
+ // scroll-behavior: smooth;
230
+ // }
230
231
  .sidebar-container-popper .el-submenu__title:not(.is-disabled):hover {
231
232
  background: #F7F7F8;
232
233
  color: rgba(0, 13, 31, 0.85);
@@ -192,8 +192,8 @@ export default {
192
192
  <style lang="scss" scoped>
193
193
  .smb-sidebar-menu-item {
194
194
  position: relative;
195
- --el-menu-item-height: 50px;
196
- --el-menu-sub-item-height: 50px;
195
+ --el-menu-item-height: 45px;
196
+ --el-menu-sub-item-height: 45px;
197
197
  &.el-menu-item, &.el-sub-menu {
198
198
  padding: 0 !important;
199
199
  &:not(:has(> .el-tooltip__trigger)) {
@@ -254,8 +254,8 @@ export default {
254
254
  <style lang="scss" scoped>
255
255
  .smb-sidebar-menu-item {
256
256
  position: relative;
257
- --el-menu-item-height: 50px;
258
- --el-menu-sub-item-height: 50px;
257
+ --el-menu-item-height: 45px;
258
+ --el-menu-sub-item-height: 45px;
259
259
  &.el-menu-item, &.el-sub-menu {
260
260
  padding: 0 !important;
261
261
  &:not(:has(> .el-tooltip__trigger)) {
@@ -140,8 +140,8 @@ export default {
140
140
  <style lang="scss" scoped>
141
141
  .smb-sidebar-menu-item {
142
142
  position: relative;
143
- --el-menu-item-height: 50px;
144
- --el-menu-sub-item-height: 50px;
143
+ --el-menu-item-height: 45px;
144
+ --el-menu-sub-item-height: 45px;
145
145
  &.el-menu-item, &.el-sub-menu {
146
146
  padding: 0 !important;
147
147
  &:not(:has(> .el-tooltip__trigger)) {