lex-xin 4 anni fa
parent
commit
4fc64b18c1

+ 14 - 2
src/components/wfd/components/DetailPanel/FlowDetail.vue

@@ -19,14 +19,15 @@
       </div>
       <div class="panelRow">
         <div>{{ i18n['sequenceFlow.expression'] }}:</div>
-        <el-input
+        <!-- <el-input
           style="width:90%; font-size:12px"
           type="textarea"
           :rows="4"
           :disabled="readOnly"
           :value="model.conditionExpression"
           @input="(value) => {onChange('conditionExpression', value)}"
-        />
+        /> -->
+
       </div>
     </div>
   </div>
@@ -47,10 +48,21 @@ export default {
       type: Function,
       default: () => {}
     },
+    templates: {
+      type: Array,
+      default: () => ([])
+    },
+    templatesBase: {
+      type: Array,
+      default: () => ([])
+    },
     readOnly: {
       type: Boolean,
       default: false
     }
+  },
+  mounted() {
+    console.log(this.templates, this.templatesBase)
   }
 }
 </script>

+ 2 - 0
src/components/wfd/components/DetailPanel/index.vue

@@ -67,6 +67,8 @@
     <FlowDetail
       v-else-if="model.clazz === 'flow'"
       :model="model"
+      :templates="templates"
+      :templates-base="templatesBase"
       :on-change="onChange"
       :read-only="readOnly"
     />

+ 0 - 1
src/views/process/admin/process-manager.vue

@@ -346,7 +346,6 @@ export default {
         per_page: 99999
       }).then(response => {
         this.postOptions = response.data.list
-        console.log(this.postOptions)
       })
     },
     /** 查询流程列表 */