cloud-web-corejs-haier 1.0.5 → 1.0.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs-haier",
   "private": false,
-  "version": "1.0.5",
+  "version": "1.0.6",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",
@@ -12,7 +12,7 @@
     "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
     "test:unit": "jest --clearCache && vue-cli-service test:unit",
     "test:ci": "npm run lint && npm run test:unit",
-    "updateCorejs": "npm install cloud-web-corejs --no-save --registry https://registry.npmjs.org",
+    "updateCorejs": "npm install cloud-web-corejs --registry https://registry.npmjs.org",
     "publishDev": "npm publish --tag dev"
   },
   "dependencies": {
@@ -25,14 +25,14 @@
     "copy-webpack-plugin": "5.1.2",
     "core-js": "^3.8.3",
     "dayjs": "^1.11.13",
-    "dhtmlx-gantt": "^7.1.13",
+    "dhtmlx-gantt": "^9.1.0",
     "element-ui": "^2.15.14",
     "esdk-obs-browserjs": "^3.25.6",
     "html2canvas": "^1.4.1",
     "js-base64": "^3.7.7",
     "js-cookie": "2.2.0",
-    "jsqr": "^1.4.0",
     "jspdf": "^3.0.1",
+    "jsqr": "^1.4.0",
     "less": "^4.2.0",
     "less-loader": "^7.0.1",
     "lodash": "4.17.21",
@@ -125,6 +125,7 @@
     "src/components/baseInputNumber",
     "src/components/baseInputPrint",
     "src/components/baseTabs",
+    "src/components/base-textarea",
     "src/components/cnPrint",
     "src/components/code-editor",
     "src/components/confirmDialog",
@@ -171,6 +172,8 @@
     "src/store",
     "src/resources/js",
     "src/lang/index.js",
+    "src/lang/locale/en/login.js",
+    "src/lang/locale/zh/login.js",
     "src/layout",
     "src/filters",
     "src/router",

package/src/App.vue

@@ -1,67 +1,63 @@
 <template>
-  <div id="app" :class="{mobileApp:isMobile}">
-    <router-view/>
+  <div id="app" :class="{ mobileApp: isMobile }">
+    <router-view />
   </div>
 </template>
 
 <script>
-import settting from '@/settings.js';
+import settting from "@/settings.js";
 
 export default {
-  name: 'App',
+  name: "App",
   data() {
     let isMobile = this.getIsMobile();
     return {
-      isMobile: isMobile
-    }
+      isMobile: isMobile,
+    };
   },
   created() {
-    if (process.env.NODE_ENV !== "development") {
+    if (settting.reflushRouter!== true && process.env.NODE_ENV !== "development") {
       window.addEventListener(
-        'hashchange',
-        event => {
-          var currentPath = window.location.hash.slice(1).split('?')[0]; // 获取输入的路由
-          if (currentPath != '/404' && currentPath != '/login' && this.$router.path !== currentPath) {
-            this.$store.dispatch('tagsView/delAllViews').then(visitedViews => {
-              this.$router.replace({path: '/redirect' + '/home'});
+        "hashchange",
+        (event) => {
+          var currentPath = window.location.hash.slice(1).split("?")[0]; // 获取输入的路由
+          if (
+            currentPath != "/404" &&
+            currentPath != "/login" &&
+            this.$router.path !== currentPath
+          ) {
+            this.$store.dispatch("tagsView/delAllViews").then((visitedViews) => {
+              this.$router.replace({ path: "/redirect" + "/home" });
             });
           }
         },
         false
       );
 
-      window.addEventListener('beforeunload', async event => {
+      window.addEventListener("beforeunload", async (event) => {
         // 如果按下的键是 F5，则执行相应的操作
-        var currentPath = window.location.hash.slice(1).split('?')[0]; // 获取输入的路由
-        if (currentPath != '/home' && currentPath != '/' && currentPath != '/login' && currentPath != '/404') {
-          sessionStorage.setItem('toHome', '1');
+        var currentPath = window.location.hash.slice(1).split("?")[0]; // 获取输入的路由
+        if (
+          currentPath != "/home" &&
+          currentPath != "/" &&
+          currentPath != "/login" &&
+          currentPath != "/404"
+        ) {
+          sessionStorage.setItem("toHome", "1");
         }
       });
     }
 
-    window.addEventListener('load', async event => {
-      // 滚动事件变为 scroll
-      let title = settting.title;
-      if (location.host.indexOf('pcp.sc.5mall.com') == 0 || location.host.indexOf('pipuat.bears.com.cn') == 0) {
-        title = '产品创新平台PIP';
-      } else if (location.host.indexOf('chigo.sc.5mall.com') == 0) {
-        title = '志高营销平台';
-      } else if (location.host.indexOf('ngerp.sc.5mall.com') == 0) {
-        title = 'NG ERP';
-      }
-      document.title = title;
-    });
-
-  },
-  mounted() {
+    document.title = settting.title;
   },
+  mounted() {},
   methods: {
     getIsMobile() {
       const userAgent = navigator.userAgent;
       const mobileRegex = /Android|webOS|iPhone|iPad|iPod|BlackBerry|Windows Phone/i;
       return mobileRegex.test(userAgent);
-    }
-  }
+    },
+  },
 };
 </script>
 <style>

package/src/api/user.js

@@ -97,3 +97,11 @@ export function getFileServerInfo(option){
     ...option
   })
 }
+
+export function getLoginConfig(option){
+  return request({
+    url: USER_PREFIX + "/login_page/readData",
+    method: "post",
+    ...option
+  })
+}

package/src/components/Tinymce/index.vue

@@ -1,19 +1,31 @@
 <template>
-  <div :class="[fullscreen?'fullscreen':null,readonly?'readonly':null,]" class="tinymce-container"
-       :style="{ width: containerWidth }">
-    <textarea :id="tinymceId" class="tinymce-textarea" v-if="isActivated"/>
+  <div
+    :class="[fullscreen ? 'fullscreen' : null, readonly ? 'readonly' : null]"
+    class="tinymce-container"
+    :style="{ width: containerWidth }"
+  >
+    <textarea :id="tinymceId" class="tinymce-textarea" v-if="isActivated" />
     <!-- <div class="editor-custom-btn-container">
       <editorImage color="#ED6C44 " class="editor-upload-btn" @successCBK="imageSuccessCBK" />
     </div> -->
     <template v-if="!readonly">
       <div class="editor-custom-btn-container">
         <div class="upload-container">
-          <el-button icon="el-icon-upload" size="mini" type="primary" @click="handleShow({ key: 'value' })">
-            {{ $t2('上传', 'components.Tinymce.uploadButton') }}
+          <el-button
+            icon="el-icon-upload"
+            size="mini"
+            type="primary"
+            @click="handleShow({ key: 'value' })"
+          >
+            {{ $t2("上传", "components.Tinymce.uploadButton") }}
           </el-button>
         </div>
       </div>
-      <vab-upload ref="vabUpload" accept="image/png, image/jpeg" @callback="fileConfirm"></vab-upload>
+      <vab-upload
+        ref="vabUpload"
+        accept="image/png, image/jpeg"
+        @callback="fileConfirm"
+      ></vab-upload>
     </template>
   </div>
 </template>
@@ -23,56 +35,56 @@
  * docs:
  * https://panjiachen.github.io/vue-element-admin-site/feature/component/rich-editor.html#tinymce
  */
-import plugins from './plugins';
-import toolbar from './toolbar';
-import load from './dynamicLoadScript';
+import plugins from "./plugins";
+import toolbar from "./toolbar";
+import load from "./dynamicLoadScript";
 // import EditorImage from './components/EditorImage.vue'
 
 // why use this cdn, detail see https://github.com/PanJiaChen/tinymce-all-in-one
-const tinymceCDN = window.WEB_PREFIX + '/base/tinymce/tinymce.min.js';
+const tinymceCDN = window.WEB_PREFIX + "/base/tinymce/tinymce.min.js";
 
 export default {
-  name: 'Tinymce',
-  components: {VabUpload: () => import('../../components/VabUpload/index.vue')},
+  name: "Tinymce",
+  components: { VabUpload: () => import("../../components/VabUpload/index.vue") },
   props: {
     id: {
       type: String,
       default: function () {
-        return 'vue-tinymce-' + +new Date() + ((Math.random() * 1000).toFixed(0) + '');
-      }
+        return "vue-tinymce-" + +new Date() + ((Math.random() * 1000).toFixed(0) + "");
+      },
     },
     value: {
       type: String,
-      default: ''
+      default: "",
     },
     toolbar: {
       type: Array,
       required: false,
       default() {
         return [];
-      }
+      },
     },
     menubar: {
       type: String,
-      default: 'file edit insert view format table'
+      default: "file edit insert view format table",
     },
     height: {
       type: [Number, String],
       required: false,
-      default: 360
+      default: 360,
     },
     width: {
       type: [Number, String],
       required: false,
-      default: 'auto'
+      default: "auto",
     },
     color: {
       type: String,
-      default: '#1890ff'
+      default: "#1890ff",
     },
     readonly: {
       type: Boolean,
-      default: () => false
+      default: () => false,
     },
   },
   data() {
@@ -83,11 +95,11 @@ export default {
       tinymceId: this.id,
       fullscreen: false,
       languageTypeList: {
-        en: 'en',
-        zh: 'zh_CN',
-        es: 'es_MX',
-        ja: 'ja'
-      }
+        en: "en",
+        zh: "zh_CN",
+        es: "es_MX",
+        ja: "ja",
+      },
     };
   },
   computed: {
@@ -98,14 +110,14 @@ export default {
         return `${width}px`;
       }
       return width;
-    }
+    },
   },
   watch: {
     value(val) {
       if (!this.hasChange && this.hasInit) {
-        this.$nextTick(() => window.tinymce.get(this.tinymceId).setContent(val || ''));
+        this.$nextTick(() => window.tinymce.get(this.tinymceId).setContent(val || ""));
       }
-    }
+    },
   },
   mounted() {
     this.init();
@@ -115,7 +127,7 @@ export default {
       this.isActivated = true;
       this.$nextTick(() => {
         this.initTinymce();
-      })
+      });
     }
   },
   deactivated() {
@@ -127,11 +139,18 @@ export default {
   },
   methods: {
     handleShow(data) {
-      this.$refs['vabUpload'].handleShow(data);
+      this.$baseUpload.open({
+        accept: "image/png, image/jpeg",
+        callback: this.fileConfirm,
+        // pickPrivateProfile:this.pickPrivateProfile,
+        // confirmUpload: this.confirmUpload,
+        // otherParams: this.$attrs,
+      });
+      // this.$refs['vabUpload'].handleShow(data);
     },
     init() {
       // dynamic load tinymce from cdn
-      load(tinymceCDN, err => {
+      load(tinymceCDN, (err) => {
         if (err) {
           this.$message.error(err.message);
           return;
@@ -142,47 +161,47 @@ export default {
     },
     initTinymce() {
       const _this = this;
-      let locale = this.$i18n && this.$i18n.locale ? this.$i18n.locale : 'zh';
+      let locale = this.$i18n && this.$i18n.locale ? this.$i18n.locale : "zh";
       window.tinymce.init({
         selector: `#${this.tinymceId}`,
         language: this.languageTypeList[locale],
         height: this.height,
-        body_class: 'panel-body ',
+        body_class: "panel-body ",
         object_resizing: false,
         toolbar: this.toolbar.length > 0 ? this.toolbar : toolbar,
         menubar: this.menubar,
         plugins: plugins,
         end_container_on_empty_block: true,
-        powerpaste_word_import: 'clean',
+        powerpaste_word_import: "clean",
         code_dialog_height: 450,
         code_dialog_width: 1000,
-        advlist_bullet_styles: 'square',
-        advlist_number_styles: 'default',
-        imagetools_cors_hosts: ['www.tinymce.com', 'codepen.io'],
-        default_link_target: '_blank',
+        advlist_bullet_styles: "square",
+        advlist_number_styles: "default",
+        imagetools_cors_hosts: ["www.tinymce.com", "codepen.io"],
+        default_link_target: "_blank",
         link_title: false,
         nonbreaking_force_tab: true, // inserting nonbreaking space &nbsp; need Nonbreaking Space Plugin
         paste_data_images: true, // 允许粘贴图像
         readonly: this.readonly,
-        init_instance_callback: editor => {
+        init_instance_callback: (editor) => {
           if (_this.value) {
             editor.setContent(_this.value);
           }
           _this.hasInit = true;
-          editor.on('NodeChange Change KeyUp SetContent', () => {
+          editor.on("NodeChange Change KeyUp SetContent", () => {
             this.hasChange = true;
-            this.$emit('input', editor.getContent());
+            this.$emit("input", editor.getContent());
           });
         },
         setup(editor) {
-          editor.on('FullscreenStateChanged', e => {
+          editor.on("FullscreenStateChanged", (e) => {
             _this.fullscreen = e.state;
           });
         },
         // it will try to keep these URLs intact
         // https://www.tiny.cloud/docs-3x/reference/configuration/Configuration3x@convert_urls/
         // https://stackoverflow.com/questions/5196205/disable-tinymce-absolute-to-relative-url-conversions
-        convert_urls: false
+        convert_urls: false,
         // 整合七牛上传
         // images_dataimg_filter(img) {
         //   setTimeout(() => {
@@ -198,31 +217,50 @@ export default {
         //   }, 0);
         //   return img
         // },
-        // images_upload_handler(blobInfo, success, failure, progress) {
-        //   progress(0);
-        //   const token = _this.$store.getters.token;
-        //   getToken(token).then(response => {
-        //     const url = response.data.qiniu_url;
-        //     const formData = new FormData();
-        //     formData.append('token', response.data.qiniu_token);
-        //     formData.append('key', response.data.qiniu_key);
-        //     formData.append('file', blobInfo.blob(), url);
-        //     upload(formData).then(() => {
-        //       success(url);
-        //       progress(100);
-        //     })
-        //   }).catch(err => {
-        //     failure('出现未知问题，刷新页面，或者联系程序员')
-        //     console.log(err);
-        //   });
-        // },
+        images_upload_handler(blobInfo, success, failure, progress) {
+          /* progress(0);
+          _this.$baseUpload.upload({
+            file:blobInfo.blob(),
+            onProgress:(e)=>{
+              progress(e.percent)
+            },
+            callback:(res)=>{
+              if(res.type=="success"){
+                let url =  res.objx.domain + res.objx.url;
+                success(url);
+                progress(100);
+              }else{
+                failure(res.content)
+              }
+            },
+            error:(e)=>{
+              failure(e.message)
+            }
+          }) */
+          /* progress(0);
+          const token = _this.$store.getters.token;
+          getToken(token).then(response => {
+            const url = response.data.qiniu_url;
+            const formData = new FormData();
+            formData.append('token', response.data.qiniu_token);
+            formData.append('key', response.data.qiniu_key);
+            formData.append('file', blobInfo.blob(), url);
+            upload(formData).then(() => {
+              success(url);
+              progress(100);
+            })
+          }).catch(err => {
+            failure('出现未知问题，刷新页面，或者联系程序员')
+            console.log(err);
+          }); */
+        },
       });
     },
     destroyTinymce() {
       if (window.tinymce && window.tinymce.get) {
         const tinymce = window.tinymce.get(this.tinymceId);
         if (this.fullscreen) {
-          tinymce.execCommand('mceFullScreen');
+          tinymce.execCommand("mceFullScreen");
         }
 
         if (tinymce) {
@@ -237,17 +275,21 @@ export default {
       window.tinymce.get(this.tinymceId).getContent();
     },
     imageSuccessCBK(arr) {
-      arr.forEach(v => window.tinymce.get(this.tinymceId).insertContent(`<img class="wscnph" src="${v.url}" >`));
+      arr.forEach((v) =>
+        window.tinymce
+          .get(this.tinymceId)
+          .insertContent(`<img class="wscnph" src="${v.url}" >`)
+      );
     },
     fileConfirm(arr) {
-      let txt = ''
-      arr.forEach(v => {
-        let realUrl = v.fileData.domain + v.fileData.url;
-        txt = txt + '<img class="wscnph" src="' + realUrl + '" >'
+      let txt = "";
+      arr.forEach((v) => {
+        let realUrl = v.domain + v.url;
+        txt = txt + '<img class="wscnph" src="' + realUrl + '" >';
       });
       window.tinymce.get(this.tinymceId).insertContent(`<p>${txt}</p>`);
-    }
-  }
+    },
+  },
 };
 </script>
 
@@ -291,5 +333,4 @@ export default {
 .editor-upload-btn {
   display: inline-block;
 }
-
 </style>

package/src/components/VabUpload/image-viewer.vue

@@ -181,9 +181,9 @@ export default {
         return imageDto;
       } else {
         if (flag == 1) {
-          return imageDto.domain + imageDto.source;
+          return imageDto.domain + imageDto.url;
         } else if (flag == 2) {
-          return imageDto.domain + imageDto.medium;
+          return imageDto.domain + (imageDto.medium || imageDto.url);
         }
       }
     },