流程默认名称

Author: liuguofeng-java

README.md

@@ -53,6 +53,8 @@
   - [x] 用户节点 选择用户
   - [x] 整合流程变量
   - [x] 整合执行监听器
+  - [x] 验证流程规则是否合法
+  - [x] 流程默认名称
 
 - [x] 表单绑定数据库表
   - [x] 适配数据库-支持的数据库[MySQL、PostgreSQL] (进行中)

activiti7-ui/src/components/BpmnJs/bo-utils/popsUtils.ts

@@ -1,5 +1,5 @@
 import { type ModdleElement, type Element } from "bpmn-js/lib/util/ModelUtil";
-import modeler from "../../../store/modeler";
+import modeler from "@/store/modeler";
 
 /**
  * 获取设置的值

activiti7-ui/src/components/BpmnJs/bo-utils/variableUtil.ts

@@ -22,7 +22,7 @@ export const getWidgetTree = (): NodeWidget[] => {
     item.formJson.widgetList.forEach((widget) => {
       buildTreeToList(widget, widgetList);
     });
-    if (widgetList.length !== 0) {
+    if (widgetList.length !== 0 && elements[item.activityId]) {
       nodeWidgets.push({
         activityId: item.activityId,
         activityName: elements[item.activityId].element.businessObject.name,

activiti7-ui/src/components/BpmnJs/components/Panel/components/ElementGenerations.vue

@@ -15,56 +15,88 @@
   </el-card>
 </template>
 
-<script lang="ts">
-import { defineComponent } from "vue";
-import { mapState } from "pinia";
+<script lang="ts" setup>
+import { ref } from "vue";
 import modelerStore from "@/store/modeler";
 import { Element } from "bpmn-js/lib/model/Types";
 import { getNameValue, setNameValue } from "@/components/BpmnJs/bo-utils/nameUtil";
 import { setIdValue } from "@/components/BpmnJs/bo-utils/idUtil";
 import { getDocumentValue, setDocumentValue } from "@/components/BpmnJs/bo-utils/documentationUtil";
 import EventBus from "@/utils/EventBus";
 
-export default defineComponent({
-  name: "ElementGenerations",
-  data() {
-    return {
-      elementId: "",
-      elementName: "",
-      elementDoc: ""
-    };
-  },
-  watch: {
-    getActiveId: {
-      immediate: true,
-      handler() {
-        this.elementDoc = getDocumentValue(this.getActive as Element) || "";
-      }
-    }
-  },
-  computed: {
-    ...mapState(modelerStore, ["getActive", "getActiveId"])
-  },
-  mounted() {
-    this.reloadGenerationData();
-    EventBus.on("element-update", this.reloadGenerationData);
-  },
-  methods: {
-    reloadGenerationData() {
-      this.elementId = this.getActiveId as string;
-      this.elementName = getNameValue(this.getActive as Element) || "";
-      this.elementDoc = getDocumentValue(this.getActive as Element) || "";
-    },
-    updateElementName(value: string) {
-      setNameValue(this.getActive as Element, value);
-    },
-    updateElementId(value: string) {
-      setIdValue(this.getActive as Element, value);
-    },
-    updateElementDoc(value) {
-      setDocumentValue(this.getActive as Element, value);
-    }
-  }
+const modeler = modelerStore();
+
+// 当前节点信息
+let scopedElement: Element;
+// 节点id
+const elementId = ref<string>("");
+// 节点名称
+const elementName = ref<string>("");
+// 节点文档
+const elementDoc = ref<string>("");
+
+// 默认节点名称
+type DefaultElement = {
+  elementType: string; // 节点类型
+  defaultName: string; // 默认节点名称
+};
+
+// 默认节点名称
+const list: DefaultElement[] = [
+  { elementType: "bpmn:StartEvent", defaultName: "开始事件" },
+  { elementType: "bpmn:UserTask", defaultName: "用户任务" },
+  { elementType: "bpmn:ServiceTask", defaultName: "服务任务" },
+  { elementType: "bpmn:ExclusiveGateway", defaultName: "互斥网关" },
+  { elementType: "bpmn:ParallelGateway", defaultName: "并行网关" },
+  { elementType: "bpmn:EndEvent", defaultName: "结束节点" }
+];
+
+/**
+ * 获取节点数据
+ */
+const getElementData = () => {
+  elementId.value = modeler.getActiveId as string;
+  elementName.value = getNameValue(scopedElement) || "";
+  elementDoc.value = getDocumentValue(scopedElement) || "";
+};
+
+/**
+ * 更新节点id
+ * @param value 节点id
+ */
+const updateElementId = (value: string) => {
+  setIdValue(scopedElement, value);
+};
+
+/**
+ * 更新节点名称
+ * @param value 节点名称
+ */
+const updateElementName = (value: string) => {
+  setNameValue(scopedElement, value);
+};
+
+/**
+ * 更新节点文档
+ * @param value 节点文档
+ */
+const updateElementDoc = (value: string) => {
+  setDocumentValue(scopedElement, value);
+};
+
+/**
+ * 初始化节点名称,如果节点名称等于空预赋值
+ */
+const initElementName = () => {
+  if (elementName.value) return;
+  const item = list.find((t) => t.elementType === modeler.getActive.type);
+  if (item) updateElementName(item.defaultName);
+};
+
+// 点击用户节点，初始化用
+EventBus.on("element-init", function () {
+  scopedElement = modeler.getActive;
+  getElementData();
+  initElementName();
 });
 </script>
-@/store/modeler

activiti7-ui/src/components/BpmnJs/i18n/zh_CN/lint.ts

@@ -2,7 +2,7 @@ export default {
   "{errors} Errors, {warnings} Warnings": "{errors} 错误, {warnings} 警告",
   "Process is missing end event": "流程缺少结束节点",
   "Sub process is missing end event": "子流程缺少结束节点",
-  "Process is missing start event": "流程缺少结束节点",
+  "Process is missing start event": "流程缺少开始节点",
   "Sub process is missing start event": "子流程缺少开始节点",
   "Sequence flow is missing condition": "顺序流缺少条件",
   "Start event is missing event definition": "开始节点缺少事件定义",

activiti7-ui/src/components/BpmnJs/overwrite-modules/Lint/bpmnlint.ts

@@ -55,7 +55,7 @@ const rules = {
   "conditional-flows": "error",
   "end-event-required": "error",
   "event-sub-process-typed-start-event": "error",
-  "fake-join": "warn",
+  // "fake-join": "warn",
   "label-required": "error",
   "no-bpmndi": "error",
   "no-complex-gateway": "error",
@@ -82,7 +82,7 @@ const bundle = {
 cache["bpmnlint/conditional-flows"] = rule_0;
 cache["bpmnlint/end-event-required"] = rule_1;
 cache["bpmnlint/event-sub-process-typed-start-event"] = rule_2;
-cache["bpmnlint/fake-join"] = rule_3;
+// cache["bpmnlint/fake-join"] = rule_3;
 cache["bpmnlint/label-required"] = rule_4;
 cache["bpmnlint/no-bpmndi"] = rule_5;
 cache["bpmnlint/no-complex-gateway"] = rule_6;
@@ -103,7 +103,7 @@ cache["bpmnlint/superfluous-gateway"] = rule_16;
  */
 export function checkd() {
   const lintModule = modelerStore().getModeler.get("linting");
-  return Object.keys(lintModule._issues).length === 0;
+  return lintModule._button.className.indexOf("error") === -1;
 }
 
 export default bundle;