tinymse段落间距插件等

package-lock.json

@@ -12073,6 +12073,11 @@
       "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
       "dev": true
     },
+    "tinymce-paragraphspacing": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/tinymce-paragraphspacing/-/tinymce-paragraphspacing-1.0.1.tgz",
+      "integrity": "sha512-sR6+vBvxplRv6SyT51Zbfc5k3xZ0ro1G+nBopoeb/3WVCUAyUtpETB+3N8gsuOvckM7NxCEZ/PtZTgznaerzTw=="
+    },
     "to-arraybuffer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",

package.json

@@ -20,6 +20,7 @@
     "postcss-px2rem": "^0.3.0",
     "px2rem-loader": "^0.1.9",
     "sortablejs": "^1.14.0",
+    "tinymce-paragraphspacing": "^1.0.1",
     "vue": "^2.6.10",
     "vue-cropper": "^0.5.8",
     "vue-cropperjs": "^3.0.0",

src/components/modules/history.vue

@@ -57,7 +57,7 @@
               <i class="el-icon-edit-outline del"
                  @click="editHistory(scope.row, scope.$index)"></i>
               <i class="el-icon-delete del"
-                 @click="delRow(data.list, scope.$index)"></i>
+                 @click="delRow(list, scope.$index)"></i>
             </div>
           </template>
         </el-table-column>
@@ -121,6 +121,14 @@ export default {
       this.curModule = i
       this.contentVisible = true
     },
+    // 删除行（通用）
+    delRow (list, i) {
+      this.$confirm('确定要删除吗？', '提示', {
+        type: 'warning'
+      }).then(() => {
+        list.splice(i, 1)
+      }).catch(() => { })
+    },
     close () {
       this.$emit('update:visible', false)
     },

src/pages/article/add/editor.js

@@ -6,10 +6,10 @@ export default {
   //skin:'oxide-dark',
   language:'zh_CN',
   language_url: './styles/tinymce/langs/zh_CN.js',
-  plugins: 'print powerpaste preview searchreplace autolink directionality visualblocks visualchars fullscreen image link media template advcode codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help emoticons autosave autoresize formatpainter',
+  plugins: 'print powerpaste preview searchreplace autolink directionality visualblocks visualchars fullscreen image link media template advcode codesample table charmap hr pagebreak nonbreaking anchor insertdatetime advlist lists wordcount imagetools textpattern help emoticons autosave autoresize formatpainter paragraphspacing',
   toolbar: 'code undo redo restoredraft | cut copy powerpaste pastetext | forecolor backcolor headings fontsize lineHeight bold italic underline strikethrough link anchor | alignleft aligncenter alignright alignjustify | \
     styleselect fontselect fontsizeselect | bullist numlist | blockquote subscript superscript removeformat | \
-    table image media charmap emoticons hr pagebreak insertdatetime print preview | fullscreen | indent2em formatpainter',
+    table image media charmap emoticons hr pagebreak insertdatetime print preview | fullscreen | indent2em formatpainter | paragraphspacing',
   style_formats: [
     //新增 首行缩进与行高 配置
     {

src/pages/article/add/index.vue

@@ -735,6 +735,7 @@ import Setting from '@/setting'
 import Util from '@/libs/util'
 import { mapState } from 'vuex'
 import Editor from '@tinymce/tinymce-vue'
+import 'tinymce-paragraphspacing'
 import editorConfig from './editor'
 import Cropper from '@/components/img-upload/Cropper'
 import VueUeditorWrap from 'vue-ueditor-wrap'

src/pages/column/add/index.vue

@@ -110,7 +110,8 @@
             </li>
           </ul>
         </el-form-item>
-        <el-form-item prop="detailStyleId"
+        <el-form-item v-if="form.listStyleId != 73"
+                      prop="detailStyleId"
                       label="详情样式">
           <ul class="styles">
             <li v-for="(item, i) in detailStyleId"

src/pages/column/page/lightSources.vue

@@ -61,7 +61,7 @@
                   <th>地点</th>
                   <th>能量（GeV）</th>
                   <th>储存环周长(m)</th>
-                  <th>光束线/条</th>
+                  <th>光束线</th>
                   <th>代际</th>
                   <th>发射度(nm.rad)</th>
                   <th>状态</th>
@@ -103,7 +103,7 @@
                   <th>波长范围/nm</th>
                   <th>重复频率/Hz</th>
                   <th>设施长度/m</th>
-                  <th>实验站/个</th>
+                  <th>实验站</th>
                   <th>状态</th>
                   <th>建成时间</th>
                 </tr>