eoss-ui 0.5.12 → 0.5.13

package/packages/data-table/src/main.vue

@@ -415,7 +415,13 @@ export default {
       type: Boolean,
       default: true
     },
-    zoom: false
+    zoom: false,
+    exportExcludeLabel: {
+      type: Array,
+      default() {
+        return [];
+      }
+    }
   },
   data() {
     return {
@@ -581,6 +587,11 @@ export default {
         this.config = util.extend({}, this.config, this.page);
       }
     },
+    'config.pageNum'() {
+      if (this.data.length) {
+        this.$refs.oaTable.resetScroll(0, 0);
+      }
+    },
     height: {
       immediate: true,
       handler(val) {
@@ -822,10 +833,16 @@ export default {
         this.config.pageNum = 1;
       }
       this.tableLoadingText = '加载中...';
-      let reqData = util.extend({}, this.param, {
-        pageNum: this.config.pageNum,
-        pageSize: this.config.pageSize
-      });
+      let reqData = util.extend(
+        {},
+        this.param,
+        this.page
+          ? {
+              pageNum: this.config.pageNum,
+              pageSize: this.config.pageSize
+            }
+          : {}
+      );
       if (where) {
         reqData = util.extend({}, reqData, where);
       }
@@ -841,6 +858,7 @@ export default {
         .then((res) => {
           this.tableLoading = false;
           if (res.rCode === 0 || res.status === 'success') {
+            this.$refs.oaTable.resetScroll(0, 0);
             let results =
               this.parseData !== undefined
                 ? this.parseData(res.results || res.data || res)
@@ -1153,9 +1171,14 @@ export default {
           ) {
             text = this.theads[this.theads.length - 1].title;
           }
+          let type = ['selection', 'index', 'expand'];
           thead = thead.map((item) => {
             return item.filter((ele) => {
-              return ele.label !== text && ele.label;
+              return (
+                !type.includes(ele.type) &&
+                ele.label !== text &&
+                !this.exportExcludeLabel.includes(ele.label)
+              );
             });
           });
           util.exportXls({

package/packages/flow/src/component/taskUnionExamine.vue

@@ -448,7 +448,7 @@ export default {
       util
         .ajax({
           url: findCodeValues,
-          params: { ccCode: 'notification_type' }
+          params: { ccCode: 'notification_type',userId:util.getStorage('userId') }
         })
         .then((res) => {
           const { status, data } = res;

package/packages/flow/src/main.vue

@@ -1197,7 +1197,7 @@ export default {
       util
         .ajax({
           url: findCodeValues,
-          params: { ccCode: 'notification_type' }
+          params: { ccCode: 'notification_type',userId:util.getStorage('userId') }
         })
         .then((res) => {
           const { status, data } = res;

package/packages/flow/src/processForm.vue

@@ -482,7 +482,7 @@ export default {
       util
         .ajax({
           url: findCodeValues,
-          params: { ccCode: 'notification_type' }
+          params: { ccCode: 'notification_type',userId:util.getStorage('userId') }
         })
         .then((res) => {
           const { status, data } = res;

package/packages/flow/src/processReject.vue

@@ -131,7 +131,7 @@ export default {
       util
         .ajax({
           url: findCodeValues,
-          params: { ccCode: 'notification_type' }
+          params: { ccCode: 'notification_type',userId:util.getStorage('userId') }
         })
         .then(res => {
           const { status, data } = res;

package/packages/flow/src/startTaskRead.vue

@@ -384,7 +384,7 @@ export default {
       util
         .ajax({
           url: findCodeValues,
-          params: { ccCode: 'notification_type' }
+          params: { ccCode: 'notification_type',userId:util.getStorage('userId') }
         })
         .then((res) => {
           const { status, data } = res;

package/packages/label/src/main.vue

@@ -10,6 +10,7 @@ export default {
         return '';
       }
     },
+    text: String,
     rules: {
       type: [Array, Object],
       default() {
@@ -132,8 +133,8 @@ export default {
         doms.push(this.$slots.prepend);
       }
       if (typeof this.contents === 'string') {
-        if (this.contents) {
-          doms.push(this.contents);
+        if (this.contents || this.text) {
+          doms.push(this.contents || this.text);
         }
         if (this.icon) {
           if (

package/packages/main/src/main.vue

@@ -819,6 +819,9 @@ export default {
       this.showSet = !this.showSet;
     },
     setConfig(results, flag) {
+      if (this.socket) {
+        this.initWebSocket();
+      }
       if (flag) {
         sessionStorage.setItem('mainConfig', JSON.stringify(results));
         util.setStorage({
@@ -934,9 +937,6 @@ export default {
         .then((res) => {
           if (res && res.rCode === 0) {
             this.setConfig(res.results, 1);
-            if (this.socket) {
-              this.initWebSocket();
-            }
             if (this.remote) {
               this.getMenu();
             } else {
@@ -1903,7 +1903,9 @@ export default {
             }
           }
           if (this.$store) {
-            this.$store.commit('websocket', data);
+            try {
+              this.$store.commit('websocket', data);
+            } catch (error) {}
           }
           if (this.$eventBus) {
             this.$eventBus.$emit('websocket', data);