Skip to content

A
apaas-ui
"...ssh:/git@cloud.wodcloud.com:10022/gzga-jzapi/apaas-ui.git" did not exist on "f0d7f32469f43cd8d898835fec120b107cda5461"
Commit 7d09c890 authored by 张俊's avatar 张俊
Browse files
Options

Merge branch 'dev' of https://cloud.wodcloud.com/git/apaas/apaas-v3-ui into dev

parents aab221c4 a0fac298
Hide whitespace changes
Inline Side-by-side
Showing with 387 additions and 274 deletions
src/components/work-flow/super-flow.vue
View file @ 7d09c890
...@@ -14,37 +14,16 @@ ...@@ -14,37 +14,16 @@
<div class="node-container"> <div class="node-container">
<p class="label_head">节点类型</p> <p class="label_head">节点类型</p>
<p class="label_explanation">请拖拽添加到流程中</p> <p class="label_explanation">请拖拽添加到流程中</p>
<div <div class="node-item" :class="{'node-item-begin': item.value.meta.type == 1, 'node-item-end': item.value.meta.type == 2, 'node-item-default': item.value.meta.type == 3}" v-for="(item, index) in nodeItemList" :key="index" @mousedown="evt => nodeItemMouseDown(evt, item.value)">
class="node-item"
:class="{'node-item-begin': item.value.meta.type == 1, 'node-item-end': item.value.meta.type == 2, 'node-item-default': item.value.meta.type == 3}"
v-for="(item, index) in nodeItemList"
:key="index"
@mousedown="evt => nodeItemMouseDown(evt, item.value)"
>
<span>{{item.label}}</span> <span>{{item.label}}</span>
</div> </div>
</div> </div>
</div> </div>
<div class="flow-container" ref="flowContainer"> <div class="flow-container" ref="flowContainer">
<super-flow <super-flow ref="superFlow" :node-list="nodeList" :link-list="linkList" :link-menu="linkMenu" line-color="#c4d8f8" onLineColor="#94a8c8" :origin="origin">
ref="superFlow"
:node-list="nodeList"
:link-list="linkList"
:link-menu="linkMenu"
line-color="#c4d8f8"
onLineColor="#94a8c8"
:origin="origin"
>
<template v-slot:node="{meta}"> <template v-slot:node="{meta}">
<div <div :class="{'flow-node-begin': nodeParams(meta.id).type == 1, 'flow-node-end': nodeParams(meta.id).type == 2, 'flow-node-default': nodeParams(meta.id).type == 3 && meta.id != nodeItem.id, 'flow-node-default-active': nodeParams(meta.id).type == 3 && meta.id == nodeItem.id }" :id="meta.id">
:class="{'flow-node-begin': nodeParams(meta.id).type == 1, 'flow-node-end': nodeParams(meta.id).type == 2, 'flow-node-default': nodeParams(meta.id).type == 3 && meta.id != nodeItem.id, 'flow-node-default-active': nodeParams(meta.id).type == 3 && meta.id == nodeItem.id }" <div class="node_span" @click="clickItem(meta.id)" @blur="blurItem">{{nodeParams(meta.id).name}}</div>
:id="meta.id"
>
<div
class="node_span"
@click="clickItem(meta.id)"
@blur="blurItem"
>{{nodeParams(meta.id).name}}</div>
</div> </div>
</template> </template>
</super-flow> </super-flow>
...@@ -63,25 +42,18 @@ ...@@ -63,25 +42,18 @@
<img :src="require('@/assets/imgs/lcsj_ic_jiekou.png')" class="options_item_img" /> <img :src="require('@/assets/imgs/lcsj_ic_jiekou.png')" class="options_item_img" />
<p class="options_item_text">接口插件</p> <p class="options_item_text">接口插件</p>
</div> </div>
<div class="options_pop_item"> <div class="options_pop_item" @click="showProcessService">
<img :src="require('@/assets/imgs/lcsj_ic_liucheng.png')" class="options_item_img" /> <img :src="require('@/assets/imgs/lcsj_ic_liucheng.png')" class="options_item_img" />
<p class="options_item_text">流程服务</p> <p class="options_item_text">流程服务</p>
</div> </div>
<div class="options_pop_item"> <div class="options_pop_item" @click="showTimeoutManagement">
<img :src="require('@/assets/imgs/lcsj_ic_chaoshi.png')" class="options_item_img" /> <img :src="require('@/assets/imgs/lcsj_ic_chaoshi.png')" class="options_item_img" />
<p class="options_item_text">超时管理</p> <p class="options_item_text">超时管理</p>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<el-dialog <el-dialog :visible.sync="dialog_general" top="25vh" width="420px" :modal-append-to-body="false" title="常规设置" :close-on-click-modal="false">
:visible.sync="dialog_general"
top="25vh"
width="420px"
:modal-append-to-body="false"
title="常规设置"
:close-on-click-modal="false"
>
<div class="general_settings"> <div class="general_settings">
<p class="general_title">节点编号：</p> <p class="general_title">节点编号：</p>
<p class="general_val">{{ nodeParams(nodeItem.id).node_code }}</p> <p class="general_val">{{ nodeParams(nodeItem.id).node_code }}</p>
...@@ -95,14 +67,7 @@ ...@@ -95,14 +67,7 @@
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog <el-dialog :visible.sync="dialog_interface" top="25vh" width="80vw" :modal-append-to-body="false" title="接口插件" :close-on-click-modal="false">
:visible.sync="dialog_interface"
top="25vh"
width="80vw"
:modal-append-to-body="false"
title="接口插件"
:close-on-click-modal="false"
>
<div class="interface_plugin"> <div class="interface_plugin">
<div class="interface_msg"> <div class="interface_msg">
<i class="el-icon-warning-outline"></i> <i class="el-icon-warning-outline"></i>
...@@ -111,46 +76,16 @@ ...@@ -111,46 +76,16 @@
<div class="interface_plugin_item"> <div class="interface_plugin_item">
<div class="fwcs_fwdz">服务地址：</div> <div class="fwcs_fwdz">服务地址：</div>
<div class="fwcs_fwdz_inner"> <div class="fwcs_fwdz_inner">
<el-input <el-input placeholder="请输入内容" @input="getUrl" v-model="serviceUrl" class="input-with-select">
placeholder="请输入内容"
@input="getUrl"
v-model="serviceUrl"
class="input-with-select"
>
<el-select v-model="select" slot="prepend" placeholder="请选择"> <el-select v-model="select" slot="prepend" placeholder="请选择">
<el-option <el-option v-for="item in optionType" :key="item.value" :label="item.label" :value="item.value"></el-option>
v-for="item in optionType"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select> </el-select>
</el-input> </el-input>
<el-button @click="clickFwcs()" class="fwcs_btn_fwcs">连接测试</el-button> <el-button @click="clickFwcs()" class="fwcs_btn_fwcs">连接测试</el-button>
</div> </div>
<el-tabs v-model="activeName" class="fwcs_tabs" @tab-click="clickTab"> <el-tabs v-model="activeName" class="fwcs_tabs" @tab-click="clickTab">
<el-tab-pane label="请求参数" name="0"> <el-tab-pane label="请求参数" name="0">
<CesTable <CesTable ref="fwcs_sjfw_qq" size="mini" :border="true" :headers="sjfwQqcs" url :datas="datasSj" :searchShow="false" :addRowBtn="false" :autoAdd="true" :isDialog="false" :isSelection="false" :isIndex="true" :radius="true" :emptyText="emptyText" :stripe="false" :paginationShow="false" :pageSizeShow="false" headerCellClassName="th_pink" @changeTable="changeTable"></CesTable>
ref="fwcs_sjfw_qq"
size="mini"
:border="true"
:headers="sjfwQqcs"
url
:datas="datasSj"
:searchShow="false"
:addRowBtn="false"
:autoAdd="true"
:isDialog="false"
:isSelection="false"
:isIndex="true"
:radius="true"
:emptyText="emptyText"
:stripe="false"
:paginationShow="false"
:pageSizeShow="false"
headerCellClassName="th_pink"
@changeTable="changeTable"
></CesTable>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="请求体" name="1"> <el-tab-pane label="请求体" name="1">
<div class="sjfw_qqt"> <div class="sjfw_qqt">
...@@ -165,12 +100,7 @@ ...@@ -165,12 +100,7 @@
<el-col :span="6"> <el-col :span="6">
<div class="sqxx_title">授权方式：</div> <div class="sqxx_title">授权方式：</div>
<el-select v-model="sqfsVal" placeholder="请选择" class="sqxx_select"> <el-select v-model="sqfsVal" placeholder="请选择" class="sqxx_select">
<el-option <el-option v-for="item in optionsSq" :key="item.value" :label="item.label" :value="item.value"></el-option>
v-for="item in optionsSq"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select> </el-select>
</el-col> </el-col>
<el-col :span="2" class="center_line_c"> <el-col :span="2" class="center_line_c">
...@@ -186,47 +116,9 @@ ...@@ -186,47 +116,9 @@
<div v-show="resultShow && resSuccess" class="add_params"> <div v-show="resultShow && resSuccess" class="add_params">
<div class="split_line"></div> <div class="split_line"></div>
<div class="sjfw_qqcstx">请求参数信息填写：</div> <div class="sjfw_qqcstx">请求参数信息填写：</div>
<CesTable <CesTable ref="fwcs_sjfw_qqcs" size="mini" :border="true" :headers="sjfwQqcstx" url :datas="datasQqcs" :searchShow="false" :addRowBtn="false" :autoAdd="false" :isDialog="false" :isSelection="false" :isIndex="true" :radius="true" :emptyText="emptyText" :stripe="false" :paginationShow="false" :pageSizeShow="false" headerCellClassName="th_pink"></CesTable>
ref="fwcs_sjfw_qqcs"
size="mini"
:border="true"
:headers="sjfwQqcstx"
url
:datas="datasQqcs"
:searchShow="false"
:addRowBtn="false"
:autoAdd="false"
:isDialog="false"
:isSelection="false"
:isIndex="true"
:radius="true"
:emptyText="emptyText"
:stripe="false"
:paginationShow="false"
:pageSizeShow="false"
headerCellClassName="th_pink"
></CesTable>
<div class="sjfw_fhcstx">返回参数信息填写：</div> <div class="sjfw_fhcstx">返回参数信息填写：</div>
<CesTable <CesTable ref="fwcs_sjfw_fhcs" size="mini" :border="true" :headers="sjfwFhcstx" url :datas="datasFhcs" :searchShow="false" :addRowBtn="false" :autoAdd="false" :isDialog="false" :isSelection="false" :isIndex="true" :radius="true" :emptyText="emptyText" :stripe="false" :paginationShow="false" :pageSizeShow="false" headerCellClassName="th_pink"></CesTable>
ref="fwcs_sjfw_fhcs"
size="mini"
:border="true"
:headers="sjfwFhcstx"
url
:datas="datasFhcs"
:searchShow="false"
:addRowBtn="false"
:autoAdd="false"
:isDialog="false"
:isSelection="false"
:isIndex="true"
:radius="true"
:emptyText="emptyText"
:stripe="false"
:paginationShow="false"
:pageSizeShow="false"
headerCellClassName="th_pink"
></CesTable>
</div> </div>
<div v-show="resultShow && !resSuccess"> <div v-show="resultShow && !resSuccess">
<div class="skfw_csfwxx">测试服务信息：</div> <div class="skfw_csfwxx">测试服务信息：</div>
...@@ -243,6 +135,65 @@ ...@@ -243,6 +135,65 @@
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="dialog_process" top="25vh" width="500px" :modal-append-to-body="false" title="流程服务" :close-on-click-modal="false">
<div class="process_service">
<div class="process_msg">
<i class="el-icon-warning-outline"></i>
<span>配置流程服务插件后，该节点可调用流程服务，并在此节点触发该流程。</span>
</div>
<p class="process_title">我的服务：</p>
<p class="process_input">
<el-select v-model="service" placeholder="请选择服务">
<el-option v-for="item in my_service_list" :label="item" :value="item" :key="item"></el-option>
</el-select>
</p>
<div class="dia_footer">
<el-button class="cancel" @click="processCancel">取消</el-button>
<el-button class="submit" @click="processSubmit">确定</el-button>
</div>
</div>
</el-dialog>
<el-dialog :visible.sync="dialog_timeout" top="25vh" width="500px" :modal-append-to-body="false" title="超时管理" :close-on-click-modal="false">
<div class="timeout_service">
<div class="timeout_msg">
<i class="el-icon-warning-outline"></i>
<span>添加超时管理插件后，根据配置该节点超时后会发送消息给请求方。</span>
</div>
<p class="timeout_title">超时设置：</p>
<div class="timeout_input">
<div class="timeout_row">
<div class="timeout_input_group">
<div class="input_left">最大时长</div>
<el-input-number v-model="max_time_0" controls-position="right" :min="0"></el-input-number>
<el-select v-model="max_time_type_0" class="input_right_select" placeholder="请选择申请时长">
<el-option v-for="item in durationOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</div>
<div class="timeout_check">
<el-checkbox v-model="max_time_check_0">超时提醒</el-checkbox>
</div>
</div>
</div>
<div class="timeout_input margin_high">
<div class="timeout_row">
<div class="timeout_input_group">
<div class="input_left">最大时长</div>
<el-input-number v-model="max_time_1" controls-position="right" :min="0"></el-input-number>
<el-select v-model="max_time_type_1" class="input_right_select" placeholder="请选择申请时长">
<el-option v-for="item in durationOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</div>
<div class="timeout_check">
<el-checkbox v-model="max_time_check_1">超时提醒</el-checkbox>
</div>
</div>
</div>
<div class="dia_footer">
<el-button class="cancel" @click="timeoutCancel">取消</el-button>
<el-button class="submit" @click="timeoutSubmit">确定</el-button>
</div>
</div>
</el-dialog>
</div> </div>
</template> </template>
...@@ -251,12 +202,12 @@ import CesTable from "@/components/table/table-um"; ...@@ -251,12 +202,12 @@ import CesTable from "@/components/table/table-um";
import Codes from "@/components/general/codes"; import Codes from "@/components/general/codes";
const drawerType = { const drawerType = {
node: 0, node: 0,
link: 1, link: 1
}; };
export default { export default {
components: { components: {
CesTable, CesTable,
Codes, Codes
}, },
data() { data() {
return { return {
...@@ -297,14 +248,14 @@ export default { ...@@ -297,14 +248,14 @@ export default {
} else { } else {
this.$refs.linkSetting.clearValidate(); this.$refs.linkSetting.clearValidate();
} }
}, }
}, },
linkSetting: { linkSetting: {
desc: "", desc: ""
}, },
nodeSetting: { nodeSetting: {
name: "", name: "",
desc: "", desc: ""
}, },
dragConf: { dragConf: {
isDown: false, isDown: false,
...@@ -314,7 +265,7 @@ export default { ...@@ -314,7 +265,7 @@ export default {
clientX: 0, clientX: 0,
clientY: 0, clientY: 0,
ele: null, ele: null,
info: null, info: null
}, },
nodeItemList: [ nodeItemList: [
{ {
...@@ -325,9 +276,9 @@ export default { ...@@ -325,9 +276,9 @@ export default {
meta: { meta: {
label: "普通节点", label: "普通节点",
name: "普通节点", name: "普通节点",
type: 3, type: 3
}, }
}, }
}, },
{ {
label: "开始", label: "开始",
...@@ -337,9 +288,9 @@ export default { ...@@ -337,9 +288,9 @@ export default {
meta: { meta: {
label: "开始", label: "开始",
name: "开始", name: "开始",
type: 1, type: 1
}, }
}, }
}, },
{ {
label: "结束", label: "结束",
...@@ -349,27 +300,27 @@ export default { ...@@ -349,27 +300,27 @@ export default {
meta: { meta: {
label: "结束", label: "结束",
name: "结束", name: "结束",
type: 2, type: 2
}, }
}, }
}, }
], ],
nodeParamsList: [], nodeParamsList: [],
linkMenu: [ linkMenu: [
[ [
{ {
label: "删除", label: "删除",
selected: (link) => { selected: link => {
console.log(link); console.log(link);
link.remove(); link.remove();
}, }
}, }
], ]
], ],
dialog_general: false, dialog_general: false,
nodeItem: { nodeItem: {
id: "", id: "",
name: "", name: ""
}, },
node_name: "", node_name: "",
show_options_pop: false, show_options_pop: false,
...@@ -378,7 +329,7 @@ export default { ...@@ -378,7 +329,7 @@ export default {
{ label: "GET", value: 1 }, { label: "GET", value: 1 },
{ label: "POST", value: 2 }, { label: "POST", value: 2 },
{ label: "PUT", value: 3 }, { label: "PUT", value: 3 },
{ label: "DELETE", value: 4 }, { label: "DELETE", value: 4 }
], ],
select: 1, select: 1,
serviceUrl: "", serviceUrl: "",
...@@ -391,9 +342,9 @@ export default { ...@@ -391,9 +342,9 @@ export default {
label: "请求字段编码", label: "请求字段编码",
prop: "requestEncoding", prop: "requestEncoding",
type: "input", type: "input",
align: "left", align: "left"
}, },
{ label: "请求值", prop: "requestValue", type: "input", align: "left" }, { label: "请求值", prop: "requestValue", type: "input", align: "left" }
], ],
datasSj: [], datasSj: [],
optionsSq: [{ label: "Bearer Token", value: "Bearer" }], optionsSq: [{ label: "Bearer Token", value: "Bearer" }],
...@@ -407,13 +358,13 @@ export default { ...@@ -407,13 +358,13 @@ export default {
prop: "show_type", prop: "show_type",
type: "", type: "",
align: "left", align: "left",
width: "140", width: "140"
}, },
{ {
label: "字段名称*", label: "字段名称*",
prop: "label", prop: "label",
type: "input", type: "input",
align: "left", align: "left"
}, },
{ {
label: "是否必须*", label: "是否必须*",
...@@ -421,13 +372,10 @@ export default { ...@@ -421,13 +372,10 @@ export default {
type: "select", type: "select",
align: "left", align: "left",
width: 100, width: 100,
selectArr: [ selectArr: [{ label: "是", value: 1 }, { label: "否", value: 0 }],
{ label: "是", value: 1 }, hasDefault: true
{ label: "否", value: 0 },
],
hasDefault: true,
}, },
{ label: "字段说明", prop: "descript", type: "input", align: "left" }, { label: "字段说明", prop: "descript", type: "input", align: "left" }
], ],
sjfwFhcstx: [ sjfwFhcstx: [
{ label: "字段编码", prop: "name", type: "", align: "left" }, { label: "字段编码", prop: "name", type: "", align: "left" },
...@@ -437,14 +385,34 @@ export default { ...@@ -437,14 +385,34 @@ export default {
label: "字段名称*", label: "字段名称*",
prop: "label", prop: "label",
type: "input", type: "input",
align: "left", align: "left"
}, },
{ label: "字段说明", prop: "descript", type: "input", align: "left" }, { label: "字段说明", prop: "descript", type: "input", align: "left" }
], ],
datasQqcs: [], datasQqcs: [],
datasFhcs: [], datasFhcs: [],
resSuccess: false, resSuccess: false,
resultShow: false, resultShow: false,
dataType: "",
body_fields: [],
param_fields: [],
request_fields: [],
response_fields: [],
dialog_process: false,
my_service_list: [],
service: "",
dialog_timeout: false,
durationOptions: [
{ value: 1, label: "分钟" },
{ value: 2, label: "小时" },
{ value: 3, label: "天" }
],
max_time_0: undefined,
max_time_1: undefined,
max_time_type_0: 1,
max_time_type_1: 1,
max_time_check_0: false,
max_time_check_1: false
}; };
}, },
mounted() { mounted() {
...@@ -479,7 +447,7 @@ export default { ...@@ -479,7 +447,7 @@ export default {
top, top,
right, right,
bottom, bottom,
left, left
} = this.$refs.flowContainer.getBoundingClientRect(); } = this.$refs.flowContainer.getBoundingClientRect();
// 判断鼠标是否进入 flow container // 判断鼠标是否进入 flow container
if ( if (
...@@ -511,10 +479,10 @@ export default { ...@@ -511,10 +479,10 @@ export default {
console.log(query); console.log(query);
this.$refs.superFlow.addNode({ this.$refs.superFlow.addNode({
coordinate, coordinate,
...query, ...query
}); });
if ( if (
this.nodeParamsList.findIndex((item) => { this.nodeParamsList.findIndex(item => {
return item.id == query.meta.id; return item.id == query.meta.id;
}) == -1 }) == -1
) { ) {
...@@ -524,21 +492,21 @@ export default { ...@@ -524,21 +492,21 @@ export default {
label: "开始", label: "开始",
name: "开始", name: "开始",
type: 1, type: 1,
id: query.meta.id, id: query.meta.id
}; };
} else if (conf.info.meta.type == 2) { } else if (conf.info.meta.type == 2) {
obj = { obj = {
label: "结束", label: "结束",
name: "结束", name: "结束",
type: 2, type: 2,
id: query.meta.id, id: query.meta.id
}; };
} else if (conf.info.meta.type == 3) { } else if (conf.info.meta.type == 3) {
obj = { obj = {
label: "普通节点", label: "普通节点",
name: "普通节点", name: "普通节点",
type: 3, type: 3,
id: query.meta.id, id: query.meta.id
}; };
} }
this.nodeParamsList.push(obj); this.nodeParamsList.push(obj);
...@@ -563,7 +531,7 @@ export default { ...@@ -563,7 +531,7 @@ export default {
clientY: clientY, clientY: clientY,
info, info,
ele, ele,
isDown: true, isDown: true
}); });
ele.style.position = "fixed"; ele.style.position = "fixed";
ele.style.margin = "0"; ele.style.margin = "0";
...@@ -578,14 +546,14 @@ export default { ...@@ -578,14 +546,14 @@ export default {
}, },
blurItem() { blurItem() {
this.nodeItem = { this.nodeItem = {
id: "", id: ""
}; };
console.log(this.nodeItem); console.log(this.nodeItem);
}, },
getData() { getData() {
return { return {
obj: this.$refs.superFlow.toJSON(), obj: this.$refs.superFlow.toJSON(),
params: this.nodeParamsList, params: this.nodeParamsList
}; };
}, },
handleChange() {}, handleChange() {},
...@@ -597,14 +565,14 @@ export default { ...@@ -597,14 +565,14 @@ export default {
} else { } else {
self.$message({ self.$message({
message: "开始和结束节点不可被编辑", message: "开始和结束节点不可被编辑",
type: "warning", type: "warning"
}); });
return false; return false;
} }
} else { } else {
self.$message({ self.$message({
message: "请选择节点", message: "请选择节点",
type: "warning", type: "warning"
}); });
return false; return false;
} }
...@@ -612,7 +580,7 @@ export default { ...@@ -612,7 +580,7 @@ export default {
showGeneralSettings() { showGeneralSettings() {
if (this.checkNodeCouldEdit()) { if (this.checkNodeCouldEdit()) {
let self = this; let self = this;
self.node_name = self.nodeParamsList.find((item) => { self.node_name = self.nodeParamsList.find(item => {
return item.id == self.nodeItem.id; return item.id == self.nodeItem.id;
}).name; }).name;
self.dialog_general = true; self.dialog_general = true;
...@@ -622,7 +590,7 @@ export default { ...@@ -622,7 +590,7 @@ export default {
this.dialog_interface = true; this.dialog_interface = true;
}, },
nodeParams(id) { nodeParams(id) {
let index = this.nodeParamsList.findIndex((item) => { let index = this.nodeParamsList.findIndex(item => {
return item.id == id; return item.id == id;
}); });
if (index != -1) { if (index != -1) {
...@@ -637,7 +605,7 @@ export default { ...@@ -637,7 +605,7 @@ export default {
generalSubmit() { generalSubmit() {
let self = this; let self = this;
if (self.nodeItem.type == 3) { if (self.nodeItem.type == 3) {
let index = self.nodeParamsList.findIndex((item) => { let index = self.nodeParamsList.findIndex(item => {
return item.id == self.nodeItem.id; return item.id == self.nodeItem.id;
}); });
if (index != -1) { if (index != -1) {
...@@ -645,7 +613,7 @@ export default { ...@@ -645,7 +613,7 @@ export default {
} else { } else {
self.$message({ self.$message({
message: "修改失败", message: "修改失败",
type: "error", type: "error"
}); });
} }
} }
...@@ -716,9 +684,9 @@ export default { ...@@ -716,9 +684,9 @@ export default {
body: bodys, body: bodys,
content_type: contentType, content_type: contentType,
data_service_type1: 5, data_service_type1: 5,
data_service_type2: 12, data_service_type2: 12
}; };
this.$api.workbench.fwzcFwcs(query).then((response) => { this.$api.workbench.fwzcFwcs(query).then(response => {
if (response.data.success == 1) { if (response.data.success == 1) {
let data = response.data.data; let data = response.data.data;
this.body_fields = data.body_fields; this.body_fields = data.body_fields;
...@@ -744,36 +712,78 @@ export default { ...@@ -744,36 +712,78 @@ export default {
this.dialog_interface = false; this.dialog_interface = false;
}, },
interfaceSubmit() { interfaceSubmit() {
let requestData = this.$refs.fwcs_sjfw_qqcs.getTableData(); if (this.resSuccess) {
let responseData = this.$refs.fwcs_sjfw_fhcs.getTableData(); let requestData = this.$refs.fwcs_sjfw_qqcs.getTableData();
this.requestRules = 0; let responseData = this.$refs.fwcs_sjfw_fhcs.getTableData();
this.responseRules = 0; this.requestRules = 0;
this.checkTable(requestData, 0); this.responseRules = 0;
this.checkTable(responseData, 1); this.checkTable(requestData, 0);
if (this.requestRules == 0 && this.responseRules == 0) { this.checkTable(responseData, 1);
this.request_fields = requestData; if (this.requestRules == 0 && this.responseRules == 0) {
this.response_fields = responseData; this.request_fields = requestData;
let self = this; this.response_fields = responseData;
let index = this.nodeParamsList.findIndex((item) => { let self = this;
return (item.id = self.nodeItem.id); let index = this.nodeParamsList.findIndex(item => {
}); return (item.id = self.nodeItem.id);
self.nodeParamsList[index].plugins.push({ });
plugin_type: 1, self.nodeParamsList[index].plugins.push({
url: self.serviceUrl, plugin_type: 1,
req_type: Number(self.select), url: self.serviceUrl,
auth_method: self.sqfsVal, req_type: Number(self.select),
auth_token: self.tokenVal, auth_method: self.sqfsVal,
query_fields: "this is response_fields value1", auth_token: self.tokenVal,
body_fields: "this is response_fields value1", query_fields:
response_fields: "this is response_fields value1", self.dataType == "body" ? self.request_fields : self.body_fields,
}); body_fields:
} else if (this.requestRules != 0) { self.dataType == "param"
this.$message.error("请完善请求参数信息中的字段名称"); ? self.request_fields
} else if (this.responseRules != 0) { : self.param_fields,
this.$message.error("请完善返回参数信息中的字段名称"); response_fields: self.response_fields
});
console.log(self.nodeParamsList);
self.dialog_interface = false;
} else if (this.requestRules != 0) {
this.$message.error("请完善请求参数信息中的字段名称");
} else if (this.responseRules != 0) {
this.$message.error("请完善返回参数信息中的字段名称");
}
} else {
this.$message.error("请保证接口有效");
} }
}, },
}, checkTable(arr, rule) {
let self = this;
for (let i = 0; i < arr.length; i++) {
if (arr[i].name && arr[i].name != "") {
if (!arr[i].label || arr[i].label == "") {
if (rule == 0) {
this.requestRules = 1;
} else if (rule == 1) {
this.responseRules = 1;
}
return false;
}
}
if (arr[i].children && arr[i].children.length != 0) {
self.checkTable(arr[i].children, rule);
}
}
},
showProcessService() {
this.dialog_process = true;
},
processCancel() {
this.dialog_process = false;
},
processSubmit() {},
showTimeoutManagement() {
this.dialog_timeout = true;
},
timeoutCancel() {
this.dialog_timeout = false;
},
timeoutSubmit() {}
}
}; };
</script> </script>
...@@ -1034,6 +1044,71 @@ export default { ...@@ -1034,6 +1044,71 @@ export default {
margin: 30px 15px 10px; margin: 30px 15px 10px;
font-size: 14px; font-size: 14px;
} }
.skcs_jg {
height: 100px;
display: flex;
align-items: center;
justify-content: center;
color: #0f2683;
font-size: 20px;
.skcs_jg_img {
position: relative;
top: 3px;
}
}
}
}
.process_service {
font-size: 14px;
text-align: left;
.process_msg {
font-size: 12px;
color: #58617a;
width: 430px;
margin: 0 auto;
padding: 10px 0;
background-color: #f4f7fc;
border-radius: 8px;
text-align: center;
}
.process_title {
margin: 20px 0 10px;
padding-left: 10px;
}
.process_val {
margin-bottom: 30px;
padding-left: 10px;
}
.process_input {
margin-bottom: 50px;
}
}
.timeout_service {
font-size: 14px;
text-align: left;
.timeout_msg {
font-size: 12px;
color: #58617a;
width: 430px;
margin: 0 auto;
padding: 10px 0;
background-color: #f4f7fc;
border-radius: 8px;
text-align: center;
}
.timeout_title {
margin: 20px 0 10px;
padding-left: 10px;
}
.timeout_val {
margin-bottom: 30px;
padding-left: 10px;
}
.timeout_input {
margin-bottom: 20px;
}
.margin_high {
margin-bottom: 50px;
} }
} }
.dia_footer { .dia_footer {
...@@ -1139,4 +1214,51 @@ export default { ...@@ -1139,4 +1214,51 @@ export default {
.interface_plugin .el-tabs__header .el-tabs__item:hover { .interface_plugin .el-tabs__header .el-tabs__item:hover {
color: #e56600; color: #e56600;
} }
.timeout_input {
.timeout_row {
display: flex;
.timeout_input_group {
width: 300px;
display: flex;
.input_left {
display: inline-block;
width: 90px;
height: 40px;
padding: 0 0 0 15px;
background-color: #edeef4;
border: 1px #e3e5ef solid;
color: #8890a7;
border-radius: 8px 0 0 8px;
line-height: 40px;
font-size: 14px;
}
.el-input-number {
flex: 1;
.el-input__inner {
border-radius: 0;
color: #242c43;
}
}
.input_right_select.el-select {
width: 80px;
}
.input_right_select.el-select .el-input {
width: 80px;
background-color: #0f2683;
color: #ffffff;
border-radius: 0 8px 8px 0;
}
.input_right_select .el-input .el-input__inner {
background-color: #0f2683;
color: #ffffff;
border: none;
}
}
.timeout_check {
margin-left: 20px;
line-height: 40px;
font-size: 16px;
}
}
}
</style> </style>
\ No newline at end of file
src/components/work-flow/workflows-view.vue
View file @ 7d09c890
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
<el-tooltip v-else effect="dark" placement="right-start"> <el-tooltip v-else effect="dark" placement="right-start">
<div class="node-detail" slot="content"> <div class="node-detail" slot="content">
<p>当前实例数：{{ meta.running_nodes || 0 }}</p> <p>当前实例数：{{ meta.running_nodes || 0 }}</p>
<p>当前超时比率：{{ (meta.cur_timeout_rate || 0) / 100 }}%</p> <p>当前超时比率：{{ (meta.cur_timeout_rate || 0) * 100 }}%</p>
<p>总超时比率：{{ (meta.total_timeout_rate || 0) / 100 }}%</p> <p>总超时比率：{{ (meta.total_timeout_rate || 0) * 100 }}%</p>
<p>节点平均耗时：{{ meta.avg_elapsed_time || 0 }}分钟</p> <p>节点平均耗时：{{ meta.avg_elapsed_time || 0 }}分钟</p>
<p>节点最大耗时：{{ meta.max_elapsed_time || 0 }}分钟</p> <p>节点最大耗时：{{ meta.max_elapsed_time || 0 }}分钟</p>
<p>节点插件：</p> <p>节点插件：</p>
...@@ -57,7 +57,7 @@ export default { ...@@ -57,7 +57,7 @@ export default {
required: true, required: true,
}, },
hideDetail: { hideDetail: {
type: Number, type: Boolean,
default: false, default: false,
}, },
}, },
......
src/pages/workbench/component-center/process-management/designer/index.vue
View file @ 7d09c890
...@@ -280,9 +280,9 @@ export default { ...@@ -280,9 +280,9 @@ export default {
}, },
]; ];
}, },
refresh() { refreshPage() {
this.init(this.tempFilter); this.init(this.tempFilter);
}, // 刷新当前页列表 },
showDialog() { showDialog() {
this.$refs.dialog.show(); this.$refs.dialog.show();
}, },
...@@ -295,13 +295,13 @@ export default { ...@@ -295,13 +295,13 @@ export default {
}, },
addNewProcess() { addNewProcess() {
this.$router.push("/progress/designer/design"); this.$router.push("/progress/designer/design");
}, // FIXME: 新建流程 },
editItem(item) { editItem(item) {
this.$router.push("/progress/designer/design"); this.$router.push(`/progress/designer/design_edit/${item.workflows_id}`);
}, // FIXME: 编辑流程 },
detailItem(item) { detailItem(item) {
this.$router.push(`/progress/designer/detail/${item.workflows_id}`); this.$router.push(`/progress/designer/detail/${item.workflows_id}`);
}, // TODO: 查看详情 },
publishItem(item) { publishItem(item) {
this.dialogInfo.title = "提示"; this.dialogInfo.title = "提示";
this.dialogInfo.msg = `发布后流程后，流程将部署到工作区域并上架到服务超市，是否发布该流程？`; this.dialogInfo.msg = `发布后流程后，流程将部署到工作区域并上架到服务超市，是否发布该流程？`;
...@@ -348,7 +348,7 @@ export default { ...@@ -348,7 +348,7 @@ export default {
newName: "", newName: "",
}; };
this.copyProcessShow(); this.copyProcessShow();
}, // TODO: 复制流程 }, // 复制流程
cancelCopyProcess() { cancelCopyProcess() {
this.copyProcessHide(); this.copyProcessHide();
}, // 复制流程-取消 }, // 复制流程-取消
...@@ -368,10 +368,27 @@ export default { ...@@ -368,10 +368,27 @@ export default {
this.dialogInfo.cancelText = "取消"; this.dialogInfo.cancelText = "取消";
this.dialogInfo.sunbmitText = "确定"; this.dialogInfo.sunbmitText = "确定";
this.dialogInfo.submit = () => { this.dialogInfo.submit = () => {
console.log(`删除${item.name}`); this.$http
.delete("/apaas/serviceapp/v3/workflows/del", {
params: {
id: item.workflows_id,
},
})
.then(({ data }) => {
if (data.success === 1) {
this.$message.success(data.errMsg || "删除成功");
this.refreshPage();
} else {
this.$message.error(data.errMsg || "删除失败");
}
})
.catch((error) => {
console.log(error);
this.$message.error("删除失败");
});
}; };
this.showDialog(); this.showDialog();
}, // TODO: 删除流程 },
}, },
created() { created() {
this.initFilter(); this.initFilter();
......
src/pages/workbench/component-center/process-management/process-design/index.vue
View file @ 7d09c890
...@@ -7,44 +7,23 @@ ...@@ -7,44 +7,23 @@
<el-breadcrumb-item>{{ $t("lang.new") }}</el-breadcrumb-item> <el-breadcrumb-item>{{ $t("lang.new") }}</el-breadcrumb-item>
</el-breadcrumb> </el-breadcrumb>
<BlockRadius class="block_item"> <BlockRadius class="block_item">
<steps <steps :active-step="step" :done="done" :show-done="true" done-title="保存成功" done-sub-title="可返回流程管理列表查看该流程，并进行流程的部署和发布。" class="apaas_steps">
:active-step="step" <step title="基本信息" :step="0" :active-icon="require('@/assets/imgs/progress_ic_xinxitx.png')" class="apaas_step">
:done="done"
:show-done="true"
done-title="保存成功"
done-sub-title="可返回流程管理列表查看该流程，并进行流程的部署和发布。"
class="apaas_steps"
>
<step
title="基本信息"
:step="0"
:active-icon="require('@/assets/imgs/progress_ic_xinxitx.png')"
class="apaas_step"
>
<div class="step_in"> <div class="step_in">
<el-form :model="basic_form" :rules="rules" ref="basicInformation" class="form_left"> <el-form :model="basic_form" :rules="rules" ref="basicInformation" class="form_left">
<el-form-item> <el-form-item prop="name">
<p class="formname">流程名称：</p> <p class="formname">流程名称：</p>
<el-input v-model="basic_form.name" placeholder="请输入流程名称"></el-input> <el-input v-model="basic_form.name" placeholder="请输入流程名称"></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="preson"> <el-form-item prop="workplace">
<p class="formname">工作区域：</p> <p class="formname">工作区域：</p>
<el-select <el-select v-model="basic_form.workplace" @change="changeWorkPlace" placeholder="请选择工作区域">
v-model="basic_form.workplace"
@change="changeWorkPlace"
placeholder="请选择工作区域"
>
<el-option v-for="item in workplace_list" :label="item" :value="item" :key="item"></el-option> <el-option v-for="item in workplace_list" :label="item" :value="item" :key="item"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="phone"> <el-form-item prop="desc">
<p class="formname">流程描述：</p> <p class="formname">流程描述：</p>
<el-input <el-input type="textarea" :autosize="{ minRows: 6, maxRows: 10}" v-model="basic_form.desc" placeholder="请输入流程描述"></el-input>
type="textarea"
:autosize="{ minRows: 6, maxRows: 10}"
v-model="basic_form.desc"
placeholder="请输入流程描述"
></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="btn_footer"> <div class="btn_footer">
...@@ -53,12 +32,7 @@ ...@@ -53,12 +32,7 @@
</div> </div>
</div> </div>
</step> </step>
<step <step title="流程设计" :step="1" :active-icon="require('@/assets/imgs/progress_ic_liucheng.png')" class="apaas_step">
title="流程设计"
:step="1"
:active-icon="require('@/assets/imgs/progress_ic_liucheng.png')"
class="apaas_step"
>
<div class="step_in"> <div class="step_in">
<WorkFlow ref="workFlow" class="work_flow" /> <WorkFlow ref="workFlow" class="work_flow" />
<div class="btn_footer"> <div class="btn_footer">
...@@ -70,13 +44,7 @@ ...@@ -70,13 +44,7 @@
</div> </div>
</div> </div>
</step> </step>
<step <step title step-title="完成" :step="2" :active-icon="require('@/assets/imgs/progress_ic_wancheng.png')" class="apaas_step"></step>
title
step-title="完成"
:step="2"
:active-icon="require('@/assets/imgs/progress_ic_wancheng.png')"
class="apaas_step"
></step>
<template slot="action"> <template slot="action">
<el-button type="primary" @click="backToList">返回列表</el-button> <el-button type="primary" @click="backToList">返回列表</el-button>
...@@ -97,7 +65,7 @@ export default { ...@@ -97,7 +65,7 @@ export default {
WorkFlow, WorkFlow,
BlockRadius, BlockRadius,
Steps, Steps,
Step, Step
}, },
data: () => { data: () => {
return { return {
...@@ -106,29 +74,29 @@ export default { ...@@ -106,29 +74,29 @@ export default {
basic_form: { basic_form: {
name: "", name: "",
workplace: "", workplace: "",
desc: "", desc: ""
}, },
rules: { rules: {
name: [ name: [
{ required: true, message: "请输入流程名称", trigger: "blur" }, { required: true, message: "请输入流程名称", trigger: "blur" },
{ max: 16, message: "不能超过16个字符", trigger: "blur" }, { max: 16, message: "不能超过16个字符", trigger: "blur" }
], ],
workplace: [ workplace: [
{ required: true, message: "请选择工作区域", trigger: "blur" }, { required: true, message: "请选择工作区域", trigger: "blur" }
], ],
desc: [ desc: [
{ required: true, message: "请输入流程描述", trigger: "blur" }, { required: true, message: "请输入流程描述", trigger: "blur" },
{ max: 400, message: "不能超过400个字符", trigger: "blur" }, { max: 400, message: "不能超过400个字符", trigger: "blur" }
], ]
}, },
workplace_list: [], workplace_list: []
}; };
}, },
methods: { methods: {
verification() { verification() {
let self = this; let self = this;
let data = JSON.parse(JSON.stringify(self.$refs.workFlow.getData())); let data = JSON.parse(JSON.stringify(self.$refs.workFlow.getData()));
console.log(JSON.stringify(data)) console.log(JSON.stringify(data));
let start_num = 0; let start_num = 0;
let end_num = 0; let end_num = 0;
let start_id = ""; let start_id = "";
...@@ -139,8 +107,8 @@ export default { ...@@ -139,8 +107,8 @@ export default {
let out_edge = 0; let out_edge = 0;
let datas = { ...data.obj }; let datas = { ...data.obj };
console.log(data); console.log(data);
datas.nodeList.forEach((item) => { datas.nodeList.forEach(item => {
let da = data.params.find((nodep) => { let da = data.params.find(nodep => {
return nodep.id == item.meta.id; return nodep.id == item.meta.id;
}); });
item.meta = da; item.meta = da;
...@@ -153,14 +121,14 @@ export default { ...@@ -153,14 +121,14 @@ export default {
end_id = item.id; end_id = item.id;
} }
if ( if (
datas.linkList.findIndex((el) => { datas.linkList.findIndex(el => {
return el.startId == item.id; return el.startId == item.id;
}) == -1 && }) == -1 &&
item.id != end_id item.id != end_id
) { ) {
in_edge++; in_edge++;
} else if ( } else if (
datas.linkList.findIndex((el) => { datas.linkList.findIndex(el => {
return el.endId == item.id; return el.endId == item.id;
}) == -1 && }) == -1 &&
item.id != start_id item.id != start_id
...@@ -168,7 +136,7 @@ export default { ...@@ -168,7 +136,7 @@ export default {
out_edge++; out_edge++;
} }
}); });
datas.linkList.forEach((item) => { datas.linkList.forEach(item => {
if (start_id == item.endId) { if (start_id == item.endId) {
start_before++; start_before++;
} }
...@@ -179,22 +147,22 @@ export default { ...@@ -179,22 +147,22 @@ export default {
if (start_num != 1 || end_num != 1) { if (start_num != 1 || end_num != 1) {
this.$message({ this.$message({
message: "开始节点与结束节点均应有且只有一个", message: "开始节点与结束节点均应有且只有一个",
type: "warning", type: "warning"
}); });
} else if (start_before != 0) { } else if (start_before != 0) {
this.$message({ this.$message({
message: "开始节点前面不应连接其它节点", message: "开始节点前面不应连接其它节点",
type: "warning", type: "warning"
}); });
} else if (end_after != 0) { } else if (end_after != 0) {
this.$message({ this.$message({
message: "结束节点后面不应连接其它节点", message: "结束节点后面不应连接其它节点",
type: "warning", type: "warning"
}); });
} else if (in_edge != 0 || out_edge != 0) { } else if (in_edge != 0 || out_edge != 0) {
this.$message({ this.$message({
message: "请保证每个节点都被连接", message: "请保证每个节点都被连接",
type: "warning", type: "warning"
}); });
} }
console.log(datas); console.log(datas);
...@@ -207,15 +175,21 @@ export default { ...@@ -207,15 +175,21 @@ export default {
this.$router.go(-1); this.$router.go(-1);
}, },
next() { next() {
this.step++; this.$refs["basicInformation"].validate(valid => {
if (valid) {
console.log("sss")
this.step++;
} else {
}
});
}, },
back() { back() {
this.step--; this.step--;
}, },
complete() { complete() {
this.verification(); this.verification();
}, }
}, }
}; };
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment