-
+
diff --git a/src/plugins/package/penal/other/ElementOtherConfig.vue b/src/plugins/package/penal/other/ElementOtherConfig.vue
index a4427b2..868ee89 100644
--- a/src/plugins/package/penal/other/ElementOtherConfig.vue
+++ b/src/plugins/package/penal/other/ElementOtherConfig.vue
@@ -6,7 +6,7 @@
-
+
- 编辑
+ 编辑
- 移除
+ 移除
- 添加属性
+ 添加属性
-
-
+
+
@@ -26,8 +26,8 @@
- 取 消
- 确 定
+ 取 消
+ 确 定
diff --git a/src/plugins/package/penal/signal-message/SignalAndMessage.vue b/src/plugins/package/penal/signal-message/SignalAndMessage.vue
index 7ea59f6..53d3158 100644
--- a/src/plugins/package/penal/signal-message/SignalAndMessage.vue
+++ b/src/plugins/package/penal/signal-message/SignalAndMessage.vue
@@ -1,26 +1,79 @@
- 消息列表
- 创建新消息
+ 消息列表
+ 创建新消息
-
+
-
-
+
+
-
-
信号列表
-
创建新信号
+
+ 信号列表
+ 创建新信号
-
+
-
-
+
+
-
-
+
+
@@ -29,8 +82,10 @@
- 取 消
- 保 存
+ 取 消
+ 保 存
@@ -44,7 +99,7 @@ export default {
messageList: [],
modelVisible: false,
modelType: "",
- modelObjectForm: {}
+ modelObjectForm: {},
};
},
computed: {
@@ -54,19 +109,20 @@ export default {
} else {
return { title: "创建信号", idLabel: "信号ID", nameLabel: "信号名称" };
}
- }
+ },
},
mounted() {
this.initDataList();
},
methods: {
initDataList() {
- this.rootElements = window.bpmnInstances.modeler.getDefinitions().rootElements;
+ this.rootElements =
+ window.bpmnInstances.modeler.getDefinitions().rootElements;
this.messageIdMap = {};
this.signalIdMap = {};
this.messageList = [];
this.signalList = [];
- this.rootElements.forEach(el => {
+ this.rootElements.forEach((el) => {
if (el.$type === "bpmn:Message") {
this.messageIdMap[el.id] = true;
this.messageList.push({ ...el });
@@ -85,20 +141,26 @@ export default {
addNewObject() {
if (this.modelType === "message") {
if (this.messageIdMap[this.modelObjectForm.id]) {
- return this.$message.error("该消息已存在,请修改id后重新保存");
+ return ElMessage.error("该消息已存在,请修改id后重新保存");
}
- const messageRef = window.bpmnInstances.moddle.create("bpmn:Message", this.modelObjectForm);
+ const messageRef = window.bpmnInstances.moddle.create(
+ "bpmn:Message",
+ this.modelObjectForm
+ );
this.rootElements.push(messageRef);
} else {
if (this.signalIdMap[this.modelObjectForm.id]) {
return this.$message.error("该信号已存在,请修改id后重新保存");
}
- const signalRef = window.bpmnInstances.moddle.create("bpmn:Signal", this.modelObjectForm);
+ const signalRef = window.bpmnInstances.moddle.create(
+ "bpmn:Signal",
+ this.modelObjectForm
+ );
this.rootElements.push(signalRef);
}
this.modelVisible = false;
this.initDataList();
- }
- }
+ },
+ },
};
diff --git a/src/plugins/package/penal/task/ElementTask.vue b/src/plugins/package/penal/task/ElementTask.vue
index d1ba668..3ce9a34 100644
--- a/src/plugins/package/penal/task/ElementTask.vue
+++ b/src/plugins/package/penal/task/ElementTask.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/src/plugins/package/penal/task/task-components/ReceiveTask.vue b/src/plugins/package/penal/task/task-components/ReceiveTask.vue
index 282f238..c8d8195 100644
--- a/src/plugins/package/penal/task/task-components/ReceiveTask.vue
+++ b/src/plugins/package/penal/task/task-components/ReceiveTask.vue
@@ -5,11 +5,11 @@
-
+
-
-
+
+
@@ -18,7 +18,7 @@
- 确 认
+ 确 认
diff --git a/src/plugins/package/penal/task/task-components/UserTask.vue b/src/plugins/package/penal/task/task-components/UserTask.vue
index 0e92653..82aff31 100644
--- a/src/plugins/package/penal/task/task-components/UserTask.vue
+++ b/src/plugins/package/penal/task/task-components/UserTask.vue
@@ -15,11 +15,11 @@
{{userText}}
- 添加用户
+ 添加用户
-
+
-
+
diff --git a/src/plugins/package/utils.js b/src/plugins/package/utils.js
index d1a92a0..a367aa0 100644
--- a/src/plugins/package/utils.js
+++ b/src/plugins/package/utils.js
@@ -1,3 +1,5 @@
+import useBpmnStore from "@/store/modules/bpmn";
+const bpmnStore = useBpmnStore();
// 创建监听器实例
export function createListenerObject(options, isTask, prefix) {
const listenerObj = Object.create(null);
@@ -18,50 +20,72 @@ export function createListenerObject(options, isTask, prefix) {
}
// 注入字段
if (options.fields) {
- listenerObj.fields = options.fields.map(field => {
+ listenerObj.fields = options.fields.map((field) => {
return createFieldObject(field, prefix);
});
}
// 任务监听器的 定时器 设置
if (isTask && options.event === "timeout" && !!options.eventDefinitionType) {
- const timeDefinition = window.bpmnInstances.moddle.create("bpmn:FormalExpression", { body: options.eventTimeDefinitions });
- const TimerEventDefinition = window.bpmnInstances.moddle.create("bpmn:TimerEventDefinition", {
- id: `TimerEventDefinition_${uuid(8)}`,
- [`time${options.eventDefinitionType.replace(/^\S/, s => s.toUpperCase())}`]: timeDefinition
- });
+ const timeDefinition = window.bpmnInstances.moddle.create(
+ "bpmn:FormalExpression",
+ { body: options.eventTimeDefinitions }
+ );
+ const TimerEventDefinition = window.bpmnInstances.moddle.create(
+ "bpmn:TimerEventDefinition",
+ {
+ id: `TimerEventDefinition_${uuid(8)}`,
+ [`time${options.eventDefinitionType.replace(/^\S/, (s) =>
+ s.toUpperCase()
+ )}`]: timeDefinition,
+ }
+ );
listenerObj.eventDefinitions = [TimerEventDefinition];
}
- return window.bpmnInstances.moddle.create(`${prefix}:${isTask ? "TaskListener" : "ExecutionListener"}`, listenerObj);
+ return window.bpmnInstances.moddle.create(
+ `${prefix}:${isTask ? "TaskListener" : "ExecutionListener"}`,
+ listenerObj
+ );
}
// 创建 监听器的注入字段 实例
export function createFieldObject(option, prefix) {
const { name, fieldType, string, expression } = option;
- const fieldConfig = fieldType === "string" ? { name, string } : { name, expression };
+ const fieldConfig =
+ fieldType === "string" ? { name, string } : { name, expression };
return window.bpmnInstances.moddle.create(`${prefix}:Field`, fieldConfig);
}
// 创建脚本实例
export function createScriptObject(options, prefix) {
const { scriptType, scriptFormat, value, resource } = options;
- const scriptConfig = scriptType === "inlineScript" ? { scriptFormat, value } : { scriptFormat, resource };
- return window.bpmnInstances.moddle.create(`${prefix}:Script`, scriptConfig);
+ const scriptConfig =
+ scriptType === "inlineScript"
+ ? { scriptFormat, value }
+ : { scriptFormat, resource };
+ return window.bpmnInstances.moddle.create(
+ `${prefix}:Script`,
+ scriptConfig
+ );
}
// 更新元素扩展属性
export function updateElementExtensions(element, extensionList) {
- const extensions = window.bpmnInstances.moddle.create("bpmn:ExtensionElements", {
- values: extensionList
- });
+ const extensions = window.bpmnInstances.moddle.create(
+ "bpmn:ExtensionElements",
+ {
+ values: extensionList,
+ }
+ );
window.bpmnInstances.modeling.updateProperties(element, {
- extensionElements: extensions
+ extensionElements: extensions,
});
}
// 创建一个id
export function uuid(length = 8, chars) {
let result = "";
- let charsString = chars || "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+ let charsString =
+ chars || "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
for (let i = length; i > 0; --i) {
result += charsString[Math.floor(Math.random() * charsString.length)];
}
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 3b26cfe..353908d 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,46 +1,46 @@
-import Cookies from 'js-cookie'
+import Cookies from "js-cookie";
-const useAppStore = defineStore(
- 'app',
- {
- state: () => ({
- sidebar: {
- opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true,
- withoutAnimation: false,
- hide: false
- },
- device: 'desktop',
- size: Cookies.get('size') || 'default'
- }),
- actions: {
- toggleSideBar(withoutAnimation) {
- if (this.sidebar.hide) {
- return false;
- }
- this.sidebar.opened = !this.sidebar.opened
- this.sidebar.withoutAnimation = withoutAnimation
- if (this.sidebar.opened) {
- Cookies.set('sidebarStatus', 1)
- } else {
- Cookies.set('sidebarStatus', 0)
- }
- },
- closeSideBar({ withoutAnimation }) {
- Cookies.set('sidebarStatus', 0)
- this.sidebar.opened = false
- this.sidebar.withoutAnimation = withoutAnimation
- },
- toggleDevice(device) {
- this.device = device
- },
- setSize(size) {
- this.size = size;
- Cookies.set('size', size)
- },
- toggleSideBarHide(status) {
- this.sidebar.hide = status
+const useAppStore = defineStore("app", {
+ state: () => ({
+ sidebar: {
+ opened: Cookies.get("sidebarStatus")
+ ? !!+Cookies.get("sidebarStatus")
+ : true,
+ withoutAnimation: false,
+ hide: false,
+ },
+ device: "desktop",
+ size: Cookies.get("size") || "default",
+ }),
+ actions: {
+ toggleSideBar(withoutAnimation) {
+ if (this.sidebar.hide) {
+ return false;
}
- }
- })
+ this.sidebar.opened = !this.sidebar.opened;
+ this.sidebar.withoutAnimation = withoutAnimation;
+ if (this.sidebar.opened) {
+ Cookies.set("sidebarStatus", 1);
+ } else {
+ Cookies.set("sidebarStatus", 0);
+ }
+ },
+ closeSideBar({ withoutAnimation }) {
+ Cookies.set("sidebarStatus", 0);
+ this.sidebar.opened = false;
+ this.sidebar.withoutAnimation = withoutAnimation;
+ },
+ toggleDevice(device) {
+ this.device = device;
+ },
+ setSize(size) {
+ this.size = size;
+ Cookies.set("size", size);
+ },
+ toggleSideBarHide(status) {
+ this.sidebar.hide = status;
+ },
+ },
+});
-export default useAppStore
+export default useAppStore;
diff --git a/src/store/modules/bpmn.js b/src/store/modules/bpmn.js
new file mode 100644
index 0000000..eea1ca8
--- /dev/null
+++ b/src/store/modules/bpmn.js
@@ -0,0 +1,17 @@
+// import { defineStore } from "pinia";
+
+const useBpmnStore = defineStore("bpmn", {
+ state: () => ({
+ bpmnInstances: {},
+ count: 1,
+ }),
+ actions: {
+ setBpmnInstances(data) {
+ console.log(data);
+ this.bpmnInstances = data;
+ // this.bpmnInstances.name = "423";
+ },
+ },
+});
+
+export default useBpmnStore;
diff --git a/vite.config.js b/vite.config.js
index 5d0002e..848c872 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -19,6 +19,7 @@ export default defineConfig(({ mode, command }) => {
"~": path.resolve(__dirname, "./"),
// 设置别名
"@": path.resolve(__dirname, "./src"),
+ stream: "stream-browserify",
},
// https://cn.vitejs.dev/config/#resolve-extensions
extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json", ".vue"],