diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataset.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataset.java index 22bf6ae..1521a0f 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataset.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataset.java @@ -77,11 +77,11 @@ public class PageDataset { } - public ModelTable getModelTable() { + public ModelTable _getModelTable() { return ModelTableCache.getInstance().get(masterTable); } - public boolean isCurDataSet(String dataset) { + public boolean _isCurDataSet(String dataset) { return this.name.equals(dataset); } diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageProvider.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageProvider.java index 8d29591..4d8d024 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageProvider.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageProvider.java @@ -48,7 +48,7 @@ public class DynPageProvider extends AbstractCompProvider { } public T loadBean(PageDataset dataset, long id) { - ModelTable table = dataset.getModelTable(); + ModelTable table = dataset._getModelTable(); if (table == null) throw new SwException("数据集主表未找到（" + dataset.name + "）！"); return loadBean(table.getName(), id); } diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java index 309e6bd..1e55a02 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowInstance.java @@ -327,6 +327,9 @@ public class FlowInstance { * @throws Exception */ public void delete() { + if (actInst != null && !actInst.isMake()) { + throw new BizException("当前单据非制单状态，不允许删除！"); + } getProcInstDao().deleteEntity(procInst); getTaskDao().deleteEntity("where tsk_pri_id=?", procInst.getId()); getCandidateDao().deleteEntity("where cnd_pri_id=?", procInst.getId()); @@ -733,6 +736,7 @@ public class FlowInstance { taskDao.deleteEntity(old_act); getTaskRelDao().deleteEntity("where trl_src_task_id=?", old_act.getId()); getProcInstDao().updateEntity(procInst); + getCommentDao().deleteEntity("where cmt_tsk_id=?", old_act.getId()); new_acts.clear(); new_acts.add(old_act); buildBillLog(FlowConst.Button.RETAKE.value, "TODO", actInst, new_acts); @@ -759,9 +763,11 @@ public class FlowInstance { taskDao.updateEntity(actInst); taskDao.batchDelete(new_acts); + getCommentDao().deleteEntity("where cmt_tsk_id in ("+ EntityHelper.getSqlInIds(new_acts) + ")"); getTaskRelDao().deleteEntity("where trl_src_task_id=?", actInst.getEntityId()); getProcInstDao().updateEntity(procInst); + updateComment(null, FlowConst.Button.RETAKE.value); buildBillLog(FlowConst.Button.RETAKE.value, "TODO", actInst, new_acts); listener.afterRetake(actInst, new_acts); } @@ -937,6 +943,14 @@ public class FlowInstance { bean.setStatu(FlowConst.ActivityStatu.SUBMIT.value); bean.setEndTime(DateUtil.nowDateTimeLong()); bean.setComment(comment); + } else if (FlowConst.Button.RETAKE.value.equals(optType)) { + if (bean.getHandlerTime() <= 0L) { + bean.setHandler(us.getUserId()); + bean.setHandlerTime(DateUtil.nowDateTimeLong()); + } + bean.setStatu(FlowConst.ActivityStatu.HANDLE.value); + bean.setHandlerTime(DateUtil.nowDateTimeLong()); + bean.setEndTime(0L); } getCommentDao().updateEntity(bean); } diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowListHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowListHandler.java index 91fb02f..9be2871 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowListHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowListHandler.java @@ -17,7 +17,7 @@ public class FlowListHandler extends DynPageListHandler { static IBuildSqlListener sqlListener = new IBuildSqlListener(){ @Override public void buildSelect(PageDataset dataSet, StringBuilder sql) { - sql.append("\ninner join " + EntityHelper.getSchemaTableName(ProcInst.ENTITY_NAME) + " on pri_id=" + dataSet.getModelTable().getIdField()); + sql.append("\ninner join " + EntityHelper.getSchemaTableName(ProcInst.ENTITY_NAME) + " on pri_id=" + dataSet._getModelTable().getIdField()); } }; diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleLoadHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleLoadHandler.java index 7abdbd7..182769e 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleLoadHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowSingleLoadHandler.java @@ -24,6 +24,7 @@ import java.util.ArrayList; /** * Created by Akmm at 2022-08-26 17:15 + * 流程加载 */ public class FlowSingleLoadHandler extends LCSingleLoadHandler implements FlowListener { protected FlowInstance flowInstance; diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/single/LCSingleLoadHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/single/LCSingleLoadHandler.java index fe2ec17..ee3e193 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/single/LCSingleLoadHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/single/LCSingleLoadHandler.java @@ -5,13 +5,11 @@ import cc.smtweb.framework.core.common.SwConsts; import cc.smtweb.framework.core.common.SwMap; import cc.smtweb.framework.core.db.DbEngine; import cc.smtweb.framework.core.db.EntityDao; -import cc.smtweb.framework.core.db.cache.ModelTableCache; import cc.smtweb.framework.core.db.impl.DefaultEntity; import cc.smtweb.framework.core.db.vo.ModelTable; import cc.smtweb.framework.core.exception.SwException; import cc.smtweb.system.bpm.web.design.form.define.PageDataset; import cc.smtweb.system.bpm.web.engine.dynPage.AbstractDynPageHandler; -import cc.smtweb.system.bpm.web.engine.dynPage.DynPageHelper; import cc.smtweb.system.bpm.web.engine.dynPage.DynPageListHandler; import cc.smtweb.system.bpm.web.engine.dynPage.DynRetBean; @@ -25,7 +23,7 @@ public class LCSingleLoadHandler extends AbstractDynPag SwMap ret = new SwMap(); //返回的数据，以dataset.name为key，查出的结果（bean或list）为value PageDataset cardDataset = LCSingleHelper.findCardDataset(datasets); - ModelTable table = cardDataset.getModelTable(); + ModelTable table = cardDataset._getModelTable(); if (table == null) throw new SwException("卡片主表未找到！"); final EntityDao dao = DbEngine.getInstance().findDao(table.getName()); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menu/MenuHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menu/MenuHandler.java index ea52263..65093cb 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menu/MenuHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menu/MenuHandler.java @@ -67,7 +67,7 @@ public class MenuHandler { @Override protected DefaultEntity readBeanFromPage(PageDataset pageDataSet, SwMap data) { - if (pageDataSet.isCurDataSet(Ds_menuCard)) { + if (pageDataSet._isCurDataSet(Ds_menuCard)) { //处理请求内容 SwMap sm_content = new SwMap(); sm_content.put("pageId", data.readString("sm_page_id")); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/user/UserHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/user/UserHandler.java index 2924c62..4ef1885 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/user/UserHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/user/UserHandler.java @@ -55,7 +55,7 @@ public class UserHandler { @Override protected DefaultEntity readBeanFromPage(PageDataset pageDataSet, SwMap data) { - if (pageDataSet.isCurDataSet(DS_UserCard)) { + if (pageDataSet._isCurDataSet(DS_UserCard)) { DefaultEntity bean = super.readBeanFromPage(pageDataSet, data); roleList = new ArrayList<>(); partyList = new ArrayList<>(); @@ -152,7 +152,7 @@ public class UserHandler { @Override protected void afterQuery(List listData) { - if (pageDataSet.isCurDataSet(DS_UserParty)) { + if (pageDataSet._isCurDataSet(DS_UserParty)) { listData.forEach(sw -> { sw.put("sup_roles", UserRoleCache.getInstance().getRoleByParty(sw.readLong("sup_id"))); sw.put("sup_roles_text", RoleCache.getInstance().getNamesByIds(UserRoleCache.getInstance().getRoleByParty(sw.readLong("sup_id")))); diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/EntityHelper.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/EntityHelper.java index 742a3cc..2d989e9 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/EntityHelper.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/EntityHelper.java @@ -324,4 +324,19 @@ public class EntityHelper { public static boolean isEmpty(DefaultEntity bean) { return bean == null || bean.isEmpty() || bean.getEntityId() <= 0L; } + + public static String getSqlInIds(Collection listBean) { + if (null == listBean || listBean.isEmpty()) return ""; + StringBuilder s = new StringBuilder(128); + Set set = new HashSet<>(); + for (DefaultEntity bean : listBean) { + if (bean.getEntityId() <= 0L) continue; + if (set.contains(bean.getEntityId())) continue; + set.add(bean.getEntityId()); + + s.append(bean.getEntityId()).append(","); + } + if (s.length() == 0) return ""; + return s.substring(0, s.length() - 1); + } } diff --git a/smtweb-framework/core/src/main/resources/demo.json b/smtweb-framework/core/src/main/resources/demo.json index 314f250..687c7d9 100644 --- a/smtweb-framework/core/src/main/resources/demo.json +++ b/smtweb-framework/core/src/main/resources/demo.json @@ -1,711 +1,267 @@ { - "form": - [ - { - "page": { - "id": "p744256811959324672", - "type": "fx-page", - "props": { - "title": "模型测试列表", - "key": "744256811959324673" - } - }, - "graph": { - "shape": "panel", - "id": "root_panel", - "type": "fx-split-panel", - "props": { - "horizontal": false, - "shadow": "" - }, - "children": [ - { - "id": "744256811959324674", - "type": "fx-form-panel", - "shape": "panel", - "props": { - "size": "50", - "label": "查询条件", - "colNum": 2, - "alignY": "center", - "paddingLeft": 20, - "paddingRight": 20, - "shadow": "" - }, - "children": [ - { - "id": "id744256811959324675", - "type": "fx-title", - "props": { - "label": "模型测试列表", - "fontSize": 15, - "color": "#313131", - "fontWeight": "bold", - "showPrefix": true, - "prefixWidth": 5, - "prefixHeight": 15, - "prefixColor": "#1E90FF" - } - }, - { - "id": "id744256811959324676", - "type": "fx-button-group", - "props": { - "menus": [], - "textAlign": "right" - }, - "slots": { - "default": [ - { - "type": "fx-button", - "props": { - "label": "新增", - "leftIcon": "plus", - "type": "primary", - "action": "button:add", - "link": false, - - "linkType": "dialog", - "fxLink": "dialog:editDialog", - "fxLink_text": "ttttt", - }, - "id": "id744256811959324677" - } - ] - } - } - ] + "type": "workflow", + "version": 3, + "flow": { + "widget": { + "type": "flow-chart" + }, + "graph": { + "cells": [ + { + "position": { + "x": 100, + "y": 40 }, - { - "id": "744256811959324678", - "type": "fx-form-panel", - "shape": "panel", - "props": { - "size": "", - "label": "列表", - "colNum": 0, - "paddingLeft": 20, - "paddingRight": 20, - "shadow": "" - }, - "children": [{ - "id": "id744256811959324679", - "type": "fx-table", - "props": { - "label": "表格", - - "border": true, - "stripe": true, - "showHeader": true, - "fit": true, - "dataset": "ds_182a5ea30e6", - "actionWidth": 120 - }, - "slots": { - "default": [ - { - "id": "id744256811959324680", - "type": "fx-table-column", - "props": { - "field": "id_182a5ea30fe", - "label": "ID" - } - }, - { - "id": "id744256811959324681", - "type": "fx-table-column", - "props": { - "field": "id_182a5ea30ff", - "label": "父ID" - } - }, - { - "id": "id744256811959324682", - "type": "fx-table-column", - "props": { - "field": "id_182a5ea3100", - "label": "级次码" - } - }, - { - "id": "id744256811959324683", - "type": "fx-table-column", - "props": { - "field": "id_182a5ea3101", - "label": "所属项目" - } - }, - { - "id": "id744256811959324684", - "type": "fx-table-column", - "props": { - "field": "id_182a5ea3102", - "label": "编码" - } - }, - { - "id": "id744256811959324685", - "type": "fx-table-column", - "props": { - "field": "id_182a5ea3103", - "label": "编码" - } - }, - { - "id": "id744256811959324686", - "type": "fx-table-column", - "props": { - "field": "id_182a5ea3104", - "label": "创建人" - } - }, - { - "id": "id744256811959324687", - "type": "fx-table-column", - "props": { - "field": "id_182a5ea3105", - "label": "最后更新人" - } - }, - { - "id": "id744256811959324688", - "type": "fx-table-column", - "props": { - "field": "id_182a5ea3106", - "label": "创建时间" - } - }, - { - "id": "id744256811959324689", - "type": "fx-table-column", - "props": { - "field": "id_182a5ea3107", - "label": "最后更新时间" - } - } - ], - "button": [ - { - "id": "id744256811959324690", - "type": "fx-button", - "props": { - "label": "编辑", - "type": "primary", - "leftIcon": "edit", - "action": "button:edit", - "link": false, - "text": true, - "linkType": "dialog", - "fxLink": "dialog:editDialog", - "fxLink_text": "ttttt", - "dataset": "" - } - }, - { - "id": "id744256811959324691", - "type": "fx-button", - "props": { - "label": "删除", - "type": "danger", - "leftIcon": "delete-themes", - "action": "button:remove", - "preAction": "", - "link": false, - "text": true, - "confirm": "", - "nextAction": "button:search", - "dataset": "" - } - } - ] - }, - "events": {} + "size": { + "width": 50, + "height": 50 + }, + "attrs": { + "icon": { + "xlink:href": "/src/assets/images/svg/play.svg" } - ] }, - { - "id": "744256811959324692", - "type": "fx-form-panel", - "shape": "panel", - "props": { - "size": "15", - "backgroundColor": "transparent" - }, - "children": [] - } - ] - } - } - ,{ - "page": { - "id": "id744256811959324693", - "type": "fx-dialog", - "props": { - "title": "ttttt", - "key": "editDialog", - "fontSize": 16, - "color": "#313131", - "fontWeight": "bold", - "showPrefix": true, - "prefixWidth": 5, - "prefixHeight": 16, - "prefixColor": "#1E90FF" - }, - "events": {} - }, - "graph": { - "shape": "panel", - "id": "root_panel", - "type": "fx-split-panel", - "props": { - "horizontal": false, - "shadow": "never" - }, - "children": [ + "visible": true, + "shape": "flow-end", + "id": "d88319d5-66a6-4f37-90a6-1186ddb7b337", + "data": {}, + "zIndex": 1 + }, { - "id": "744256811959324694", - "type": "fx-split-panel", - "shape": "panel", - "props": { - "horizontal": false, - "scroll": true + "position": { + "x": 100, + "y": 456 + }, + "size": { + "width": 50, + "height": 50 }, - "children": [ - { - "id": "744256811959324695", - "type": "fx-form-panel", - "shape": "panel", - "props": { - "size": "0", - "paddingTop": 15, - "colNum": 2 - }, - "children": [ - { - "id": "id744256811959324696", - "type": "fx-text", - "props": { - "label": "ID", - "type": "text", - "dataset": "ds_182a5ea30e9", - "field": "id_182a5ea30f1", - "required": "", - "placeholder": "请输入ID", - "labelWidth": 100, - "readonly": false, - "affixError": true - }, - "events": {} - } - ,{ - "id": "id744256811959324697", - "type": "fx-placeholder", - "props": { - "label": "占位" - }, - "layout": { - "row": 1 - } - } - , - { - "id": "id744256811959324698", - "type": "fx-text", - "props": { - "label": "父ID", - "type": "text", - "dataset": "ds_182a5ea30e9", - "field": "id_182a5ea30f3", - "required": "", - "placeholder": "请输入父ID", - "labelWidth": 100, - "readonly": false, - "affixError": true - }, - "events": {} - } - ,{ - "id": "id744256811959324699", - "type": "fx-placeholder", - "props": { - "label": "占位" - }, - "layout": { - "row": 1 - } - } - , - { - "id": "id744256811959324700", - "type": "fx-text", - "props": { - "label": "级次码", - "type": "text", - "dataset": "ds_182a5ea30e9", - "field": "id_182a5ea30f4", - "required": "", - "maxlength": 100, - "placeholder": "请输入级次码", - "labelWidth": 100, - "readonly": false, - "affixError": true - }, - "events": {} - } - ,{ - "id": "id744256811959324701", - "type": "fx-placeholder", - "props": { - "label": "占位" - }, - "layout": { - "row": 1 - } - } - , - { - "id": "id744256811959324702", - "type": "fx-text", - "props": { - "label": "所属项目", - "type": "text", - "dataset": "ds_182a5ea30e9", - "field": "id_182a5ea30f5", - "required": "", - "placeholder": "请输入所属项目", - "labelWidth": 100, - "readonly": false, - "affixError": true - }, - "events": {} - } - ,{ - "id": "id744256811959324703", - "type": "fx-placeholder", - "props": { - "label": "占位" - }, - "layout": { - "row": 1 - } - } - , - { - "id": "id744256811959324704", - "type": "fx-text", - "props": { - "label": "编码", - "type": "text", - "dataset": "ds_182a5ea30e9", - "field": "id_182a5ea30f6", - "required": "", - "maxlength": 32, - "placeholder": "请输入编码", - "labelWidth": 100, - "readonly": false, - "affixError": true - }, - "events": {} - } - ,{ - "id": "id744256811959324705", - "type": "fx-placeholder", - "props": { - "label": "占位" - }, - "layout": { - "row": 1 - } - } - , - { - "id": "id744256811959324706", - "type": "fx-text", - "props": { - "label": "编码", - "type": "text", - "dataset": "ds_182a5ea30e9", - "field": "id_182a5ea30f7", - "required": "", - "maxlength": 100, - "placeholder": "请输入编码", - "labelWidth": 100, - "readonly": false, - "affixError": true - }, - "events": {} - } - ,{ - "id": "id744256811959324707", - "type": "fx-placeholder", - "props": { - "label": "占位" - }, - "layout": { - "row": 1 - } - } - , - { - "id": "id744256811959324708", - "type": "fx-text", - "props": { - "label": "创建人", - "type": "text", - "dataset": "ds_182a5ea30e9", - "field": "id_182a5ea30f8", - "required": "", - "placeholder": "请输入创建人", - "labelWidth": 100, - "readonly": false, - "affixError": true - }, - "events": {} - } - ,{ - "id": "id744256811959324709", - "type": "fx-placeholder", - "props": { - "label": "占位" - }, - "layout": { - "row": 1 - } - } - , - { - "id": "id744256811959324710", - "type": "fx-text", - "props": { - "label": "最后更新人", - "type": "text", - "dataset": "ds_182a5ea30e9", - "field": "id_182a5ea30f9", - "required": "", - "placeholder": "请输入最后更新人", - "labelWidth": 100, - "readonly": false, - "affixError": true - }, - "events": {} - } - ,{ - "id": "id744256811959324711", - "type": "fx-placeholder", - "props": { - "label": "占位" - }, - "layout": { - "row": 1 - } - } - , - { - "id": "id744256811959324712", - "type": "fx-datetime", - "props": { - "label": "创建时间", - "type": "text", - "dataset": "ds_182a5ea30e9", - "field": "id_182a5ea30fa", - "required": "", - "placeholder": "请输入创建时间", - "labelWidth": 100, - "readonly": false, - "affixError": true - }, - "events": {} - } - ,{ - "id": "id744256811959324713", - "type": "fx-placeholder", - "props": { - "label": "占位" - }, - "layout": { - "row": 1 - } - } - , - { - "id": "id744256811959324714", - "type": "fx-datetime", - "props": { - "label": "最后更新时间", - "type": "text", - "dataset": "ds_182a5ea30e9", - "field": "id_182a5ea30fb", - "required": "", - "placeholder": "请输入最后更新时间", - "labelWidth": 100, - "readonly": false, - "affixError": true - }, - "events": {} - } - ] + "attrs": { + "body": { + "stroke": "#303133" }, - { - "id": "744256811959324715", - "type": "fx-form-panel", - "shape": "panel", - "props": {}, - "children": [] + "icon": { + "xlink:href": "/src/assets/images/svg/stop.svg" } - ] + }, + "visible": true, + "shape": "flow-end", + "id": "08c500dd-28e7-488a-bf79-56d6fc783194", + "data": {}, + "zIndex": 7 }, { - "id": "744256811959324716", - "type": "fx-form-panel", - "shape": "panel", - "props": { - "size": "0" + "position": { + "x": 65, + "y": 179 + }, + "size": { + "width": 120, + "height": 50 }, - "children": [ - { - "id": "id744256811959324717", - "type": "fx-divider", - "props": { - "label": "", - "contentPosition": "center", - "direction": "horizontal" - } + "attrs": { + "text": { + "text": "任务" + }, + "label": { + "text": "制单" + }, + "icon": { + "xlink:href": "/src/assets/images/svg/people.svg" } - ] + }, + "visible": true, + "shape": "flow-action", + "id": "a06b3e2f-588e-4b77-aa83-c3949399213d", + "data": {}, + "zIndex": 12 }, { - "id": "744256811959324718", - "type": "fx-form-panel", - "shape": "panel", - "props": { - "size": "50", - "alignY": "center", - "paddingRight": 20 + "position": { + "x": 65, + "y": 314 + }, + "size": { + "width": 120, + "height": 50 }, - "children": [ - { - "id": "id744256811959324719", - "type": "fx-button-group", - "props": { - "menus": [], - "textAlign": "right" - }, - "slots": { - "default": [ - { - "type": "fx-button", - "props": { - "label": "保存", - "leftIcon": "save", - "type": "success", - "action": "button:save", - }, - "id": "id744256811959324720" - }, - { - "type": "fx-button", - "props": { - "label": "关闭", - "leftIcon": "close", - "action": "button:closeDialog", - }, - "id": "id744256811959324721" - } - ] - } + "attrs": { + "text": { + "text": "任务" + }, + "label": { + "text": "审批" + }, + "icon": { + "xlink:href": "/src/assets/images/svg/people.svg" } - ] - } - ] - } - } - ], - "model": [ - { - "dataset": "ds_182a5ea30e6", - "label": "主数据集", - "fields": [ - { - "id": "id_182a5ea30fe", - "field": "mc_id" }, - { - "id": "id_182a5ea30ff", - "field": "mc_parent_id" }, - { - "id": "id_182a5ea3100", - "field": "mc_level_code" }, - { - "id": "id_182a5ea3101", - "field": "mc_prj_id" }, - { - "id": "id_182a5ea3102", - "field": "mc_code" }, - { - "id": "id_182a5ea3103", - "field": "mc_name" }, - { - "id": "id_182a5ea3104", - "field": "mc_create_uid" }, - { - "id": "id_182a5ea3105", - "field": "mc_update_uid" }, - { - "id": "id_182a5ea3106", - "field": "mc_create_at" }, - { - "id": "id_182a5ea3107", - "field": "mc_update_at" } - ], - "filters": [ - ] - }, - { - "dataset": "ds_182a5ea30e9", - "label": "卡片数据集", - "fields": [ - { - "id": "id_182a5ea30f1", - "field": "mc_id" }, - { - "id": "id_182a5ea30f3", - "field": "mc_parent_id" }, - { - "id": "id_182a5ea30f4", - "field": "mc_level_code" }, - { - "id": "id_182a5ea30f5", - "field": "mc_prj_id" }, - { - "id": "id_182a5ea30f6", - "field": "mc_code" }, - { - "id": "id_182a5ea30f7", - "field": "mc_name" }, - { - "id": "id_182a5ea30f8", - "field": "mc_create_uid" }, - { - "id": "id_182a5ea30f9", - "field": "mc_update_uid" }, + }, + "visible": true, + "shape": "flow-action", + "id": "c0cf8077-a879-4299-be0b-4dd041e8dac9", + "data": {}, + "zIndex": 13 + }, { - "id": "id_182a5ea30fa", - "field": "mc_create_at" }, + "shape": "edge", + "attrs": { + "line": { + "stroke": "#4D5B62", + "strokeWidth": 1 + } + }, + "id": "03c8e73d-e009-49b5-ad4c-c9f060b8c24a", + "zIndex": 27, + "data": {}, + "source": { + "cell": "d88319d5-66a6-4f37-90a6-1186ddb7b337" + }, + "target": { + "cell": "a06b3e2f-588e-4b77-aa83-c3949399213d" + } + }, { - "id": "id_182a5ea30fb", - "field": "mc_update_at" } - ], - "filters": [ + "shape": "edge", + "attrs": { + "line": { + "stroke": "#4D5B62", + "strokeWidth": 1 + } + }, + "id": "9be76069-399c-4782-a141-5550d8d635e3", + "zIndex": 37, + "data": {}, + "source": { + "cell": "a06b3e2f-588e-4b77-aa83-c3949399213d" + }, + "target": { + "cell": "c0cf8077-a879-4299-be0b-4dd041e8dac9" + } + }, { - "id": "fid_182a5ea30f2", - "field": "id", - "required": false, - "type": "input" + "shape": "edge", + "attrs": { + "line": { + "stroke": "#4D5B62", + "strokeWidth": 1 + } + }, + "id": "b7b53812-8392-448a-8158-f3f9242fab50", + "zIndex": 43, + "data": {}, + "source": { + "cell": "c0cf8077-a879-4299-be0b-4dd041e8dac9" + }, + "target": { + "cell": "08c500dd-28e7-488a-bf79-56d6fc783194" + } } ] } - ], - "option": { - "widgetRef": ["737684234579218432","736544100974596096"], - "vars": [] + }, + "model": { + "activities": [ + { + "label": "开始", + "id": "d88319d5-66a6-4f37-90a6-1186ddb7b337", + "type": 1 + }, + { + "label": "接受", + "id": "08c500dd-28e7-488a-bf79-56d6fc783194", + "type": 9 + }, + { + "label": "制单", + "buttons": [ + { + "type": "submit", + "label": "提交", + "valid": true + }, + { + "type": "reject", + "label": "驳回", + "valid": true + }, + { + "type": "retake", + "label": "取回", + "valid": true + }, + { + "type": "cancel", + "label": "作废", + "valid": true + }, + { + "type": "delete", + "label": "删除", + "valid": true + } + ], + "code": "make", + "page": "749216083826708481", + "canEdit": true, + "needSign": false, + "id": "a06b3e2f-588e-4b77-aa83-c3949399213d", + "type": 2 + }, + { + "label": "审批", + "buttons": [ + { + "type": "submit", + "label": "提交", + "valid": true + }, + { + "type": "reject", + "label": "驳回", + "valid": true + }, + { + "type": "retake", + "label": "取回", + "valid": true + }, + { + "type": "cancel", + "label": "作废", + "valid": true + }, + { + "type": "delete", + "label": "删除", + "valid": true + } + ], + "code": "approve", + "page": "749216083826708481", + "id": "c0cf8077-a879-4299-be0b-4dd041e8dac9", + "type": 2 + } + ], + "trans": [ + { + "label": "连接线", + "id": "03c8e73d-e009-49b5-ad4c-c9f060b8c24a", + "src": "d88319d5-66a6-4f37-90a6-1186ddb7b337", + "dst": "a06b3e2f-588e-4b77-aa83-c3949399213d" + }, + { + "label": "连接线", + "id": "9be76069-399c-4782-a141-5550d8d635e3", + "src": "a06b3e2f-588e-4b77-aa83-c3949399213d", + "dst": "c0cf8077-a879-4299-be0b-4dd041e8dac9" + }, + { + "label": "连接线", + "id": "b7b53812-8392-448a-8158-f3f9242fab50", + "src": "c0cf8077-a879-4299-be0b-4dd041e8dac9", + "dst": "08c500dd-28e7-488a-bf79-56d6fc783194" + } + ], + "page": "749216083826708481" } -} +} \ No newline at end of file