qj-common 4.2.1 → 4.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qj-common",
-  "version": "4.2.1",
+  "version": "4.2.3",
   "description": "common files && template for qj-paas",
   "scripts": {
     "gulp": "gulp css"

package/src/permission.js

@@ -2,7 +2,7 @@
 import main from '#/main';
 
 // White List
-const whiteList = [`b2b.heidelbergchina.com`,`uatb2b.heidelbergchina.com`];
+const whiteList = [`b2b.heidelbergchina.com`, `uatb2b.heidelbergchina.com`];
 
 // Executor
 main(({ menuActions }, { proApp, router, store, _import, _import_common, NProgress, PageNotFound, domCreate, interceptor, queryParams, getActiveMenu, generateRoutesFromMenu }) => {
@@ -30,7 +30,7 @@ main(({ menuActions }, { proApp, router, store, _import, _import_common, NProgre
     }
 
     // Dispatch GetAppInfo
-    store.dispatch('GetAppInfo').then(res => {
+    store.dispatch('GetAppInfo').then((res) => {
       // Get App Path
       const appPath = process.env.APP_PATH;
 
@@ -46,7 +46,7 @@ main(({ menuActions }, { proApp, router, store, _import, _import_common, NProgre
       if (menuList) {
         // Current Routes
         if (menuList.routerMap[appPath]) {
-          return menuList.routerMap[appPath].forEach(el => {
+          return menuList.routerMap[appPath].forEach((el) => {
             handleRouter(el.children);
           });
         }
@@ -56,10 +56,10 @@ main(({ menuActions }, { proApp, router, store, _import, _import_common, NProgre
       }
 
       // No Storage
-      store.dispatch('GetAppRouter').then(menuList => {
+      store.dispatch('GetAppRouter').then((menuList) => {
         // Current Routes
         if (menuList.routerMap[appPath]) {
-          return menuList.routerMap[appPath].forEach(el => {
+          return menuList.routerMap[appPath].forEach((el) => {
             handleRouter(el.children);
           });
         }
@@ -87,7 +87,7 @@ main(({ menuActions }, { proApp, router, store, _import, _import_common, NProgre
       const menu = {};
 
       // Set Menu
-      menuList && menuList.forEach(element => (menu[element.proappModelCode] = element.children));
+      menuList && menuList.forEach((element) => (menu[element.proappModelCode] = element.children));
 
       // Set Code
       menuCode(menuList);
@@ -101,7 +101,7 @@ main(({ menuActions }, { proApp, router, store, _import, _import_common, NProgre
         return;
       }
 
-      data.forEach(item => {
+      data.forEach((item) => {
         if (item.menuCode === 'P0000111') {
           return window.sessionStorage.setItem('menuAction', item.menuAction);
         }
@@ -153,10 +153,10 @@ main(({ menuActions }, { proApp, router, store, _import, _import_common, NProgre
       const noneLayout = [];
 
       // Check Action by Preset
-      data.forEach(e => (menuActions.includes(e.menuAction) ? noneLayout.push(e) : dataLayout.push(e)));
+      data.forEach((e) => (menuActions.includes(e.menuAction) ? noneLayout.push(e) : dataLayout.push(e)));
 
       // Check First for No Data
-      noneLayout.forEach(item => {
+      noneLayout.forEach((item) => {
         // 只做一级
         menus.push({
           path: '/' + item.menuAction,
@@ -228,30 +228,56 @@ main(({ menuActions }, { proApp, router, store, _import, _import_common, NProgre
     if (!proappEnvLayout) {
       return;
     }
-
-    // Extension Link of 1 ?
-    const link = document.getElementsByTagName('link')[1];
-
+    let arr = document.getElementsByTagName('link') || [];
+    let link, head;
     // Get Head
-    const head = document.getElementsByTagName('head')[0];
-
-    // Set Href of Link
-    link.href = '';
-    link.href = proappEnvLayout.proappEnvIconUrl;
-
-    // Extension Metas
-    const keywords = domCreate('meta', {
-      name: 'keywords',
-      content: proappEnvLayout.proappEnvDes,
-    });
+    if (Array.isArray(arr)) {
+      head = document.getElementsByTagName('head')[0];
+      // Extension Metas
+      const keywords = domCreate('meta', {
+        name: 'keywords',
+        content: proappEnvLayout.proappEnvDes,
+      });
 
-    const description = domCreate('meta', {
-      name: 'description',
-      content: proappEnvLayout.proappEnvDes,
-    });
+      const description = domCreate('meta', {
+        name: 'description',
+        content: proappEnvLayout.proappEnvDes,
+      });
 
-    // Insert
-    head.appendChild(keywords);
-    head.appendChild(description);
+      // Insert
+      head.appendChild(keywords);
+      head.appendChild(description);
+    }
+    if (Array.isArray(arr) && arr.length > 1) {
+      // Extension Link of 1 ?
+      link = document.getElementsByTagName('link')[1];
+      // Set Href of Link
+      link.href = '';
+      link.href = proappEnvLayout.proappEnvIconUrl;
+    }
+    // // Extension Link of 1 ?
+    // const link = document.getElementsByTagName('link')[1];
+
+    // // Get Head
+    // const head = document.getElementsByTagName('head')[0];
+
+    // // Set Href of Link
+    // link.href = '';
+    // link.href = proappEnvLayout.proappEnvIconUrl;
+
+    // // Extension Metas
+    // const keywords = domCreate('meta', {
+    //   name: 'keywords',
+    //   content: proappEnvLayout.proappEnvDes,
+    // });
+
+    // const description = domCreate('meta', {
+    //   name: 'description',
+    //   content: proappEnvLayout.proappEnvDes,
+    // });
+
+    // // Insert
+    // head.appendChild(keywords);
+    // head.appendChild(description);
   });
 });

package/src/views/templates/templateInput.vue

@@ -3,9 +3,9 @@
     <h3 class="template-title" v-if="title">
       <p>{{ title }}</p>
     </h3>
-    <el-form v-if="temInputPack" :model="ruleForm" :rules="rules ? rules : {}" ref="ruleForm" :label-width="labelWidth ? labelWidth : '10rem'" class="demo-ruleForm">
+    <el-form v-if="temInput" :model="ruleForm" :rules="rules ? rules : {}" ref="ruleForm" :label-width="labelWidth ? labelWidth : '10rem'" class="demo-ruleForm">
       <el-form-item
-        v-for="(item, index) in temInputPack"
+        v-for="(item, index) in temInput"
         :key="index"
         v-if="('state' in item ? item.state : true) && ('btnArray' in item ? true : 'label' in item)"
         :label="'label' in item && ('state' in item ? item.state : true) ? item.label + '：' : ''"
@@ -121,7 +121,7 @@ import tempSelect from './components/temp-select';
 import tempUpload from './components/temp-upload';
 const querystring = require('querystring');
 export default {
-  props: ['temInputPack', 'rules', 'labelWidth', 'tabState', 'title'],
+  props: ['temInput', 'rules', 'labelWidth', 'tabState', 'title'],
   components: {
     tempSelect,
     tempUpload,
@@ -194,7 +194,7 @@ export default {
     setReset() {
       //数据重置
       this.$refs['ruleForm'].resetFields();
-      this.temInputPack.forEach((el) => {
+      this.temInput.forEach((el) => {
         if ('label' in el) {
           if (el.type === 'cascader') {
             el.value = [];
@@ -220,7 +220,7 @@ export default {
         this.tabState.value = this.ruleForm[this.tabState.name];
         for (let i in this.tabState.dataTemplate) {
           if (i === this.tabState.value) {
-            this.temInputPack.forEach((el) => {
+            this.temInput.forEach((el) => {
               if ('state' in el) {
                 if (this.tabState.dataTemplate[i].includes(el.name)) {
                   el.state = true; //是否显示
@@ -248,7 +248,7 @@ export default {
         if (valid) {
           if (url) {
             let data = JSON.parse(JSON.stringify(this.ruleForm)); //去除数据的双向绑定
-            this.temInputPack.forEach((el) => {
+            this.temInput.forEach((el) => {
               if ('label' in el) {
                 if (el.type === 'cascader') {
                   if (el.value.length > 0) {
@@ -316,7 +316,7 @@ export default {
     selChange(val, item) {
       //select选中的事件
       console.log(item, '目前选中的值');
-      console.log(this.temInputPack);
+      console.log(this.temInput);
       this.$emit('selChange', val, item);
     },
   },
@@ -324,8 +324,8 @@ export default {
     ruleForm: {
       get() {
         let ruleForm = {};
-        // console.log(this.temInputPack, "ccccccccccccccc");
-        this.temInputPack.forEach((el) => {
+        // console.log(this.temInput, "ccccccccccccccc");
+        this.temInput.forEach((el) => {
           if ('state' in el) {
             el.state && el.name ? this.$set(ruleForm, el.name, el.value) : '';
           } else {

package/src/views/templates/templateTable.vue

@@ -549,7 +549,7 @@
         <template-input
           :labelWidth="dialogData.template.labelWidth"
           :rules="dialogData.template.rules"
-          :temInputPack="dialogData.template.html"
+          :temInput="dialogData.template.html"
           @cancel="dialogCancel"
           @getData="getDataList"
           @handleSelect="handleSelect"