diff --git a/package.json b/package.json
index 1b7f076a..603f609b 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "bpmn-moddle": "^6.0.0",
     "camunda-bpmn-moddle": "^4.5.0",
     "crypto-js": "^4.2.0",
+    "diagram-js": "^11.4.1",
     "diagram-js-minimap": "^2.0.4",
     "echarts": "^5.4.3",
     "echarts-gl": "^2.0.9",
@@ -49,7 +50,8 @@
     "vue-router": "4",
     "vxe-table": "^4.5.17",
     "vxe-table-plugin-export-xlsx": "^4.0.1",
-    "xe-utils": "^3.5.14"
+    "xe-utils": "^3.5.14",
+    "yarn": "^1.22.22"
   },
   "devDependencies": {
     "@types/lodash-es": "^4.17.12",
diff --git a/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue b/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue
index 7c2cfa61..8b3aa2b2 100644
--- a/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue
@@ -23,7 +23,7 @@
                     消息与信号
                 </template>
                 <SignalAndMassage /> 
-            </el-collapse-item>
+            </el-collapse-item>-->
             <el-collapse-item name="condition" v-if="conditionFormVisible" key="condition">
                 <template #title>
                     <Icon name="el-icon-Promotion" />
@@ -31,48 +31,48 @@
                 </template>
                 <FlowCondition :business-object="elementBusinessObject" :type="elementType" /> 
             </el-collapse-item>
-            <el-collapse-item name="condition" v-if="formVisible" key="form">
-                <template #title>
-                    <Icon name="el-icon-List" />
-                    表单
-                </template>
-                <ElementForm :id="elementId" :type="elementType" /> 
-            </el-collapse-item>
-            <el-collapse-item name="task" v-if="elementType.indexOf('Task') !== -1" key="task">
-                <template #title>
-                    <Icon name="el-icon-Checked" />
-                    任务（审批人）
-                </template>
-                <ElementTask :id="elementId" :type="elementType" /> 
-            </el-collapse-item>
-            <el-collapse-item name="multiInstance" v-if="elementType.indexOf('Task') !== -1" key="multiInstance">
-                <template #title>
-                    <Icon name="el-icon-HelpFilled" />
-                    多实例（会签配置）
-                </template>
-                <ElementMultiInstance :business-object="elementBusinessObject" :type="elementType" /> 
-            </el-collapse-item>
-            <el-collapse-item name="listeners" key="listeners">
-                <template #title>
-                    <Icon name="el-icon-BellFilled" />
-                    执行监听器
-                </template>
-                <ElementListeners :id="elementId" :type="elementType" /> 
-            </el-collapse-item>
-            <el-collapse-item name="taskListeners" v-if="elementType === 'UserTask'" key="taskListeners">
-                <template #title>
-                    <Icon name="el-icon-BellFilled" />
-                    任务监听器
-                </template>
-                <UserTaskListeners :id="elementId" :type="elementType" /> 
-            </el-collapse-item>
-            <el-collapse-item name="extensions" key="extensions">
-                <template #title>
-                    <Icon name="el-icon-CirclePlusFilled" />
-                    扩展属性
-                </template>
-                <ElementProperties :id="elementId" :type="elementType" /> 
-            </el-collapse-item> -->
+            <!--    <el-collapse-item name="condition" v-if="formVisible" key="form">
+                   <template #title>
+                       <Icon name="el-icon-List" />
+                       表单
+                   </template>
+                   <ElementForm :id="elementId" :type="elementType" />
+               </el-collapse-item>
+               <el-collapse-item name="task" v-if="elementType.indexOf('Task') !== -1" key="task">
+                    <template #title>
+                        <Icon name="el-icon-Checked" />
+                        任务（审批人）
+                    </template>
+                    <ElementTask :id="elementId" :type="elementType" />
+                </el-collapse-item>
+                <el-collapse-item name="multiInstance" v-if="elementType.indexOf('Task') !== -1" key="multiInstance">
+                    <template #title>
+                        <Icon name="el-icon-HelpFilled" />
+                        多实例（会签配置）
+                    </template>
+                    <ElementMultiInstance :business-object="elementBusinessObject" :type="elementType" />
+                </el-collapse-item>
+                <el-collapse-item name="listeners" key="listeners">
+                    <template #title>
+                        <Icon name="el-icon-BellFilled" />
+                        执行监听器
+                    </template>
+                    <ElementListeners :id="elementId" :type="elementType" />
+                </el-collapse-item>
+                <el-collapse-item name="taskListeners" v-if="elementType === 'UserTask'" key="taskListeners">
+                    <template #title>
+                        <Icon name="el-icon-BellFilled" />
+                        任务监听器
+                    </template>
+                    <UserTaskListeners :id="elementId" :type="elementType" />
+                </el-collapse-item>
+                <el-collapse-item name="extensions" key="extensions">
+                    <template #title>
+                        <Icon name="el-icon-CirclePlusFilled" />
+                        扩展属性
+                    </template>
+                    <ElementProperties :id="elementId" :type="elementType" />
+                </el-collapse-item> -->
             <el-collapse-item name="other" key="other">
                 <template #title>
                     <Icon name="el-icon-Promotion" />
@@ -89,7 +89,7 @@ import ElementBaseInfo from './base/ElementBaseInfo.vue'
 import ElementOtherConfig from './other/ElementOtherConfig.vue'
 // // import ElementTask from './task/ElementTask.vue'
 // import ElementMultiInstance from './multi-instance/ElementMultiInstance.vue'
-// import FlowCondition from './flow-condition/FlowCondition.vue'
+import FlowCondition from './flow-condition/FlowCondition.vue'
 // import SignalAndMassage from './signal-message/SignalAndMessage.vue'
 // import ElementListeners from './listeners/ElementListeners.vue'
 // import ElementProperties from './properties/ElementProperties.vue'