feat: upgrade imgpond & pic-viewer & minimce, close #93

wangyuan389 · Dec 2, 2023 · 10d9d06 · 10d9d06
1 parent 5b40fd6
commit 10d9d06
Show file tree

Hide file tree

Showing 12 changed files with 10,458 additions and 7,063 deletions.
diff --git a/packages/mall-cook-platform/package-lock.json b/packages/mall-cook-platform/package-lock.json
diff --git a/packages/mall-cook-platform/package.json b/packages/mall-cook-platform/package.json
@@ -9,26 +9,26 @@
   },
   "dependencies": {
     "axios": "^0.21.1",
-    "axios-shortcut": "~0.0.1",
+    "axios-shortcut": "~0.1.1",
     "compression-webpack-plugin": "5.0.1",
     "core-js": "^3.6.5",
     "cross-env": "^7.0.3",
     "dom-to-image": "^2.6.0",
     "element-ui": "^2.15.2",
     "element-verify": "^0.2.3",
-    "imgpond": "~0.6.0",
+    "imgpond": "~0.13.0",
     "jr-qrcode": "^1.1.4",
     "js-cookie": "^3.0.0",
     "lodash": "^4.17.21",
     "lru-cache": "^6.0.0",
-    "mammoth": "^1.4.21",
-    "minimce": "~0.4.8",
-    "pic-viewer": "~0.5.0",
+    "mammoth": "^1.6.0",
+    "minimce": "~0.8.4",
+    "pic-viewer": "~0.10.0",
     "postcss-plugin-px2rem": "^0.8.1",
     "sass": "^1.49.0",
     "sass-resources-loader": "^2.2.1",
     "swiper": "5.4.5",
-    "tinymce": "^6.1.2",
+    "tinymce": "^6.7.0",
     "vue": "^2.7.8",
     "vue-awesome-swiper": "^4.1.1",
     "vue-json-viewer": "^2.2.19",

diff --git a/packages/mall-cook-platform/src/components/MiniMCE/index.js b/packages/mall-cook-platform/src/components/MiniMCE/index.js
@@ -1,7 +1,6 @@
 import Vue from 'vue'
 
 import './index.scss'
-import 'minimce/dist/style.css'
 import MiniMCE from 'minimce'
 
 /**
@@ -28,6 +27,9 @@ import 'tinymce/themes/silver'
  */
 import 'tinymce/icons/default'
 
+// 语言（非必须，默认英文，下载地址：https://www.tiny.cloud/get-tiny/language-packages）
+import './langs/zh-Hans'
+
 /**
  * 自定义内容样式（非必须）
  * 该样式仅在生产侧有效，不包含在生成的 HTML 文本中
@@ -59,7 +61,7 @@ import global from '@/config/global'
 export default function () {
   Vue.use(MiniMCE, {
     options: {
-      language: 'zh_CN',
+      language: 'zh-Hans',
       content_style: [contentCSS, contentUICSS, contentCustomCSS].join('\n'),
       menu: {
         insert: {

diff --git a/packages/mall-cook-platform/src/components/MiniMCE/langs/zh-Hans.js b/packages/mall-cook-platform/src/components/MiniMCE/langs/zh-Hans.js
diff --git a/packages/mall-cook-platform/src/components/MiniMCE/plugins/InsertImage/index.vue b/packages/mall-cook-platform/src/components/MiniMCE/plugins/InsertImage/index.vue
@@ -12,7 +12,7 @@
         prop="src"
         :rules="{required:true,message:'必填项'}"
       >
-        <Imgpond v-model="formData.src" valueType="array"/>
+        <ImgPond v-model="formData.src" arrayed />
       </el-form-item>
     </el-form>
     <template #footer>
@@ -23,11 +23,10 @@
 </template>
 
 <script>
-import 'imgpond/dist/style.css'
-import Imgpond from 'imgpond'
+import ImgPond from 'imgpond'
 
 export default {
-  components: { Imgpond },
+  components: { ImgPond },
   props: {
     editor: {
       required: true,

diff --git a/.../mall-cook-platform/src/custom-schema-template-set/config-template/SchemaUploadConfig.vue b/.../mall-cook-platform/src/custom-schema-template-set/config-template/SchemaUploadConfig.vue
@@ -25,7 +25,7 @@
         ></el-input>
       </config-item>
       <config-item label='默认图片'>
-        <Imgpond
+        <ImgPond
           v-model="content.curComponent.value"
           :count="1"
         />

diff --git a/packages/mall-cook-platform/src/custom-schema-template/components/SchemaUpload/index.vue b/packages/mall-cook-platform/src/custom-schema-template/components/SchemaUpload/index.vue
@@ -7,7 +7,7 @@
 -->
 <template>
   <config-item :label='label'>
-    <Imgpond
+    <ImgPond
       v-model="mValue"
       v-bind="mOptions"
       :count="1"
@@ -23,4 +23,4 @@ export default {
 
   mixins: [schemaMixin],
 };
-</script>
+</script>
diff --git a/packages/mall-cook-platform/src/main.js b/packages/mall-cook-platform/src/main.js
@@ -68,21 +68,18 @@ for (let k in axiosShortcut) {
 /**
  * 图片预览
  */
-import 'pic-viewer/dist/style.css'
 import PicViewer from 'pic-viewer'
 Vue.use(PicViewer)
 
 /**
  * 图片上传
  */
-import 'imgpond/dist/style.css'
-import Imgpond from 'imgpond'
+import ImgPond from 'imgpond'
 
-Vue.use(Imgpond, {
-  upload: (file, context) => new Promise((resolve, reject) => {
+Vue.use(ImgPond, {
+  upload: (file) => new Promise((resolve, reject) => {
     Vue.prototype.$POST.upload(global.baseApi + 'upload', ({
       file,
-      ...context.$attrs.requestParam,
     }), {
       baseURL: '',
       timeout: 20000,

diff --git a/packages/mall-cook-platform/src/pages/mall/goods/goods-manager/edit.vue b/packages/mall-cook-platform/src/pages/mall/goods/goods-manager/edit.vue
@@ -26,11 +26,11 @@
         </div>
       </el-form-item>
       <el-form-item label="商品封面：" prop="cover" verify>
-        <Imgpond v-model="form.cover" :count="1" />
+        <ImgPond v-model="form.cover" :count="1" />
         <div class="f12 f-grey">建议尺寸：800*800像素</div>
       </el-form-item>
       <el-form-item label="商品图：" prop="imgList" verify>
-        <Imgpond v-model="form.imgList" :count="10" />
+        <ImgPond v-model="form.imgList" :count="10" />
         <div class="f12 f-grey">
           建议尺寸：800*800像素，你可以拖拽图片调整顺序，最多上传10张
         </div>

diff --git a/packages/mall-cook-platform/src/pages/mall/goods/group-manager/edit.vue b/packages/mall-cook-platform/src/pages/mall/goods/group-manager/edit.vue
@@ -93,7 +93,7 @@
               prop="image"
               verify
             >
-              <Imgpond
+              <ImgPond
                 :count="1"
                 v-model="form.image"
               />
@@ -220,4 +220,4 @@ export default {
   display: inline-block;
   margin: 0 auto;
 }
-</style>
+</style>
diff --git a/packages/mall-cook-platform/src/scss/imgpond.scss b/packages/mall-cook-platform/src/scss/imgpond.scss
@@ -17,7 +17,8 @@
 }
 
 .el-upload-list__item-status-label,
-.el-upload__text {
+.el-upload__text,
+.el-upload__tip  {
     display: none !important;
 }
 

diff --git a/packages/mall-cook-platform/vue.config.js b/packages/mall-cook-platform/vue.config.js
@@ -24,7 +24,7 @@ module.exports = {
       chunks: ['chunk-vendors', 'chunk-common', 'index']
     }
   },
-
+  transpileDependencies: ['imgpond', 'pic-viewer', 'minimce'],
   configureWebpack: config => {
     // CDN 加载依赖
     config.externals = {