cloud-web-corejs-haier 1.0.43 → 1.0.44

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs-haier",
   "private": false,
-  "version": "1.0.43",
+  "version": "1.0.44",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",
@@ -25,17 +25,18 @@
     "copy-webpack-plugin": "5.1.2",
     "core-js": "^3.8.3",
     "dayjs": "^1.11.13",
-    "dhtmlx-gantt": "^9.1.0",
+    "dhtmlx-gantt": "^9.1.1",
     "element-ui": "^2.15.14",
     "esdk-obs-browserjs": "^3.25.6",
+    "exceljs": "^4.4.0",
+    "FileSaver": "^0.10.0",
     "html2canvas": "^1.4.1",
     "js-base64": "^3.7.7",
     "js-cookie": "2.2.0",
     "jspdf": "^3.0.1",
     "jsqr": "^1.4.0",
-    "less": "^4.2.0",
-    "less-loader": "^7.0.1",
     "lodash": "4.17.21",
+    "luckyexcel": "^1.0.1",
     "moment": "2.29.4",
     "node-polyfill-webpack-plugin": "^4.0.0",
     "normalize.css": "7.0.0",
@@ -51,7 +52,7 @@
     "vue-router": "3.0.2",
     "vuex": "3.1.0",
     "vxe-table": "3.5.9",
-    "xlsx": "0.14.1"
+    "xlsx": "^0.14.1"
   },
   "devDependencies": {
     "@babel/core": "^7.12.16",
@@ -120,6 +121,7 @@
     "src/components/advancedSearchDialog",
     "src/components/baseAlert",
     "src/components/baseAttachment",
+    "src/components/baseArea",
     "src/components/baseInputBatch",
     "src/components/baseInputExport",
     "src/components/baseInputNumber",
@@ -152,6 +154,7 @@
     "src/components/table",
     "src/components/tempStorage",
     "src/components/Tinymce",
+    "src/components/luckysheet",
     "src/components/obsUpload",
     "src/components/VabUpload",
     "src/components/vb-tabs",
@@ -161,7 +164,6 @@
     "src/components/xform",
     "src/components/xhsPrint",
     "src/components/langTag",
-    "src/components/luckysheet",
     "src/api",
     "src/views/bd",
     "src/views/support",

package/src/api/user.js

@@ -1,107 +1,115 @@
-import request from '@base/utils/request'
+import request from "@base/utils/request";
 
 export function loginYx(option) {
   return request({
-    url: USER_PREFIX + '/auth/login',
-    method: 'post',
-    ...option
-  })
+    url: USER_PREFIX + "/auth/login",
+    method: "post",
+    ...option,
+  });
 }
 
 export function getInfo(option) {
   return request({
-    url: USER_PREFIX + '/user/currentUser',
-    method: 'post',
-    ...option
-  })
+    url: USER_PREFIX + "/user/currentUser",
+    method: "post",
+    ...option,
+  });
 }
 
 export function logout(option) {
   return request({
-    url: USER_PREFIX + '/auth/logout',
-    method: 'post',
-    ...option
-  })
+    url: USER_PREFIX + "/auth/logout",
+    method: "post",
+    ...option,
+  });
 }
 
 export function saveAccessMenuLog(option) {
   return request({
-    url: USER_PREFIX + '/access_log/saveAccessMenuLog',
-    method: 'post',
-    ...option
-  })
+    url: USER_PREFIX + "/access_log/saveAccessMenuLog",
+    method: "post",
+    ...option,
+  });
 }
 
 export function getLoginTp(duration, option) {
   return request({
-    url: USER_PREFIX + '/thirdparty_auth/getTp',
-    method: 'post',
+    url: USER_PREFIX + "/thirdparty_auth/getTp",
+    method: "post",
     isLoading: true,
-    data: {duration: duration},
-    ...option
-  })
+    data: { duration: duration },
+    ...option,
+  });
 }
 
 export function loginByTp(tp, option) {
   return request({
-    url: USER_PREFIX + '/thirdparty_auth/login',
-    method: 'post',
+    url: USER_PREFIX + "/thirdparty_auth/login",
+    method: "post",
     isLoading: true,
     useToken: false,
-    data: {tp: tp},
-    ...option
-  })
+    data: { tp: tp },
+    ...option,
+  });
 }
 
 export function getParameterVauleByCode(option) {
   //初始化外部用户编码
   return request({
-    url: USER_PREFIX + '/system_parameter/getByCode',
-    method: 'post',
-    ...option
+    url: USER_PREFIX + "/system_parameter/getByCode",
+    method: "post",
+    ...option,
   });
 }
 
 export function languageSettingListPage(option) {
   //获取语种
   return request({
-    url: USER_PREFIX + '/language_setting/listPage',
-    method: 'post',
+    url: USER_PREFIX + "/language_setting/listPage",
+    method: "post",
     data: {
-      enabled: true
+      enabled: true,
     },
-    ...option
+    ...option,
   });
 }
 
 export function getBdEnv(option) {
   return request({
     url: USER_PREFIX + `/form_develop/getBdEnv`,
-    method: 'post',
-    ...option
-  })
+    method: "post",
+    ...option,
+  });
 }
 
 export function getBdFlag(option) {
   return request({
     url: USER_PREFIX + `/form_develop/getBdFlag`,
-    method: 'post',
-    ...option
-  })
+    method: "post",
+    ...option,
+  });
 }
 
-export function getFileServerInfo(option){
+export function getFileServerInfo(option) {
   return request({
     url: USER_PREFIX + "/logic_param/getFileServerInfo",
     method: "post",
-    ...option
-  })
+    ...option,
+  });
 }
 
-export function getLoginConfig(option){
+export function getLoginConfig(option) {
   return request({
     url: USER_PREFIX + "/login_page/readData",
     method: "post",
-    ...option
-  })
+    ...option,
+  });
+}
+
+export function getLogicParamValue(option) {
+  return request({
+    url: USER_PREFIX + "/logic_param/getParamValue",
+    method: "post",
+    ...option,
+  });
 }

package/src/components/baseAlert/index.vue

@@ -1,53 +1,57 @@
-<template>
-  <div v-if="!$baseEventBus.isMobile">
-    <el-dialog
-      :title="title!=null?title:$t2('提示', 'components.baseAlert.title')"
-      :visible.sync="showWrap"
-      v-if="showWrap"
-      :close-on-click-modal="false"
-      width="501px"
-      custom-class="dialog-style tips-dialog warning"
-      v-el-drag-dialog
-      @close="closeDialog"
-    >
-      <div class="cont" ref="cont">
-        {{ content }}
-      </div>
-      <span slot="footer" class="dialog-footer">
-       <input type="text" ref="hbtn" style="position: absolute;left: -999px;top: -999px;"/>
-	     <el-button type="primary" @click="resolve()" class="button-sty"><i
-         class="el-icon-check el-icon"></i>{{ $t2('确 定', 'system.button.confirm2') }}</el-button>
-	   </span>
-    </el-dialog>
-  </div>
-  <div v-else-if="showWrap">
-    <div class="pop-tipsBox" :style="'display: block;z-index:'+zIndex">
-      <div>
-        <i class="icon"></i>
-        <div class="cont">
-          <p class="name">{{title!=null?title:$t2('提示', 'components.baseAlert.title')}}</p>
-          <p class="txt" v-html="content"></p>
-        </div>
-        <div class="btns">
-          <el-button type="primary" class="btn" @click="resolve()">{{ $t2('确 定', 'system.button.confirm2') }}</el-button>
-        </div>
-      </div>
-    </div>
-  </div>
-
-
-
-</template>
-
-<script>
-import {
-  mixins
-} from './mixins'
-
-export default {
-  mixins: [mixins]
-}
-</script>
-
-<style>
-</style>
+<template>
+  <div v-if="!$baseEventBus.isMobile">
+    <el-dialog
+      :title="title != null ? title : $t2('提示', 'components.baseAlert.title')"
+      :visible.sync="showWrap"
+      v-if="showWrap"
+      :close-on-click-modal="false"
+      width="501px"
+      custom-class="dialog-style tips-dialog warning"
+      v-el-drag-dialog
+      @close="closeDialog"
+    >
+      <div class="cont" ref="cont">
+        <p v-html="content"></p>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <input
+          type="text"
+          ref="hbtn"
+          style="position: absolute; left: -999px; top: -999px"
+        />
+        <el-button type="primary" @click="resolve()" class="button-sty"
+          ><i class="el-icon-check el-icon"></i
+          >{{ $t2("确 定", "system.button.confirm2") }}</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
+  <div v-else-if="showWrap">
+    <div class="pop-tipsBox" :style="'display: block;z-index:' + zIndex">
+      <div>
+        <i class="icon"></i>
+        <div class="cont">
+          <p class="name">
+            {{ title != null ? title : $t2("提示", "components.baseAlert.title") }}
+          </p>
+          <p class="txt" v-html="content"></p>
+        </div>
+        <div class="btns">
+          <el-button type="primary" class="btn" @click="resolve()">{{
+            $t2("确 定", "system.button.confirm2")
+          }}</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mixins } from "./mixins";
+
+export default {
+  mixins: [mixins],
+};
+</script>
+
+<style></style>

package/src/components/baseInputExport/index.vue

@@ -7,12 +7,12 @@
     <el-dropdown-menu slot="dropdown">
       <template v-for="(item, index) in exportTemplates">
         <el-dropdown-item
-          v-if="item.etType == 0 || item.etType == 1 || item.etType == 5"
+          v-if="exportTypes.includes(item.etType)"
           icon="el-icon-upload2"
           :command="item"
           :key="index"
         >
-          {{ item.etName }}
+          {{ $t1(item.etName) }}
         </el-dropdown-item>
         <el-dropdown-item
           v-else-if="printTypes.includes(item.etType)"
@@ -20,7 +20,7 @@
           :command="item"
           :key="index"
         >
-          {{ item.etName }}
+          {{ $t1(item.etName) }}
         </el-dropdown-item>
       </template>
     </el-dropdown-menu>

package/src/components/baseTabs/mixins.js

@@ -75,7 +75,18 @@ baseTabsMixin = {
       this.currentValue = name;
       this.$emit('input', name);
       this.$emit('on-click', name);
-      this.getTabs()[index].$el.scrollIntoView();
+      let target = this.getTabs()[index].$el;
+      let scrollContainer = Array.prototype.find.call(
+        this.$el.children,
+        item => item.classList && item.classList.contains('d-cont')
+      );
+      if (scrollContainer) {
+        let containerRect = scrollContainer.getBoundingClientRect();
+        let targetRect = target.getBoundingClientRect();
+        scrollContainer.scrollTop += targetRect.top - containerRect.top;
+      } else {
+        target.scrollIntoView();
+      }
     }
   },
   watch: {

package/src/components/errorMsg/index.vue

@@ -1,78 +1,78 @@
-<template>
-  <div v-if="!$baseEventBus.isMobile">
-    <el-dialog
-      :title="title"
-      :visible.sync="showWrap"
-      v-if="showWrap"
-      :close-on-click-modal="false"
-      width="501px"
-      custom-class="dialog-style tips-dialog error"
-      :append-to-body="true"
-      :modal="false"
-      @close="closeDialog"
-      v-el-drag-dialog
-    >
-      <div class="cont">
-        <p v-if="!rmid">Error：</p>
-        <p v-if="rmid">Error（{{ rmid }}）：</p>
-        <template v-if="!showTextFlag">
-          <p v-html="text1"></p>
-        </template>
-        <p v-if="showTextFlag" v-html="text2"></p>
-        <a href="javascript:void(0);" @click="showTextFlag = !showTextFlag">{{
-          !showTextFlag
-            ? $t2("详情", "components.errorMsg.detail")
-            : $t2("收起", "components.errorMsg.collapse")
-        }}</a>
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <input
-          type="text"
-          ref="hbtn"
-          style="position: absolute; left: -999px; top: -999px"
-        />
-        <el-button type="primary" @click="closeDialog" class="button-sty"
-          ><i class="el-icon-check el-icon"></i
-          >{{ $t2("确 定", "system.button.confirm2") }}</el-button
-        >
-      </span>
-    </el-dialog>
-  </div>
-  <div v-else-if="showWrap">
-    <div class="pop-tipsBox error" :style="'display: block;z-index:' + zIndex">
-      <div>
-        <i class="icon"></i>
-        <div class="cont">
-          <p class="name">{{ title }}</p>
-          <p class="txt" v-if="!rmid">Error：</p>
-          <p class="txt" v-if="rmid">Error（{{ rmid }}）：</p>
-          <template v-if="!showTextFlag">
-            <p class="txt">{{ text1 }}</p>
-          </template>
-          <p class="txt" v-if="showTextFlag" v-html="text2"></p>
-          <a href="javascript:void(0);" @click="showTextFlag = !showTextFlag">{{
-            !showTextFlag
-              ? $t2("详情", "components.errorMsg.detail")
-              : $t2("收起", "components.errorMsg.collapse")
-          }}</a>
-        </div>
-        <div class="btns">
-          <el-button type="primary" class="btn" @click="closeDialog">{{
-            $t2("确 定", "system.button.confirm2")
-          }}</el-button>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { mixins } from "./mixins";
-
-export default {
-  // name: 'errorMsg',
-  mixins: [mixins],
-};
-</script>
-
-<style></style>
+<template>
+  <div v-if="!$baseEventBus.isMobile">
+    <el-dialog
+      :title="title"
+      :visible.sync="showWrap"
+      v-if="showWrap"
+      :close-on-click-modal="false"
+      width="501px"
+      custom-class="dialog-style tips-dialog error"
+      :append-to-body="true"
+      :modal="false"
+      @close="closeDialog"
+      v-el-drag-dialog
+    >
+      <div class="cont">
+        <p v-if="!rmid">Error：</p>
+        <p v-if="rmid">Error（{{ rmid }}）：</p>
+        <template v-if="!showTextFlag">
+          <p v-html="text1"></p>
+        </template>
+        <p v-if="showTextFlag" v-html="text2"></p>
+        <a href="javascript:void(0);" @click="showTextFlag = !showTextFlag">{{
+          !showTextFlag
+            ? $t2("详情", "components.errorMsg.detail")
+            : $t2("收起", "components.errorMsg.collapse")
+        }}</a>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <input
+          type="text"
+          ref="hbtn"
+          style="position: absolute; left: -999px; top: -999px"
+        />
+        <el-button type="primary" @click="closeDialog" class="button-sty"
+          ><i class="el-icon-check el-icon"></i
+          >{{ $t2("确 定", "system.button.confirm2") }}</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
+  <div v-else-if="showWrap">
+    <div class="pop-tipsBox error" :style="'display: block;z-index:' + zIndex">
+      <div>
+        <i class="icon"></i>
+        <div class="cont">
+          <p class="name">{{ title }}</p>
+          <p class="txt" v-if="!rmid">Error：</p>
+          <p class="txt" v-if="rmid">Error（{{ rmid }}）：</p>
+          <template v-if="!showTextFlag">
+            <p class="txt">{{ text1 }}</p>
+          </template>
+          <p class="txt" v-if="showTextFlag" v-html="text2"></p>
+          <a href="javascript:void(0);" @click="showTextFlag = !showTextFlag">{{
+            !showTextFlag
+              ? $t2("详情", "components.errorMsg.detail")
+              : $t2("收起", "components.errorMsg.collapse")
+          }}</a>
+        </div>
+        <div class="btns">
+          <el-button type="primary" class="btn" @click="closeDialog">{{
+            $t2("确 定", "system.button.confirm2")
+          }}</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mixins } from "./mixins";
+
+export default {
+  // name: 'errorMsg',
+  mixins: [mixins],
+};
+</script>
+
+<style></style>