@steedos-labs/plugin-workflow 3.0.80 → 3.0.82
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/main/default/client/flow2_render.client.js +1 -1
- package/main/default/manager/uuflow_manager.js +6 -5
- package/main/default/objects/instances/buttons/instance_delete.button.yml +1 -1
- package/main/default/objects/instances/buttons/instance_delete_many.button.yml +9 -3
- package/main/default/translations/en.translation.yml +1 -0
- package/main/default/translations/zh-CN.translation.yml +2 -1
- package/package.json +1 -1
- package/package.service.js +112 -0
|
@@ -1408,12 +1408,13 @@ UUFlowManager.getApproveValues = async function (approve_values, permissions, fo
|
|
|
1408
1408
|
}
|
|
1409
1409
|
}
|
|
1410
1410
|
} else if (field.type === "table" && !field.formula && (permissions[field.code] === null || permissions[field.code] !== "editable")) {
|
|
1411
|
-
//
|
|
1411
|
+
// 子表字段处理：子表本身无编辑权限时，检查是否有子字段具有编辑权限
|
|
1412
1412
|
const childFields = field.fields || [];
|
|
1413
1413
|
const hasEditableChild = childFields.some(c => permissions[c.code] === "editable");
|
|
1414
1414
|
if (hasEditableChild && Array.isArray(approve_values[field.code])) {
|
|
1415
|
-
//
|
|
1416
|
-
|
|
1415
|
+
// 保留可编辑子字段及公式子字段。公式字段为计算值（非用户输入），其结果依赖其他字段，
|
|
1416
|
+
// 必须随依赖字段一并持久化，否则保存后刷新会回退。与第1432行顶层字段 !field.formula 保护逻辑对称一致。
|
|
1417
|
+
const editableChildCodes = new Set(childFields.filter(c => c.formula || permissions[c.code] === "editable").map(c => c.code));
|
|
1417
1418
|
editableChildCodes.add('_id');
|
|
1418
1419
|
approve_values[field.code] = approve_values[field.code].map(row => {
|
|
1419
1420
|
const filtered = {};
|
|
@@ -1425,11 +1426,11 @@ UUFlowManager.getApproveValues = async function (approve_values, permissions, fo
|
|
|
1425
1426
|
return filtered;
|
|
1426
1427
|
});
|
|
1427
1428
|
} else {
|
|
1428
|
-
//
|
|
1429
|
+
// 无可编辑子字段 → 整表删除
|
|
1429
1430
|
delete approve_values[field.code];
|
|
1430
1431
|
}
|
|
1431
1432
|
} else if (!field.formula && (permissions[field.code] === null || permissions[field.code] !== "editable")) {
|
|
1432
|
-
//
|
|
1433
|
+
// 普通字段：无编辑权限且非公式字段则删除
|
|
1433
1434
|
delete approve_values[field.code];
|
|
1434
1435
|
}
|
|
1435
1436
|
}
|
|
@@ -36,7 +36,7 @@ amis_schema: |-
|
|
|
36
36
|
"visibleOn": "${deleting}",
|
|
37
37
|
"body": [
|
|
38
38
|
{ "type": "spinner", "show": true, "size": "sm" },
|
|
39
|
-
{ "type": "tpl", "tpl": "
|
|
39
|
+
{ "type": "tpl", "tpl": "${'CustomLabels.instance_deleting_please_wait' | t}" }
|
|
40
40
|
]
|
|
41
41
|
}
|
|
42
42
|
],
|
|
@@ -104,8 +104,14 @@ amis_schema: |-
|
|
|
104
104
|
"expression": "${event.data.responseResult.responseStatus===0}"
|
|
105
105
|
},
|
|
106
106
|
{
|
|
107
|
-
"actionType": "
|
|
108
|
-
"expression": "${event.data.responseResult.responseStatus===0}"
|
|
107
|
+
"actionType": "custom",
|
|
108
|
+
"expression": "${event.data.responseResult.responseStatus===0}",
|
|
109
|
+
"script": "try { window.$('.list-view-btn-reload').click(); } catch(e) {}"
|
|
110
|
+
},
|
|
111
|
+
{
|
|
112
|
+
"actionType": "custom",
|
|
113
|
+
"expression": "${event.data.responseResult.responseStatus===0}",
|
|
114
|
+
"script": "try { window.postMessage({ type: 'approval-tree-menu:reload' }, '*'); } catch(e) {}"
|
|
109
115
|
}
|
|
110
116
|
]
|
|
111
117
|
}
|
package/package.json
CHANGED
package/package.service.js
CHANGED
|
@@ -140,6 +140,118 @@ module.exports = {
|
|
|
140
140
|
* Service started lifecycle event handler
|
|
141
141
|
*/
|
|
142
142
|
async started(ctx) {
|
|
143
|
+
// 注册 app_launcher widgets: 待审核、已审核
|
|
144
|
+
try {
|
|
145
|
+
const widgetsObj = this.getObject('widgets');
|
|
146
|
+
const existingWidgets = await widgetsObj.directFind({
|
|
147
|
+
filters: [['type', '=', 'amis-app_launcher'], ['name', 'startsWith', 'workflow_']]
|
|
148
|
+
});
|
|
149
|
+
|
|
150
|
+
const inboxSchema = {
|
|
151
|
+
type: 'wrapper',
|
|
152
|
+
size: 'none',
|
|
153
|
+
className: 'bg-white rounded-xl shadow-sm px-6 py-5 mb-0',
|
|
154
|
+
body: [
|
|
155
|
+
{
|
|
156
|
+
type: 'flex',
|
|
157
|
+
className: 'mb-2 items-center',
|
|
158
|
+
items: [
|
|
159
|
+
{ type: 'tpl', tpl: '<h3 class="text-base font-medium m-0">待审核</h3>', className: 'flex-1' },
|
|
160
|
+
{ type: 'link', href: '/app/approve_workflow/instance_tasks/grid/inbox', body: '查看全部 →', className: 'text-xs text-gray-400' }
|
|
161
|
+
]
|
|
162
|
+
},
|
|
163
|
+
{
|
|
164
|
+
type: 'crud',
|
|
165
|
+
mode: 'table',
|
|
166
|
+
affixHeader: false,
|
|
167
|
+
autoFillHeight: { height: 240 },
|
|
168
|
+
api: {
|
|
169
|
+
method: 'post',
|
|
170
|
+
url: '/graphql',
|
|
171
|
+
data: {
|
|
172
|
+
query: '{ instance_tasks(filters: [[\"handler\",\"=\",\"${context.userId}\"],[\"is_finished\",\"=\",false],[\"is_hidden\",\"!=\",true]], top: 10, sort: \"modified desc\") { _id instance_name submitter_name modified } }'
|
|
173
|
+
},
|
|
174
|
+
adaptor: 'return { data: { items: payload.data && payload.data.instance_tasks || [], total: payload.data && payload.data.instance_tasks && payload.data.instance_tasks.length || 0 } };'
|
|
175
|
+
},
|
|
176
|
+
headerToolbar: [],
|
|
177
|
+
footerToolbar: [],
|
|
178
|
+
columnsTogglable: false,
|
|
179
|
+
columns: [
|
|
180
|
+
{ name: 'instance_name', label: '标题', className: 'text-sm' },
|
|
181
|
+
{ name: 'submitter_name', label: '提交人', className: 'text-sm text-gray-500', width: 100 },
|
|
182
|
+
{ name: 'modified', label: '时间', type: 'datetime', format: 'MM-DD HH:mm', className: 'text-xs text-gray-400', width: 100 },
|
|
183
|
+
{ type: 'operation', label: '操作', width: 60, buttons: [{ type: 'button', label: '查看', level: 'link', className: 'text-sm p-0', onEvent: { click: { actions: [{ actionType: 'url', args: { url: '/app/approve_workflow/instance_tasks/view/${_id}', blank: true } }] } } }] }
|
|
184
|
+
]
|
|
185
|
+
}
|
|
186
|
+
]
|
|
187
|
+
};
|
|
188
|
+
|
|
189
|
+
// const outboxSchema = {
|
|
190
|
+
// type: 'wrapper',
|
|
191
|
+
// size: 'none',
|
|
192
|
+
// className: 'bg-white rounded-xl shadow-sm px-6 py-5 mb-0',
|
|
193
|
+
// body: [
|
|
194
|
+
// {
|
|
195
|
+
// type: 'flex',
|
|
196
|
+
// className: 'mb-2 items-center',
|
|
197
|
+
// items: [
|
|
198
|
+
// { type: 'tpl', tpl: '<h3 class="text-base font-medium m-0">已审核</h3>', className: 'flex-1' },
|
|
199
|
+
// { type: 'link', href: '/app/approve_workflow/instance_tasks/grid/outbox', body: '查看全部 →', className: 'text-xs text-gray-400' }
|
|
200
|
+
// ]
|
|
201
|
+
// },
|
|
202
|
+
// {
|
|
203
|
+
// type: 'crud',
|
|
204
|
+
// mode: 'table',
|
|
205
|
+
// affixHeader: false,
|
|
206
|
+
// autoFillHeight: { height: 240 },
|
|
207
|
+
// api: {
|
|
208
|
+
// method: 'post',
|
|
209
|
+
// url: '/graphql',
|
|
210
|
+
// data: {
|
|
211
|
+
// query: '{ instance_tasks(filters: [["handler","=","${context.userId}"],["is_finished","=",true],["is_latest_approve","=",true],["type","!=","draft"],["is_hidden","!=",true]], top: 10, sort: "modified desc") { _id instance_name submitter_name modified } }'
|
|
212
|
+
// },
|
|
213
|
+
// adaptor: 'return { data: { items: payload.data && payload.data.instance_tasks || [], total: payload.data && payload.data.instance_tasks && payload.data.instance_tasks.length || 0 } };'
|
|
214
|
+
// },
|
|
215
|
+
// headerToolbar: [],
|
|
216
|
+
// footerToolbar: [],
|
|
217
|
+
// columnsTogglable: false,
|
|
218
|
+
// onEvent: {
|
|
219
|
+
// rowClick: {
|
|
220
|
+
// actions: [
|
|
221
|
+
// {
|
|
222
|
+
// actionType: 'url',
|
|
223
|
+
// args: { url: '/app/approve_workflow/instance_tasks/view/${event.data.item._id}', blank: true }
|
|
224
|
+
// }
|
|
225
|
+
// ]
|
|
226
|
+
// }
|
|
227
|
+
// },
|
|
228
|
+
// columns: [
|
|
229
|
+
// { name: 'instance_name', label: '标题', className: 'text-sm' },
|
|
230
|
+
// { name: 'submitter_name', label: '提交人', className: 'text-sm text-gray-500', width: 100 },
|
|
231
|
+
// { name: 'modified', label: '时间', type: 'datetime', format: 'MM-DD HH:mm', className: 'text-xs text-gray-400', width: 100 },
|
|
232
|
+
// { type: 'operation', label: '操作', width: 60, buttons: [{ type: 'button', label: '查看', level: 'link', className: 'text-sm p-0', onEvent: { click: { actions: [{ actionType: 'url', args: { url: '/app/approve_workflow/instance_tasks/view/${_id}', blank: true } }] } } }] }
|
|
233
|
+
// ]
|
|
234
|
+
// }
|
|
235
|
+
// ]
|
|
236
|
+
// };
|
|
237
|
+
|
|
238
|
+
const inboxWidget = existingWidgets.find(w => w.name === 'workflow_inbox');
|
|
239
|
+
if (inboxWidget) {
|
|
240
|
+
await widgetsObj.directUpdate(inboxWidget._id, { schema: inboxSchema, label: '待审核', sort: 10 });
|
|
241
|
+
} else {
|
|
242
|
+
await widgetsObj.directInsert({ name: 'workflow_inbox', type: 'amis-app_launcher', label: '待审核', sort: 10, schema: inboxSchema });
|
|
243
|
+
}
|
|
244
|
+
|
|
245
|
+
// const outboxWidget = existingWidgets.find(w => w.name === 'workflow_outbox');
|
|
246
|
+
// if (outboxWidget) {
|
|
247
|
+
// await widgetsObj.directUpdate(outboxWidget._id, { schema: outboxSchema, label: '已审核', sort: 20 });
|
|
248
|
+
// } else {
|
|
249
|
+
// await widgetsObj.directInsert({ name: 'workflow_outbox', type: 'amis-app_launcher', label: '已审核', sort: 20, schema: outboxSchema });
|
|
250
|
+
// }
|
|
251
|
+
} catch (error) {
|
|
252
|
+
console.error('Failed to register app_launcher widgets:', error.message);
|
|
253
|
+
}
|
|
254
|
+
|
|
143
255
|
if((process.env.STEEDOS_CRON_ENABLED === true || process.env.STEEDOS_CRON_ENABLED === 'true')){
|
|
144
256
|
|
|
145
257
|
if (process.env.STEEDOS_CRON_INSTANCERECORDQUEUE_INTERVAL) {
|