Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zeroing-editor
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
劳工
zeroing-editor
Commits
e7ec6f42
Commit
e7ec6f42
authored
Apr 14, 2020
by
任建锋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
--
parent
ef3ff29e
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
53 additions
and
3 deletions
+53
-3
config.js
src/config.js
+2
-2
zh-CN.json
src/locales/zh-CN.json
+10
-0
PublishView.vue
src/views/Editor/dialogs/PublishView.vue
+22
-1
PxSkinEditor.vue
src/views/Editor/dialogs/PxSkinEditor.vue
+11
-0
PxSkinEditorDialog.vue
src/views/Editor/dialogs/PxSkinEditorDialog.vue
+8
-0
No files found.
src/config.js
View file @
e7ec6f42
...
@@ -6,10 +6,10 @@ export let API_HOST;
...
@@ -6,10 +6,10 @@ export let API_HOST;
if
(
process
.
env
.
NODE_ENV
===
'development'
)
{
if
(
process
.
env
.
NODE_ENV
===
'development'
)
{
//API_HOST = '//10.10.95.74:7777';
//API_HOST = '//10.10.95.74:7777';
//API_HOST = '//192.168.1.16:7777';
//API_HOST = '//192.168.1.16:7777';
API_HOST
=
'//10.10.93.88:7777'
;
//
API_HOST = '//10.10.93.88:7777';
//API_HOST = '//192.168.0.105:7777';
//API_HOST = '//192.168.0.105:7777';
//API_HOST = '//localhost:3002';
//API_HOST = '//localhost:3002';
//
API_HOST = window.__data.apiHost;
API_HOST
=
window
.
__data
.
apiHost
;
//API_HOST = '';
//API_HOST = '';
}
else
{
}
else
{
API_HOST
=
window
.
__data
.
apiHost
;
API_HOST
=
window
.
__data
.
apiHost
;
...
...
src/locales/zh-CN.json
View file @
e7ec6f42
...
@@ -194,6 +194,7 @@
...
@@ -194,6 +194,7 @@
"Dependencies missing"
:
"依赖缺失"
,
"Dependencies missing"
:
"依赖缺失"
,
"missingDependenciesNotice"
:
"<i class=
\"
el-icon-warning
\"
></i>依赖缺失,请到【<span style=
\"
font-weight: bold,
\"
>详情>包管理</span>】进行安装"
,
"missingDependenciesNotice"
:
"<i class=
\"
el-icon-warning
\"
></i>依赖缺失,请到【<span style=
\"
font-weight: bold,
\"
>详情>包管理</span>】进行安装"
,
"Pack manager"
:
"打包管理"
,
"Pack manager"
:
"打包管理"
,
"Select QA"
:
"选择QA人员"
,
"Publish"
:
"发布"
,
"Publish"
:
"发布"
,
"Publish config"
:
"发布配置"
,
"Publish config"
:
"发布配置"
,
"Publish to projectx"
:
"发布到星速台"
,
"Publish to projectx"
:
"发布到星速台"
,
...
@@ -325,6 +326,15 @@
...
@@ -325,6 +326,15 @@
"test"
:
"测试环境"
,
"test"
:
"测试环境"
,
"prod"
:
"线上环境"
"prod"
:
"线上环境"
},
},
"QAList"
:[
"崔立强"
,
"李培培"
,
"劳奇峰"
,
"任建锋"
,
"张婷婷"
,
"王炽"
,
"王鸿源"
],
"tplOperates"
:
[
"tplOperates"
:
[
"新增"
,
"新增"
,
"修改"
,
"修改"
,
...
...
src/views/Editor/dialogs/PublishView.vue
View file @
e7ec6f42
...
@@ -3,6 +3,7 @@
...
@@ -3,6 +3,7 @@
<span
class=
"px-project-name"
>
<span
class=
"px-project-name"
>
{{
pxProjectName
}}
{{
pxProjectName
}}
</span>
</span>
<div
class=
"operate-bar"
>
<div
class=
"operate-bar"
>
<el-select
size=
"small"
v-model=
"env"
placeholder=
"请选择环境"
@
change=
"changeEnv"
>
<el-select
size=
"small"
v-model=
"env"
placeholder=
"请选择环境"
@
change=
"changeEnv"
>
<el-option
v-for=
"(item, key) in pxEnvs"
:key=
"key"
:label=
"item"
:value=
"key"
></el-option>
<el-option
v-for=
"(item, key) in pxEnvs"
:key=
"key"
:label=
"item"
:value=
"key"
></el-option>
...
@@ -36,6 +37,17 @@
...
@@ -36,6 +37,17 @@
</el-popconfirm>
</el-popconfirm>
<el-button
v-if=
"skinId && operate!==0"
size=
"small"
@
click=
"getUrl"
>
获取链接
</el-button>
<el-button
v-if=
"skinId && operate!==0"
size=
"small"
@
click=
"getUrl"
>
获取链接
</el-button>
</div>
</div>
<div
class=
"operate-bar"
v-if=
"env==='prod'"
>
<!--
<label
class=
"el-form-item__label"
style=
"width: 140px;"
>
请选择QA人员
</label>
-->
<div
class=
"el-form-item el-form-item--mini"
style=
"padding:10px 0 10px 0"
>
<label
class=
"el-form-item__label"
style=
"width: 60px;text-align: left;padding-right:0px"
>
QA人员:
</label>
<div
class=
"el-form-item__content"
style=
"margin-left: 60px;"
>
<el-select
size=
"small"
v-model=
"qa"
placeholder=
"请选择QA人员"
@
change=
"changeQA"
>
<el-option
v-for=
"item in QAList"
:key=
"item"
:label=
"item"
:value=
"item"
></el-option>
</el-select>
</div>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
...
@@ -58,6 +70,7 @@
...
@@ -58,6 +70,7 @@
},
},
data
()
{
data
()
{
return
{
return
{
QAList
:
this
.
$t
(
"QAList"
),
pxEnvs
:
this
.
$t
(
"pxEnvs"
),
pxEnvs
:
this
.
$t
(
"pxEnvs"
),
tplOperates
:
this
.
$t
(
"tplOperates"
),
tplOperates
:
this
.
$t
(
"tplOperates"
),
tplTypes
:
this
.
$t
(
"tplTypes"
),
tplTypes
:
this
.
$t
(
"tplTypes"
),
...
@@ -70,7 +83,8 @@
...
@@ -70,7 +83,8 @@
pxProjectName
:
""
,
pxProjectName
:
""
,
skins
:
[],
skins
:
[],
pxPid
:
""
,
pxPid
:
""
,
name
:
""
name
:
""
,
qa
:
this
.
$t
(
"QAList"
)[
0
]
};
};
},
},
computed
:
{
computed
:
{
...
@@ -88,6 +102,10 @@
...
@@ -88,6 +102,10 @@
this
.
skinId
=
""
;
this
.
skinId
=
""
;
this
.
getSkinsList
();
this
.
getSkinsList
();
},
},
async
changeQA
(
e
)
{
//this.skinId = "";
//this.getSkinsList();
},
async
getSkinsList
()
{
async
getSkinsList
()
{
const
{
env
}
=
this
;
const
{
env
}
=
this
;
...
@@ -176,6 +194,9 @@
...
@@ -176,6 +194,9 @@
name
,
name
,
env
:
env
env
:
env
};
};
this
.
$refs
.
SelectQADialog
.
show
();
return
;
const
{
ret
}
=
await
saveSkins
(
data
);
const
{
ret
}
=
await
saveSkins
(
data
);
if
(
ret
.
success
!==
false
)
{
if
(
ret
.
success
!==
false
)
{
this
.
$message
({
this
.
$message
({
...
...
src/views/Editor/dialogs/PxSkinEditor.vue
View file @
e7ec6f42
...
@@ -26,7 +26,16 @@
...
@@ -26,7 +26,16 @@
<div
slot=
"footer"
class=
"dialog-footer"
>
<div
slot=
"footer"
class=
"dialog-footer"
>
<div>
<div>
</div>
</div>
<div>
<div>
<!--
<div
class=
"el-form-item el-form-item--mini"
style=
"padding:10px 0 10px 0"
>
<label
class=
"el-form-item__label"
style=
"width: 60px;text-align: left;padding-right:0px"
>
QA人员:
</label>
<div
class=
"el-form-item__content"
style=
"margin-left: 60px;"
>
<el-select
size=
"small"
v-model=
"qa"
placeholder=
"请选择QA人员"
@
change=
"changeQA"
>
<el-option
v-for=
"item in QAList"
:key=
"item"
:label=
"item"
:value=
"item"
></el-option>
</el-select>
</div>
</div>
-->
<el-button
size=
"mini"
@
click=
"clickClose"
>
{{
$t
(
"Close"
)
}}
</el-button>
<el-button
size=
"mini"
@
click=
"clickClose"
>
{{
$t
(
"Close"
)
}}
</el-button>
<el-popconfirm
v-if=
"skin"
class=
"save-button"
@
onConfirm=
"clickSave"
placement=
"top"
<el-popconfirm
v-if=
"skin"
class=
"save-button"
@
onConfirm=
"clickSave"
placement=
"top"
:title=
"$t('Click save will overwrite and apply immediately',
{name: this.pxProjectName, skin: skin.name})">
:title=
"$t('Click save will overwrite and apply immediately',
{name: this.pxProjectName, skin: skin.name})">
...
@@ -49,6 +58,8 @@
...
@@ -49,6 +58,8 @@
data
()
{
data
()
{
return
{
return
{
visible
:
false
,
visible
:
false
,
// QAList:this.$t("QAList"),
// qa:this.$t("QAList")[0],
pxProjectName
:
''
,
pxProjectName
:
''
,
skin
:
null
,
skin
:
null
,
operate
:
0
,
operate
:
0
,
...
...
src/views/Editor/dialogs/PxSkinEditorDialog.vue
View file @
e7ec6f42
...
@@ -12,6 +12,12 @@
...
@@ -12,6 +12,12 @@
<el-option
v-for=
"(item, key) in pxEnvs"
:key=
"key"
:label=
"item"
:value=
"key"
></el-option>
<el-option
v-for=
"(item, key) in pxEnvs"
:key=
"key"
:label=
"item"
:value=
"key"
></el-option>
</el-select>
</el-select>
<span
class=
"px-project-name"
>
{{
pxProjectName
}}
</span>
<span
class=
"px-project-name"
>
{{
pxProjectName
}}
</span>
<span
v-if=
"env==='prod'"
>
<span
style=
"padding-left:10px;"
>
QA人员:
</span>
<el-select
class=
"env-select"
size=
"mini"
v-model=
"qa"
placeholder=
"请选择QA人员"
@
change=
"changeQA"
>
<el-option
v-for=
"item in QAList"
:key=
"item"
:label=
"item"
:value=
"item"
></el-option>
</el-select>
</span>
</div>
</div>
<el-table
class=
"mock-table"
:data=
"skins"
height=
"100%"
stripe
size=
"mini"
>
<el-table
class=
"mock-table"
:data=
"skins"
height=
"100%"
stripe
size=
"mini"
>
<el-table-column
<el-table-column
...
@@ -99,6 +105,8 @@
...
@@ -99,6 +105,8 @@
pxProjectName
:
''
,
pxProjectName
:
''
,
skins
:
[],
skins
:
[],
env
:
'dev'
,
env
:
'dev'
,
QAList
:
this
.
$t
(
"QAList"
),
qa
:
this
.
$t
(
"QAList"
)[
0
],
}
}
},
},
computed
:
{
computed
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment