update

src/components/base/EditStyle.vue

@@ -52,7 +52,8 @@
           </div>
           <div class="tool-item" v-if="item.name === 'width'">
             <div class="tit">宽</div>
-            <el-input @input="changeStyle" v-model="item.value" placeholder="请输入数字"></el-input>
+            <el-input v-if="item.disabled" :disabled="true" @input="changeStyle" v-model="item.value" placeholder="请输入数字"></el-input>
+            <el-input v-else @input="changeStyle" v-model="item.value" placeholder="请输入数字"></el-input>
           </div>
           <div class="tool-item" v-if="item.name === 'height'">
             <div class="tit">高</div>

src/components/tinymce/Index.vue

@@ -26,11 +26,12 @@ export default {
           'undo redo | fontsizeselect lineheight bold italic underline strikethrough forecolor backcolor | link quickimage image media table | align hangingindent indent outdent numlist bullist | charmap  blockquote hr fullscreen | code preview',
         // font_formats:
         //   '微软雅黑=Microsoft YaHei,Helvetica Neue,PingFang SC,sans-serif;苹果苹方=PingFang SC,Microsoft YaHei,sans-serif;宋体=simsun,serif;仿宋体=FangSong,serif;黑体=SimHei,sans-serif;Arial=arial,helvetica,sans-serif;Times New Roman',
-        fontsize_formats: '8px 10px 12px 14px 15px 16px 17px 18px 20px 24px',
-        lineheight_formats: '0.5 1 1.2 1.5 2',
+        fontsize_formats:
+          '12px 14px 16px 18px 20px 22px 24px 26px 28px 30px 32px 34px 36px 38px 40px 42px 44px 46px 48px 50px',
+        // lineheight_formats: '0.5 1 1.2 1.5 2',
         images_upload_handler: ImageUpload,
         automatic_uploads: true,
-        quickbars_insert_toolbar: false,
+        quickbars_insert_toolbar: true,
         // style_formats: [{ title: '悬挂缩进', block: 'p', styles: { textIndent: '-2em', paddingLeft: '2em' } }],
         content_style: 'img {max-width:100%;}'
       }

src/modules/template/components/stepTwo.vue

@@ -70,6 +70,7 @@
       </div>
       <div style="display: flex; justify-content: center; padding: 30px">
         <el-button type="primary" @click="submit()">提 交</el-button>
+        <el-button type="primary" @click="$router.go(-1)">返 回</el-button>
       </div>
     </div>
     <el-dialog title="添加元素" :visible.sync="dialogVisible" width="30%" :destroy-on-close="true">
@@ -125,8 +126,8 @@ export default {
         type: '-1',
         title: '证书设置',
         tool: [
-          { name: 'proportionWidth', value: 2, option: [1, 20, 1] },
-          { name: 'proportionHeight', value: 1, option: [1, 20, 1] }
+          { name: 'width', value: 860 },
+          { name: 'height', value: 400 }
         ],
         style: ''
       },
@@ -462,8 +463,9 @@ export default {
   }
 }
 .edit-cert-box {
+  width: 1200px;
+  margin: 30px auto;
   display: flex;
-  padding-top: 30px;
 }
 .tool-left {
   min-width: 340px;

src/modules/template/views/Update.vue

 <template>
   <div class="create-box">
     <app-card :title="!$route.query.id ? '新建模板' : '编辑模板'">
-      <!-- <el-steps :active="active" finish-status="success">
-        <el-step title="步骤 1"></el-step>
-        <el-step title="步骤 2"></el-step>
-      </el-steps>
-      <div class="step-one" v-if="active === 0">
-        <el-form ref="form" :model="form" style="width: 50%; margin: 0 auto" label-width="100px">
-          <el-form-item label="模板名称">
-            <el-input v-model="form.title"></el-input>
-          </el-form-item>
-          <el-form-item label="编号生成规则">
-            <el-radio-group v-model="form.rule">
-              <el-radio label="0">规则一</el-radio>
-              <el-radio label="1">规则二</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="active = 1">下一步</el-button>
-            <el-button @click="$router.go(-1)">取消</el-button>
-          </el-form-item>
-        </el-form>
-      </div> -->
       <template v-if="$route.query.id">
         <stepTwo @submit="submit" v-if="Object.keys(step2Data).length" :data="step2Data"></stepTwo>
       </template>
       <template v-else>
         <stepTwo @submit="submit" :data="step2Data"></stepTwo>
       </template>
-      <!-- <div class="step-two" v-if="active === 1">
-      </div> -->
     </app-card>
   </div>
 </template>
@@ -37,12 +14,9 @@
 <script>
 import stepTwo from '../components/stepTwo.vue'
 import { createTemplate, getDetails, updateTemplate } from '../api'
-// import UploadImage from '@/components/upload/UploadImage.vue'
-// import { createBanner, getDetails, updateBanner } from '../api'
 export default {
   components: {
     stepTwo
-    // UploadImage
   },
   data() {
     return {
@@ -51,7 +25,8 @@ export default {
         title: '',
         rule: '0'
       },
-      step2Data: {}
+      step2Data: {},
+      loading: null
     }
   },
   computed: {
@@ -59,13 +34,23 @@ export default {
       return this.$route.query.id
     }
   },
+  created() {
+    if (this.id) {
+      this.loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.9)'
+      })
+    }
+  },
   methods: {
     submit(data) {
       const loading = this.$loading({
         lock: true,
         text: 'Loading',
         spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
+        background: 'rgba(0, 0, 0, 0.9)'
       })
       if (this.$route.query.id) {
         data.id = this.$route.query.id
@@ -104,6 +89,7 @@ export default {
           rule: data.rule
         }
         this.step2Data = JSON.parse(data.info)
+        this.loading.close()
       })
     }
   },