Skip to content

Commit 6be3287

Browse files
author
张晨曦
committed
调整第三方接入的接口
1 parent dee433a commit 6be3287

File tree

11 files changed

+471
-120
lines changed

11 files changed

+471
-120
lines changed

‎web/src/apps/workspace/module/managementPlatform/component/accessComponent/index.vue

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,40 +73,48 @@ export default {
7373
<style lang="scss" scoped>
7474
@import "@/common/style/variables.scss";
7575
.access-component-headers {
76-
padding: 0px $padding-25;
76+
padding: 0px 10px;
7777
border-bottom: $border-width-base $border-style-base $border-color-base;
7878
@include border-color($border-color-base, $dark-border-color-base);
79-
margin-top: 12px;
8079
flex: none;
8180
display: flex;
8281
align-items: center;
83-
font-size: $font-size-large;
84-
.active {
85-
border-bottom: 2px solid $primary-color;
86-
}
8782
&-container {
8883
flex: 1;
84+
display: flex;
85+
align-items: center;
8986
height: 40px;
9087
overflow-x: auto;
9188
overflow-y: hidden;
9289
}
9390
}
9491
.tab-item {
9592
display: inline-block;
96-
height: 40px;
97-
line-height: 40px;
98-
@include font-color($title-color, $dark-text-color);
93+
height: 24px;
94+
line-height: 24px;
95+
// color: $title-color;
96+
@include font-color($workspace-title-color, $dark-workspace-title-color);
9997
cursor: pointer;
100-
min-width: 100px;
98+
min-width: 90px;
10199
max-width: 200px;
100+
padding: 0 10px;
102101
overflow: hidden;
103-
margin-right: 2px;
102+
margin-right: 8px;
103+
@include bg-color( #E1E5EA, $dark-workspace-body-bg-color);
104+
border-radius: 12px;
104105
&.active {
105-
height: 40px;
106-
color: $primary-color;
107-
border-radius: 4px 4px 0 0;
108-
border-bottom: 2px solid $primary-color;
109-
line-height: 38px;
106+
height: 24px;
107+
@include font-color($primary-color, $dark-primary-color);
108+
line-height: 24px;
109+
@include bg-color(#E8EEF4, $dark-workspace-body-bg-color);
110+
border-radius: 12px;
111+
}
112+
&:hover {
113+
height: 24px;
114+
@include font-color($primary-color, $dark-primary-color);
115+
line-height: 24px;
116+
border-radius: 12px;
117+
@include bg-color(#D1D7DD, $dark-workspace-body-bg-color);
110118
}
111119
}
112120
</style>

‎web/src/apps/workspace/module/managementPlatform/component/accessComponent/tab-item.vue

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
:rules="ruleValidate"
88
ref="formValidate"
99
>
10-
<FormItem prop="onestop_menu_id">
10+
<FormItem prop="onestopMenuId">
1111
<span class="form-item-label">接入类别</span>
12-
<Select v-model="formItem.onestop_menu_id">
12+
<Select v-model="formItem.onestopMenuId">
1313
<Option
1414
v-for="item in menuOptions"
1515
:value="item.value"
@@ -18,51 +18,51 @@
1818
>
1919
</Select>
2020
</FormItem>
21-
<FormItem prop="title_cn">
21+
<FormItem prop="titleCn">
2222
<span class="form-item-label">组件/应用名</span>
23-
<Input v-model="formItem.title_cn"></Input>
23+
<Input v-model="formItem.titleCn"></Input>
2424
</FormItem>
25-
<FormItem prop="title_en">
25+
<FormItem prop="titleEn">
2626
<span class="form-item-label">组件/应用名英文</span>
27-
<Input v-model="formItem.title_en"></Input>
27+
<Input v-model="formItem.titleEn"></Input>
2828
</FormItem>
2929
<FormItem prop="url">
3030
<span class="form-item-label">baseurl</span>
3131
<Input v-model="formItem.url"></Input>
3232
</FormItem>
33-
<FormItem prop="homepage_url">
33+
<FormItem prop="homepageUrl">
3434
<span class="form-item-label">首页</span>
35-
<Input v-model="formItem.homepage_url"></Input>
35+
<Input v-model="formItem.homepageUrl"></Input>
3636
</FormItem>
37-
<FormItem prop="project_url">
37+
<FormItem prop="projectUrl">
3838
<span class="form-item-label">项目页</span>
39-
<Input v-model="formItem.project_url"></Input>
39+
<Input v-model="formItem.projectUrl"></Input>
4040
</FormItem>
41-
<FormItem prop="redirect_url">
41+
<FormItem prop="redirectUrl">
4242
<span class="form-item-label">单点接口</span>
43-
<Input v-model="formItem.redirect_url"></Input>
43+
<Input v-model="formItem.redirectUrl"></Input>
4444
</FormItem>
45-
<FormItem prop="if_iframe">
45+
<FormItem prop="ifIframe">
4646
<span class="swith-label">iframe</span>
47-
<i-switch v-model="formItem.if_iframe" />
47+
<i-switch v-model="formItem.ifIframe" />
4848
</FormItem>
49-
<FormItem prop="is_active">
49+
<FormItem prop="isActive">
5050
<span class="swith-label">激活</span>
51-
<i-switch v-model="formItem.is_active" />
51+
<i-switch v-model="formItem.isActive" />
5252
</FormItem>
53-
<FormItem prop="desc_cn">
53+
<FormItem prop="descCn">
5454
<span class="form-item-label">描述</span>
5555
<Input
56-
v-model="formItem.desc_cn"
56+
v-model="formItem.descCn"
5757
type="textarea"
5858
:autosize="{ minRows: 6, maxRows: 10 }"
5959
placeholder="请输入描述"
6060
></Input>
6161
</FormItem>
62-
<FormItem prop="desc_en">
62+
<FormItem prop="descEn">
6363
<span class="form-item-label">英文描述</span>
6464
<Input
65-
v-model="formItem.desc_en"
65+
v-model="formItem.descEn"
6666
type="textarea"
6767
:autosize="{ minRows: 6, maxRows: 18 }"
6868
placeholder="请输入英文描述"
@@ -93,17 +93,17 @@
9393
<script>
9494
import { formatComponentData } from "../../util/fomat";
9595
const tempFormItem = {
96-
onestop_menu_id: 1,
97-
title_cn: "新增组件",
98-
title_en: "",
96+
onestopMenuId: 1,
97+
titleCn: "新增组件",
98+
titleEn: "",
9999
url: "",
100-
homepage_url: "",
101-
project_url: "",
102-
redirect_url: "",
103-
if_iframe: 1,
104-
is_active: 1,
105-
desc_cn: "",
106-
desc_en: ""
100+
homepageUrl: "",
101+
projectUrl: "",
102+
redirectUrl: "",
103+
ifIframe: 1,
104+
isActive: 1,
105+
descCn: "",
106+
descEn: ""
107107
// access_button_cn: 'not null',
108108
// access_button_en: 'not null',
109109
};
@@ -118,28 +118,28 @@ export default {
118118
return {
119119
formItem: formatComponentData(this.componentData),
120120
ruleValidate: {
121-
onestop_menu_id: [
121+
onestopMenuId: [
122122
{ required: true, message: "接入类别不能为空", trigger: "blur" }
123123
],
124-
title_cn: [
124+
titleCn: [
125125
{ required: true, message: "组件/应用名不能为空", trigger: "blur" }
126126
],
127-
title_en: [
127+
titleEn: [
128128
{
129129
required: true,
130130
message: "组件/应用名英文不能为空",
131131
trigger: "blur"
132132
}
133133
],
134134
url: [{ required: true, message: "baseurl不能为空", trigger: "blur" }],
135-
homepage_url: [
135+
homepageUrl: [
136136
{ required: true, message: "首页不能为空", trigger: "blur" }
137137
],
138-
project_url: [
138+
projectUrl: [
139139
{ required: true, message: "项目页不能为空", trigger: "blur" }
140140
],
141-
desc_cn: [{ required: true, message: "描述不能为空", trigger: "blur" }],
142-
desc_en: [
141+
descCn: [{ required: true, message: "描述不能为空", trigger: "blur" }],
142+
descEn: [
143143
{ required: true, message: "英文描述不能为空", trigger: "blur" }
144144
]
145145
},
@@ -176,8 +176,8 @@ export default {
176176
let _menuOptions = [];
177177
temp.forEach(item => {
178178
let o = Object.create(null);
179-
o.value = item.title_en;
180-
o.label = item.title_cn;
179+
o.value = item.titleEn;
180+
o.label = item.titleCn;
181181
_menuOptions.push(o);
182182
});
183183
this.menuOptions = _menuOptions;

‎web/src/apps/workspace/module/managementPlatform/component/accessComponent/tabs.vue

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
@mouseover="mouseover"
66
@mouseout="mouseout"
77
>
8-
<span :title="component.title_cn" class="tabs-title-text">{{
9-
component.title_cn
8+
<span :title="component.titleCn" class="tabs-title-text">{{
9+
component.titleCn
1010
}}</span>
1111
<span class="tabs-title-button">
1212
<Icon
1313
v-show="isHover"
1414
class="close-icon"
15-
size="18"
15+
size="12"
1616
type="md-close"
1717
@click.stop="remove"
1818
/>
@@ -55,10 +55,9 @@ export default {
5555
display: flex;
5656
align-items: center;
5757
justify-content: flex-start;
58-
padding: 0 16px;
59-
padding-right: 35px;
60-
font-size: $font-size-large;
61-
height: 38px;
58+
padding: 0 12px;
59+
font-size: 14px;
60+
height: 24px;
6261
.tabs-title-text {
6362
display: block;
6463
flex: 1;
@@ -68,7 +67,7 @@ export default {
6867
}
6968
.tabs-title-button {
7069
position: $absolute;
71-
right: 10px;
70+
right: -3px;
7271
top: 0;
7372
font-size: $font-size-large;
7473
margin-top: -1px;

‎web/src/apps/workspace/module/managementPlatform/index.vue

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
</template>
5959

6060
<script>
61-
import Tree from "./component/tree/tree.vue";
61+
import lubanTree from "@/components/lubanTree";
6262
import TabList from "./component/tabList/index.vue";
6363
import GuideMenu from "./component/guide/menu.vue";
6464
import {
@@ -125,23 +125,23 @@ const menu = [
125125
},
126126
];
127127
const tempComponent = {
128-
onestop_menu_id: 1,
129-
title_cn: "新增组件",
130-
title_en: "",
128+
onestopMenuId: 1,
129+
titleCn: "新增组件",
130+
titleEn: "",
131131
url: "",
132-
homepage_url: "",
133-
project_url: "",
134-
redirect_url: "",
135-
if_iframe: 1,
136-
is_active: 1,
137-
desc_cn: "",
138-
desc_en: "",
132+
homepageUrl: "",
133+
projectUrl: "",
134+
redirectUrl: "",
135+
ifIframe: 1,
136+
isActive: 1,
137+
descCn: "",
138+
descEn: "",
139139
// access_button_en: 'not null',
140140
// access_button_cn: '不能为空'
141141
};
142142
export default {
143143
components: {
144-
Tree,
144+
Tree: lubanTree.managementTree,
145145
"tab-list": TabList,
146146
"guide-menu": GuideMenu,
147147
},
@@ -228,15 +228,15 @@ export default {
228228
component_id = component_id + 1;
229229
this.component_id = component_id;
230230
componentData._id = component_id;
231-
componentData.onestop_menu_id = node.id;
231+
componentData.onestopMenuId = node.id;
232232
this.current = componentData;
233233
this.tabList.push(componentData);
234234
this.addedFlag = true;
235235
this.header = "组件接入";
236236
return this.$router.push({ name: "accessComponents" });
237237
} else {
238238
const component_data = this.tabList.filter((tab) => tab.isAdded)[0];
239-
component_data.onestop_menu_id = node.id;
239+
component_data.onestopMenuId = node.id;
240240
this.current = JSON.parse(JSON.stringify(component_data));
241241
this.header = "组件接入";
242242
}
@@ -283,7 +283,7 @@ export default {
283283
const currentTab = this.tabList.filter((item) => item._id === _id)[0];
284284
// tab 页为新增页
285285
if (currentTab.isAdded) {
286-
let idx = currentTab.onestop_menu_id;
286+
let idx = currentTab.onestopMenuId;
287287
if (typeof idx === "number") {
288288
this.currentTreeId = idx;
289289
} else {
@@ -300,6 +300,16 @@ export default {
300300
//更新
301301
if (componentItem.id) {
302302
const updateData = formatComponentDataForPost(componentItem);
303+
const required_keys = ['id', 'titleEn', 'titleCn', 'url', 'onestopMenuId', 'projectUrl',
304+
'homepageUrl', 'ifIframe', 'redirectUrl', 'descEn', 'descCn', 'labelsEn', 'labelsCn',
305+
'isActive', 'accessButtonEn', 'accessButtonCn'
306+
]
307+
for(let key in updateData ) {
308+
if( required_keys.indexOf(key) < 0) {
309+
delete updateData[key]
310+
}
311+
}
312+
console.log(updateData)
303313
UpdateDataFromId(componentItem.id, updateData)
304314
.then((data) => {
305315
_this.$Message.success("更新成功");
@@ -327,15 +337,16 @@ export default {
327337
GetMenu()
328338
.then((data) => {
329339
const _menuOptions = [];
330-
data.forEach((item) => {
340+
let dssOnestopMenuList = data.dssOnestopMenuList
341+
dssOnestopMenuList.forEach((item) => {
331342
item.type = "component";
332343
item.children = [];
333344
item.opened = true;
334345
335346
const menu = Object.create(null);
336347
menu.name = item.name;
337-
menu.title_cn = item.title_cn;
338-
menu.title_en = item.title_en;
348+
menu.titleCn = item.titleCn;
349+
menu.titleEn = item.titleEn;
339350
340351
_menuOptions.push(menu);
341352
});
@@ -345,7 +356,7 @@ export default {
345356
"menuOptions",
346357
JSON.stringify(that.menuOptions)
347358
);
348-
that.getAllComponentData(data, (nodes) => {
359+
that.getAllComponentData(dssOnestopMenuList, (nodes) => {
349360
if (nodes) {
350361
menu[2].nodes = nodes;
351362
that.menu = menu;
@@ -363,9 +374,10 @@ export default {
363374
let component_id = this.component_id;
364375
QueryAllData()
365376
.then((data) => {
366-
data.forEach((item) => {
377+
let dssOnestopMenuJoinApplicationList = data.dssOnestopMenuJoinApplicationList
378+
dssOnestopMenuJoinApplicationList.forEach((item) => {
367379
nodes.forEach((node) => {
368-
if (node.id === item.onestop_menu_id) {
380+
if (node.id === item.onestopMenuId) {
369381
item._id = component_id;
370382
node.children.push(item);
371383
component_id++;

0 commit comments

Comments
 (0)