Merge branch 'dev2/luolei' into test

src/components/icss/CommonTemplate.vue

@@ -112,6 +112,7 @@
               <el-input
                 placeholder=""
                 v-model="item.text"
+                maxlength="15"
                 @change="updataData"
               >
               </el-input>

src/components/icss/PubTagGroup.vue

@@ -255,7 +255,7 @@ export default {
         ],
         region3: [
           { required: true, message: '请输入标签系统名称', trigger: 'change' },
-          { validator: validatePass2, trigger: 'blur' },
+          // { validator: validatePass2, trigger: 'blur' },
         ],
         region4: [
           { required: true, message: '请输入标签界面名称', trigger: 'change' }

src/components/icss/TemplateMaintenanceWrap.vue

@@ -78,7 +78,7 @@ export default {
           type: 'warning'
         });
         return;
-      }else if(detailLis[0].questionId == ''){
+      }else if(detailLis[0].questionId == '' && detailLis.length == 1){
         this.$message({
           message: '保存模版时，无法保存单独的输入栏',
           type: 'warning'