Merge remote-tracking branch 'origin/master'

This commit is contained in:
zhn
2022-05-27 16:32:12 +08:00
@@ -4,18 +4,17 @@
<a-form-model <a-form-model
class='tag-module' class='tag-module'
ref='ruleForm' ref='ruleForm'
:model='form' :model='formData'
:rules='rules' :rules='rules'
:label-col='labelCol' :label-col='labelCol'
:wrapper-col='wrapperCol' :wrapper-col='wrapperCol'
> >
<a-row :gutter='24'> <a-row :gutter='24'>
<a-col :span='9'> <a-col :span='9'>
<span class="Required">*</span> <a-form-model-item :label="$t('title')" prop='templatetitle'>
<a-form-model-item :label="$t('title')" prop='templatetitle' :rules='rules'>
<a-input style='width: 420px' <a-input style='width: 420px'
:placeholder="$t('PleaseEnter')+$t('title')" :placeholder="$t('PleaseEnter')+$t('title')"
v-model='form.templatetitle' /> v-model='formData.templatetitle' />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span='9'> <a-col :span='9'>
@@ -121,6 +120,7 @@ export default {
sm: { span: 14 } sm: { span: 14 }
}, },
form: {}, form: {},
formData: {},
rules: { rules: {
templatetitle: [ templatetitle: [
{ required: true, message: this.$t('enterTitle'), trigger: 'blur' } { required: true, message: this.$t('enterTitle'), trigger: 'blur' }
@@ -226,11 +226,11 @@ export default {
this.spinLoading = true this.spinLoading = true
// 新增編輯之前 判断 标题唯一 // 新增編輯之前 判断 标题唯一
getAction(`params/manifest/verifyTitle?projectId=${this.$route.query.id} getAction(`params/manifest/verifyTitle?projectId=${this.$route.query.id}
&title=${this.templatetitle}`, {}) &title=${this.formData.templatetitle}`, {})
.then(res => { .then(res => {
if (res.success) { if (res.success) {
let postDate = { let postDate = {
title: this.templatetitle, title: this.formData.templatetitle,
paramsTemplateId: this.rowId || this.selectedRowKeysDate[0].id, paramsTemplateId: this.rowId || this.selectedRowKeysDate[0].id,
paramsTemplatePublishVersion: this.version || this.selectedRowKeysDate[0].version, paramsTemplatePublishVersion: this.version || this.selectedRowKeysDate[0].version,
projectId: this.projectId projectId: this.projectId
@@ -360,7 +360,7 @@ export default {
} }
.Required { .Required {
color: red; color: red;
margin-left: 20px; margin-right: 4px;
} }
</style> </style>
<style lang='less'> <style lang='less'>