cloud-web-corejs 1.0.54-dev.274 → 1.0.54-dev.276

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.274",
+  "version": "1.0.54-dev.276",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/excelExport/index.js

@@ -1,48 +1,48 @@
-import vue from "vue"
-import excelExport from './index.vue'
-
-const moudule = {};
-const ExcelExportInstance = vue.extend(excelExport);
-let instance = null;
-const initInstance = (containter) => {
-  // 实例化vue实例
-  instance = new ExcelExportInstance({i18n: window.$vueRoot._i18n}).$mount();
-  let dom = instance.$el;
-  containter.appendChild(dom);
-  return instance;
-};
-
-function toDo(options) {
-  // let containter = this && this.$el ? this.$el : document.body;
-  // let containter = document.body;
-  let containter = this && this.$el ? this.$el : document.body;
-
-  let vueTarget = this && this.$el ? this : window.$vueRoot;
-  let currentInstance = initInstance(containter);
-  currentInstance.param = {};
-  Object.assign(currentInstance.param, {vue: vueTarget, destroyComponent: destroyComponent}, options);
-  return currentInstance.exc(destroyComponent);
-};
-
-function destroyComponent(loadingObj) {
-  if (instance) {
-    setTimeout(()=>{
-      instance.$destroy(); // 触发销毁生命周期
-      instance.$el.remove(); // 移除 DOM 节点
-      instance = null;
-      setTimeout(function (){
-        loadingObj.close()
-      },200)
-    },0)
-  }
-}
-
-
-// vue的install方法，用于定义vue插件
-moudule.install = function (Vue) {
-  // 在Vue的原型上添加实例方法，以全局调用
-  Vue.prototype.$excelExport = toDo;
-};
-moudule.excelExport = toDo;
-
-export default moudule;
+import vue from "vue"
+import excelExport from './index.vue'
+
+const moudule = {};
+const ExcelExportInstance = vue.extend(excelExport);
+let instance = null;
+const initInstance = (containter) => {
+  // 实例化vue实例
+  instance = new ExcelExportInstance({i18n: window.$vueRoot._i18n}).$mount();
+  let dom = instance.$el;
+  containter.appendChild(dom);
+  return instance;
+};
+
+function toDo(options) {
+  // let containter = this && this.$el ? this.$el : document.body;
+  // let containter = document.body;
+  let containter = this && this.$el ? this.$el : document.body;
+
+  let vueTarget = this && this.$el ? this : window.$vueRoot;
+  let currentInstance = initInstance(containter);
+  currentInstance.param = {};
+  Object.assign(currentInstance.param, {vue: vueTarget, destroyComponent: destroyComponent}, options);
+  return currentInstance.exc(destroyComponent);
+};
+
+function destroyComponent(loadingObj) {
+  if (instance) {
+    setTimeout(()=>{
+      instance.$destroy(); // 触发销毁生命周期
+      instance.$el.remove(); // 移除 DOM 节点
+      instance = null;
+      setTimeout(function (){
+        loadingObj.close()
+      },200)
+    },0)
+  }
+}
+
+
+// vue的install方法，用于定义vue插件
+moudule.install = function (Vue) {
+  // 在Vue的原型上添加实例方法，以全局调用
+  Vue.prototype.$excelExport = toDo;
+};
+moudule.excelExport = toDo;
+
+export default moudule;

package/src/components/excelExport/mixins.js

@@ -124,7 +124,6 @@ function getGrid(that, tableRef) {
             return;
           }
         }
-        this.lockMenu()
 
         this.isMinimize = false;
         this.showExportFieldDialog = true;
@@ -158,6 +157,7 @@ function getGrid(that, tableRef) {
         this.clearExportTimer();
       },
       startProcess() {
+        this.lockMenu();
         this.createCountTimer();
         this.tableTarget = getGrid(this.option.vue, this.option.targetRef);