@@ -148,8 +96,7 @@
import { ref, onMounted, onBeforeUnmount, computed } from 'vue'
import { useRouter, useRoute } from 'vue-router'
import Workflow from '@/workflow/index.vue'
-import { menuNodes, functionLibNode, functionNode } from '@/workflow/common/data'
-import { iconComponent } from '@/workflow/icons/utils'
+import DropdownMenu from '@/views/application-workflow/component/DropdownMenu.vue'
import applicationApi from '@/api/application'
import { isAppIcon } from '@/utils/application'
import { MsgSuccess, MsgConfirm, MsgError } from '@/utils/message'
@@ -179,9 +126,19 @@ const showPopover = ref(false)
const showDebug = ref(false)
const enlarge = ref(false)
const saveTime = ref
('')
-const activeName = ref('base')
-const functionLibList = ref([])
+function clickNodes(item: any) {
+ // workflowRef.value?.addNode(item)
+ showPopover.value = false
+}
+
+function onmousedown(item: any) {
+ // workflowRef.value?.onmousedown(item)
+ showPopover.value = false
+}
+function clickoutside() {
+ showPopover.value = false
+}
function publicHandle() {
workflowRef.value
?.validate()
@@ -206,9 +163,6 @@ function publicHandle() {
})
}
-function clickoutside() {
- showPopover.value = false
-}
const clickShowDebug = () => {
workflowRef.value
?.validate()
@@ -247,38 +201,6 @@ function clickoutsideDebug(e: any) {
}
}
-function clickNodes(item: any, data?: any) {
- if (data) {
- item['properties']['stepName'] = data.name
- item['properties']['node_data'] = {
- ...data,
- function_lib_id: data.id,
- input_field_list: data.input_field_list.map((field: any) => ({
- ...field,
- value: field.source == 'reference' ? [] : ''
- }))
- }
- }
- workflowRef.value?.addNode(item)
- showPopover.value = false
-}
-
-function onmousedown(item: any, data?: any) {
- if (data) {
- item['properties']['stepName'] = data.name
- item['properties']['node_data'] = {
- ...data,
- function_lib_id: data.id,
- input_field_list: data.input_field_list.map((field: any) => ({
- ...field,
- value: field.source == 'reference' ? [] : ''
- }))
- }
- }
- workflowRef.value?.onmousedown(item)
- showPopover.value = false
-}
-
function getGraphData() {
return workflowRef.value?.getGraphData()
}
@@ -308,12 +230,6 @@ function saveApplication(bool?: boolean) {
})
}
-function getList() {
- applicationApi.listFunctionLib(id, loading).then((res: any) => {
- functionLibList.value = res.data
- })
-}
-
/**
* 定时保存
*/
@@ -334,7 +250,7 @@ const closeInterval = () => {
onMounted(() => {
getDetail()
- getList()
+
// 初始化定时任务
if (hasPermission(`APPLICATION:MANAGE:${id}`, 'AND')) {
initInterval()
@@ -358,31 +274,7 @@ onBeforeUnmount(() => {
height: calc(100vh - 62px);
box-sizing: border-box;
}
- .workflow-dropdown-menu {
- -moz-user-select: none; /* Firefox */
- -webkit-user-select: none; /* WebKit内核 */
- -ms-user-select: none; /* IE10及以后 */
- -khtml-user-select: none; /* 早期浏览器 */
- -o-user-select: none; /* Opera */
- user-select: none; /* CSS3属性 */
- position: absolute;
- top: 49px;
- right: 90px;
- z-index: 99;
- width: 268px;
- box-shadow: 0px 4px 8px 0px var(--app-text-color-light-1);
- background: #ffffff;
- padding-bottom: 8px;
- .title {
- padding: 12px 12px 4px;
- }
- .workflow-dropdown-item {
- &:hover {
- background: var(--app-text-color-light-1);
- }
- }
- }
.workflow-dropdown-tabs {
.el-tabs__nav-wrap {
padding: 0 16px;
diff --git a/ui/src/workflow/common/NodeContainer.vue b/ui/src/workflow/common/NodeContainer.vue
index 2926421d1..77f1bdf7f 100644
--- a/ui/src/workflow/common/NodeContainer.vue
+++ b/ui/src/workflow/common/NodeContainer.vue
@@ -82,15 +82,35 @@