a

admin/jest.config.js

@@ -13,7 +13,7 @@ module.exports = {
   testMatch: [
     '**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)'
   ],
-  collectCoverageFrom: ['src/utils/**/*.{js,vue}', '!src/utils/auth.js', '!src/utils/request.js', 'src/components/**/*.{js,vue}'],
+  collectCoverageFrom: ['src/utils/**/*.{js,vue}', '!src/utils/auth.js', '!src/utils/request.js', 'src/Wangeditor/**/*.{js,vue}'],
   coverageDirectory: '<rootDir>/tests/unit/coverage',
   // 'collectCoverage': true,
   'coverageReporters': [

admin/mock/role/routes.js

@@ -127,7 +127,7 @@ const asyncRoutes = [
   },
 
   {
-    path: '/components',
+    path: '/Wangeditor',
     component: 'layout/Layout',
     redirect: 'noRedirect',
     name: 'ComponentDemo',
@@ -138,85 +138,85 @@ const asyncRoutes = [
     children: [
       {
         path: 'tinymce',
-        component: 'views/components-demo/tinymce',
+        component: 'views/Wangeditor-demo/tinymce',
         name: 'TinymceDemo',
         meta: { title: 'Tinymce' }
       },
       {
         path: 'markdown',
-        component: 'views/components-demo/markdown',
+        component: 'views/Wangeditor-demo/markdown',
         name: 'MarkdownDemo',
         meta: { title: 'Markdown' }
       },
       {
         path: 'json-editor',
-        component: 'views/components-demo/json-editor',
+        component: 'views/Wangeditor-demo/json-editor',
         name: 'JsonEditorDemo',
         meta: { title: 'Json Editor' }
       },
       {
         path: 'split-pane',
-        component: 'views/components-demo/split-pane',
+        component: 'views/Wangeditor-demo/split-pane',
         name: 'SplitpaneDemo',
         meta: { title: 'SplitPane' }
       },
       {
         path: 'avatar-upload',
-        component: 'views/components-demo/avatar-upload',
+        component: 'views/Wangeditor-demo/avatar-upload',
         name: 'AvatarUploadDemo',
         meta: { title: 'Avatar Upload' }
       },
       {
         path: 'dropzone',
-        component: 'views/components-demo/dropzone',
+        component: 'views/Wangeditor-demo/dropzone',
         name: 'DropzoneDemo',
         meta: { title: 'Dropzone' }
       },
       {
         path: 'sticky',
-        component: 'views/components-demo/sticky',
+        component: 'views/Wangeditor-demo/sticky',
         name: 'StickyDemo',
         meta: { title: 'Sticky' }
       },
       {
         path: 'count-to',
-        component: 'views/components-demo/count-to',
+        component: 'views/Wangeditor-demo/count-to',
         name: 'CountToDemo',
         meta: { title: 'Count To' }
       },
       {
         path: 'mixin',
-        component: 'views/components-demo/mixin',
+        component: 'views/Wangeditor-demo/mixin',
         name: 'ComponentMixinDemo',
         meta: { title: 'componentMixin' }
       },
       {
         path: 'back-to-top',
-        component: 'views/components-demo/back-to-top',
+        component: 'views/Wangeditor-demo/back-to-top',
         name: 'BackToTopDemo',
         meta: { title: 'Back To Top' }
       },
       {
         path: 'drag-dialog',
-        component: 'views/components-demo/drag-dialog',
+        component: 'views/Wangeditor-demo/drag-dialog',
         name: 'DragDialogDemo',
         meta: { title: 'Drag Dialog' }
       },
       {
         path: 'drag-select',
-        component: 'views/components-demo/drag-select',
+        component: 'views/Wangeditor-demo/drag-select',
         name: 'DragSelectDemo',
         meta: { title: 'Drag Select' }
       },
       {
         path: 'dnd-list',
-        component: 'views/components-demo/dnd-list',
+        component: 'views/Wangeditor-demo/dnd-list',
         name: 'DndListDemo',
         meta: { title: 'Dnd List' }
       },
       {
         path: 'drag-kanban',
-        component: 'views/components-demo/drag-kanban',
+        component: 'views/Wangeditor-demo/drag-kanban',
         name: 'DragKanbanDemo',
         meta: { title: 'Drag Kanban' }
       }

admin/src/components/Wangeditor/index.vue

@@ -50,10 +50,10 @@
                 "|",
                 "insertLink",
                 "insertTable",
-                "codeBlock",
+                /*"codeBlock",
-                "|",
+                "|",*/
-                "undo",
+                /*"undo",
-                "redo",
+                "redo",*/
                 ]
             },
         editorConfig: {

admin/src/layout/components/Navbar.vue

@@ -163,7 +163,7 @@ export default {
     Hamburger,
     Screenfull,
     SizeSelect,
-    // eslint-disable-next-line vue/no-unused-components
+    // eslint-disable-next-line vue/no-unused-Wangeditor
     Search
   },
   computed: {
@@ -179,7 +179,7 @@ export default {
       'device'
     ])
   },
-  // eslint-disable-next-line vue/order-in-components
+  // eslint-disable-next-line vue/order-in-Wangeditor
   data() {
     return {
       workstatus: false,

admin/src/router/modules/components.js

@@ -3,7 +3,7 @@
 import Layout from '@/layout'
 
 const componentsRouter = {
-  path: '/components',
+  path: '/Wangeditor',
   component: Layout,
   redirect: 'noRedirect',
   name: 'ComponentDemo',

admin/src/views/excel/export-excel.vue

@@ -47,7 +47,7 @@
 <script>
 import { fetchList } from '@/api/article'
 import { parseTime } from '@/utils'
-// options components
+// options Wangeditor
 import FilenameOption from './components/FilenameOption'
 import AutoWidthOption from './components/AutoWidthOption'
 import BookTypeOption from './components/BookTypeOption'

admin/src/views/order/abandoned.vue

@@ -308,7 +308,7 @@
 </template>
 
 <script>
-// import Pagination from '@/components/Pagination'
+// import Pagination from '@/Wangeditor/Pagination'
 import Pagination from '@/components/PaginationFixed'
 import {orderBack} from '@/api/order'
 export default {

admin/src/views/order/back.vue

@@ -94,7 +94,7 @@
 </template>
 
 <script>
-// import Pagination from '@/components/Pagination'
+// import Pagination from '@/Wangeditor/Pagination'
 import Pagination from '@/components/PaginationFixed'
 
 export default {

admin/src/views/order/index.vue

@@ -388,7 +388,7 @@
 </template>
 
 <script>
-// import Pagination from '@/components/Pagination'
+// import Pagination from '@/Wangeditor/Pagination'
 import Pagination from '@/components/PaginationFixed'
 import {orderBack} from '@/api/order'
 export default {

admin/src/views/order/product.vue

@@ -80,7 +80,7 @@
 </template>
 
 <script>
-// import Pagination from '@/components/Pagination'
+// import Pagination from '@/Wangeditor/Pagination'
 import Pagination from '@/components/PaginationFixed'
 
 export default {

admin/src/views/order/used.vue

@@ -309,7 +309,7 @@
 </template>
 
 <script>
-// import Pagination from '@/components/Pagination'
+// import Pagination from '@/Wangeditor/Pagination'
 import Pagination from '@/components/PaginationFixed'
 import {orderBack} from '@/api/order'
 export default {

admin/src/views/permission/role.vue

@@ -234,7 +234,7 @@ export default {
         type: 'success'
       })
     },
-    // reference: src/view/layout/components/Sidebar/SidebarItem.vue
+    // reference: src/view/layout/Wangeditor/Sidebar/SidebarItem.vue
     onlyOneShowingChild(children = [], parent) {
       let onlyOneChild = null
       const showingChildren = children.filter(item => !item.hidden)

admin/src/views/qa/qa.vue

@@ -62,23 +62,7 @@
               <div>内容</div>
               <div style="border: 1px solid #ccc;">
                 <myEditor :value="item.content" />
-                <!-- <Toolbar
-                  style="border-bottom: 1px solid #ccc"
-                  :editor="editor"
-                  :key="index"
-                  :defaultConfig="toolbarConfig"
-                  :mode="mode"
-                />
-                <Editor
-                  style="height: 300px; overflow-y: hidden;"
-                  v-model="item.content"
-                  :defaultConfig="editorConfig"
-                  :mode="mode"
-                  @onChange="onChange"
-                  @onCreated="onCreated"
-                /> -->
               </div>
-<!--              <el-input v-model="item.content" :rows="4" type="textarea" placeholder="内容" />-->
             </div>
             <div class="mistake-right">
               <el-button @click="handleDel(index)" type="danger">删除</el-button>
@@ -139,9 +123,6 @@
         <el-form-item label="旅游路线">
           <el-input v-model="anchors.title" type="text" placeholder="请输入旅游路线" />
         </el-form-item>
-        <!-- <el-form-item label="QA内容">
-          <el-input v-model="anchors.content" :rows="6" style="height: 120px" type="textarea" placeholder="QA内容" />
-        </el-form-item> -->
         <el-form-item label="QA内容">
           <div class="mistake-content" v-for="(item,index) in anchors.qaQuestions">
             <div class="mistake-left">
@@ -153,23 +134,7 @@
               <div>内容</div>
               <div style="border: 1px solid #ccc;">
                 <myEditor :value="item.content"/>
-                <!-- <Toolbar
-                  style="border-bottom: 1px solid #ccc"
-                  :editor="editor"
-                  :defaultConfig="toolbarConfig"
-                  :mode="mode"
-                  :key="index"
-                />
-                <Editor
-                  style="height: 400px; overflow-y: hidden;"
-                  v-model="item.content"
-                  :defaultConfig="editorConfig"
-                  :mode="mode"
-                  @onChange="onChange"
-                  @onCreated="onCreated"
-                /> -->
               </div>
-<!--              <el-input v-model="item.content" :rows="4" type="textarea" placeholder="内容" />-->
             </div>
             <div class="mistake-right">
               <el-button @click="handleDel(index)" type="danger">删除</el-button>
@@ -216,28 +181,13 @@
 
 <script>
 import Pagination from '@/components/PaginationFixed'
-import myEditor from './components/wangeditor'
+import myEditor from '@/components/Wangeditor/index.vue'
-// import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 
 export default {
   name: 'getQa',
-  // components: { Pagination, Editor, Toolbar },
   components: { Pagination, myEditor},
   data() {
     return {
-      editor: null,
-      toolbarConfig:{
-                toolbarKeys:[
-                'headerSelect',
-                    '|',
-                    // 菜单
-                    'bold','italic',
-                ]
-            },
-
-      editorConfig: { placeholder: '请输入内容...' },
-      mode: 'default', // or 'simple'
-
       statusArr: { 0: '禁用', 1: '启用' },
       list: [],
       total: 0,
@@ -272,13 +222,6 @@ export default {
     this.onChange()
   },
   methods: {
-    onCreated(editor) {
-      console.log('onCreated', editor);
-      this.editor = Object.seal(editor) // 一定要用 Object.seal() ，否则会报错
-    },
-    onChange(editor) {
-      // console.log("onChange", editor.getHtml()); // onChange 时获取编辑器最新内容
-    },
     handleAdd(){
       this.anchors.qaQuestions.push({
         sort:this.anchors.qaQuestions[this.anchors.qaQuestions.length-1].sort+1,

admin/vue.config.js

@@ -129,7 +129,7 @@ module.exports = {
                 },
                 commons: {
                   name: 'chunk-commons',
-                  test: resolve('src/components'), // can customize your rules
+                  test: resolve('src/Wangeditor'), // can customize your rules
                   minChunks: 3, //  minimum common number
                   priority: 5,
                   reuseExistingChunk: true

service/app/server/Douyin.php

@@ -249,7 +249,7 @@ class Douyin
     public function _getRetriesLock(): bool
     {
         $pattern = 'php webman spider:dy';
-        $maxProcesses = 6;
+        $maxProcesses = 8;
         $this->_killMiddleProcesses($pattern, $maxProcesses);
 
 

service/public/static/css/chunk-088ad5e4.dc8f5bc5.css

@@ -1 +1 @@
-.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-6d97be4e]{position:relative;padding-bottom:60px}.el-table[data-v-6d97be4e],.filter-container[data-v-6d97be4e]{padding-bottom:52px}
+.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-06715ed5]{position:relative;padding-bottom:60px}.el-table[data-v-06715ed5],.filter-container[data-v-06715ed5]{padding-bottom:52px}

service/public/static/css/chunk-0e94762a.74efdbcd.css

@@ -1 +1 @@
-.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-03939d62]{position:relative;padding-bottom:60px}.el-table[data-v-03939d62],.filter-container[data-v-03939d62]{padding-bottom:52px}
+.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-4983868b]{position:relative;padding-bottom:60px}.el-table[data-v-4983868b],.filter-container[data-v-4983868b]{padding-bottom:52px}

service/public/static/css/chunk-34fc123c.a0332f1b.css

@@ -1 +0,0 @@
-.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.mistake-content[data-v-6f0c5871],.qa-desc[data-v-6f0c5871]{display:-webkit-box;display:-ms-flexbox;display:flex}.mistake-left[data-v-6f0c5871]{width:90%}.mistake-right[data-v-6f0c5871]{padding-left:20px;height:auto;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.app-container[data-v-6f0c5871]{position:relative;padding-bottom:60px}[data-v-6f0c5871].el-table--fit{padding-bottom:0!important}.el-table[data-v-6f0c5871],.filter-container[data-v-6f0c5871]{padding-bottom:52px}.mistake-btn[data-v-6f0c5871]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:reverse;-ms-flex-direction:row-reverse;flex-direction:row-reverse;margin-top:10px}.search[data-v-6f0c5871]{margin-left:10px}.avatar-uploader .el-upload[data-v-6f0c5871]{border:1px solid #131313;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-6f0c5871]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-6f0c5871]{border:1px solid #979797;border-radius:15px;font-size:28px;color:#8c939d;width:100px;height:100px;line-height:100px;text-align:center}

service/public/static/css/chunk-a672369a.41770152.css

@@ -1 +1 @@
-.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-17b7299c]{position:relative;padding-bottom:60px}.el-table[data-v-17b7299c],.filter-container[data-v-17b7299c]{padding-bottom:52px}
+.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-93ce0574]{position:relative;padding-bottom:60px}.el-table[data-v-93ce0574],.filter-container[data-v-93ce0574]{padding-bottom:52px}

service/public/static/css/chunk-e7ba3fc8.45a5cda7.css

@@ -1 +1 @@
-.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-1be0c105]{position:relative;padding-bottom:60px}.el-table[data-v-1be0c105],.filter-container[data-v-1be0c105]{padding-bottom:52px}
+.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-23e05a42]{position:relative;padding-bottom:60px}.el-table[data-v-23e05a42],.filter-container[data-v-23e05a42]{padding-bottom:52px}

service/public/static/css/chunk-ee2ec240.634ee8b7.css

@@ -0,0 +1 @@
+.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-30533d90]{position:relative;padding-bottom:60px}.el-table[data-v-30533d90],.filter-container[data-v-30533d90]{padding-bottom:52px}

service/public/static/css/chunk-fb3e4398.aef20c2f.css

@@ -0,0 +1 @@
+.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.disable-layer[data-v-69d1f452]{width:100%;height:100%;background:#f5f7fa;position:absolute;top:0;left:0;z-index:99;opacity:.5}.mistake-content[data-v-805dce70],.qa-desc[data-v-805dce70]{display:-webkit-box;display:-ms-flexbox;display:flex}.mistake-left[data-v-805dce70]{width:90%}.mistake-right[data-v-805dce70]{padding-left:20px;height:auto;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.app-container[data-v-805dce70]{position:relative;padding-bottom:60px}[data-v-805dce70].el-table--fit{padding-bottom:0!important}.el-table[data-v-805dce70],.filter-container[data-v-805dce70]{padding-bottom:52px}.mistake-btn[data-v-805dce70]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:reverse;-ms-flex-direction:row-reverse;flex-direction:row-reverse;margin-top:10px}.search[data-v-805dce70]{margin-left:10px}.avatar-uploader .el-upload[data-v-805dce70]{border:1px solid #131313;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-805dce70]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-805dce70]{border:1px solid #979797;border-radius:15px;font-size:28px;color:#8c939d;width:100px;height:100px;line-height:100px;text-align:center}

service/public/static/css/chunk-fcbd49c8.2a83251e.css

@@ -1 +0,0 @@
-.pagination-container[data-v-28fdfbeb]{padding:32px 16px;position:fixed;bottom:0;left:0;width:100%;background:#fff;padding:40px 280px;-webkit-box-shadow:0 -2px 10px rgba(0,0,0,.1);box-shadow:0 -2px 10px rgba(0,0,0,.1);z-index:100}.pagination-container.hidden[data-v-28fdfbeb]{display:none}.app-container[data-v-4fdf9380]{position:relative;padding-bottom:60px}.el-table[data-v-4fdf9380],.filter-container[data-v-4fdf9380]{padding-bottom:52px}