Merge branch 'master' into 1.4.0

src/views/Editor/EditorHeader/index.vue

@@ -525,9 +525,24 @@ const setTemplate = async (type) =>{
     ||queryObj.value.ColorStr==''||queryObj.value.SeasonName=='')){
         datas.loading = false
         mainStore.setToolbarState(ToolbarStates.EL_TEMPLATEDATA)
-        return ElMessage({
+        if(queryObj.value.Title=='') return ElMessage({
+          showClose: true,
+          message: '请完善右侧模版名称',
+          type: 'warning',
+        })
+        if(queryObj.value.CountryName=='') return ElMessage({
+          showClose: true,
+          message: '请完善右侧国家',
+          type: 'warning',
+        })
+        if(queryObj.value.ColorStr=='') return ElMessage({
+          showClose: true,
+          message: '请完善右侧颜色',
+          type: 'warning',
+        })
+        if(queryObj.value.SeasonName=='') return ElMessage({
           showClose: true,
-          message: '请完善右侧模版数据',
+          message: '请完善右侧季节',
           type: 'warning',
         })
       }

src/views/Editor/Toolbar/ElementTemplateData.vue

@@ -97,7 +97,6 @@
                             </div>
                 </div>
             </div>
-            
             <div class="row q-mt-md">
                 <el-select v-model="queryObj.CountryName" filterable class="m-2" placeholder="请选择国家"
                 @change="getCountryId">
@@ -468,6 +467,7 @@
             }) 
             return
         }
+        datas.params.Content = datas.params.Name
         try {
             datas.addNationLoading = true
             let dataRes = await ConfigService.SetTemplateConfigData(datas.params)

src/views/TemplateCenter/nation.vue

@@ -126,6 +126,7 @@
                 message: '请完善国家名称',
                 type: 'warning',
             }) 
+      datas.params.Content = datas.params.Name
       datas.requestLoading = true
       const result = await ConfigService.SetTemplateConfigData(datas.params)
       if(result){