eoss-ui 0.5.12 → 0.5.14

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

@@ -1,7 +1,6 @@
 <template>
   <component
     :is="tag"
-    ref="esTableForm"
     class="es-data-table"
     label-width="0"
     v-loading="tableLoading"
@@ -61,85 +60,22 @@
       >
         <slot name="prepend"></slot>
         <slot></slot>
-        <el-table-column
-          v-if="checkbox"
-          v-bind="{
-            type: 'selection',
-            width: '55',
-            align: 'center',
-            fixed: 'left',
-            selectable: selectable,
-            reserveSelection: reserveSelection,
-            filterIcon: getIcon()
-          }"
-        ></el-table-column>
-        <el-table-column
-          v-if="numbers"
-          v-bind="{
-            type: 'index',
-            label: '序号',
-            width: '70',
-            align: 'center',
-            fixed: 'left',
-            index:
-              index === true
-                ? (config.pageNum - 1) * config.pageSize + 1
-                : index === false
-                ? 1
-                : index,
-            filterIcon: getIcon()
-          }"
-        ></el-table-column>
-        <template v-for="(items, indexs) in theads">
-          <template v-if="items.hide !== true">
+        <template v-for="(item, index) in theads">
+          <template v-if="item.hide !== true">
             <el-table-column
-              v-if="items.type === 'index'"
-              :key="indexs"
-              v-bind="{
-                type: 'index',
-                label: '序号',
-                width: '70',
-                align: 'center',
-                fixed: 'left',
-                index:
-                  index === true
-                    ? (config.pageNum - 1) * config.pageSize + 1
-                    : index === false
-                    ? 1
-                    : index,
-                filterIcon: getIcon(),
-                ...items
-              }"
-            ></el-table-column>
-            <el-table-column
-              v-else-if="items.type === 'selection'"
-              :key="indexs"
-              v-bind="{
-                type: 'selection',
-                width: '55',
-                align: 'center',
-                fixed: 'left',
-                selectable: selectable,
-                reserveSelection: reserveSelection,
-                filterIcon: getIcon(),
-                ...items
-              }"
+              v-if="item.type === 'index' || item.type === 'selection'"
+              :key="index"
+              v-bind="item"
             ></el-table-column>
             <children
               v-else
-              :key="indexs"
+              :key="item.label || item.title"
               v-bind="{
                 name: name,
-                item: items,
-                width: items.width,
-                index: indexs,
-                readonly: readonly,
-                optionData: optionDatas,
+                indexs: index,
                 form: form,
-                minWidth: minWidth,
-                filterIcon: getIcon(items.fixed),
-                children: items.children,
-                childHead: items.childHead
+                optionData: optionDatas,
+                ...item
               }"
               v-on="{
                 handleClick: handleClick,
@@ -204,6 +140,7 @@ import sizer from './sizer.vue';
 import util from 'eoss-ui/src/utils/util';
 import bus from 'eoss-ui/src/utils/bus';
 import qs from 'qs';
+import itemVue from '../../layout/src/item.vue';
 export default {
   name: 'EsDataTable',
   inheritAttrs: false,
@@ -311,10 +248,6 @@ export default {
       type: String,
       default: 'id'
     },
-    sizer: {
-      type: Boolean,
-      default: true
-    },
     // 无数据时显示的文本
     emptyText: {
       type: String,
@@ -415,7 +348,13 @@ export default {
       type: Boolean,
       default: true
     },
-    zoom: false
+    zoom: false,
+    exportExcludeLabel: {
+      type: Array,
+      default() {
+        return [];
+      }
+    }
   },
   data() {
     return {
@@ -442,7 +381,8 @@ export default {
       selected: null,
       options: {},
       icon: true,
-      show: true
+      show: true,
+      sysCodes: []
     };
   },
   computed: {
@@ -451,12 +391,38 @@ export default {
     },
     theads: {
       get() {
+        let thead = [];
+        if (this.checkbox) {
+          thead.push({
+            type: 'selection',
+            width: '55',
+            align: 'center',
+            fixed: 'left',
+            selectable: this.selectable,
+            reserveSelection: this.reserveSelection
+          });
+        }
+        if (this.numbers) {
+          thead.push({
+            type: 'index',
+            label: '序号',
+            width: '70',
+            align: 'center',
+            fixed: 'left',
+            index:
+              this.index === true
+                ? (this.config.pageNum - 1) * this.config.pageSize + 1
+                : this.index === false
+                ? 1
+                : this.index
+          });
+        }
         if (this.theadData.length) {
-          this.setMinWidth(this.theadData);
-          return this.theadData;
+          thead = [...thead, ...this.theadData];
+        } else {
+          thead = [...thead, ...this.thead];
         }
-        this.setMinWidth(this.thead);
-        return this.thead;
+        return thead;
       },
       set(val) {
         return val;
@@ -514,9 +480,10 @@ export default {
     },
     optionDatas: {
       get() {
-        return this.optionData
+        let data = this.optionData
           ? { ...this.optionData, ...this.options }
           : this.options;
+        return data;
       },
       set(val) {
         return val;
@@ -578,7 +545,22 @@ export default {
       immediate: true,
       deep: true,
       handler(val) {
-        this.config = util.extend({}, this.config, this.page);
+        if (typeof val === 'object') {
+          this.config = util.extend({}, this.config, val);
+        } else {
+          this.config = {
+            pageNum: 1,
+            pageSize: 20,
+            totalCount: 0
+          };
+        }
+      }
+    },
+    'config.pageNum'() {
+      if (this.data.length) {
+        this.$refs.oaTable &&
+          this.$refs.oaTable.resetScroll &&
+          this.$refs.oaTable.resetScroll(0, 0);
       }
     },
     height: {
@@ -620,38 +602,11 @@ export default {
       const { method, url, params, data } = config;
       return [method, url, qs.stringify(params), qs.stringify(data)].join('&');
     },
-    getIcon(res) {
-      if (
-        this.sizer &&
-        this.icon &&
-        res !== 'right' &&
-        !this.$slots.prepend &&
-        !this.$slots.append &&
-        !this.$slots.default &&
-        !this.form
-      ) {
-        this.icon = false;
-        return 'es-icon-biao';
-      }
-      return false;
-    },
-    setMinWidth(obj) {
-      obj.forEach((item) => {
-        if (item.childHead && item.childHead.length) {
-          this.setMinWidth(item.childHead);
-        } else if (item.children && item.children.length) {
-          this.setMinWidth(item.children);
-        } else if (!item.width && !item.minWidth && item.title) {
-          let width = item.title.length * 14 + 20;
-          if (width > 80) {
-            this.$set(item, 'minWidth', width);
-          }
-        }
-      });
-    },
     getOptions(res) {
+      let sysCodes = [];
       res.forEach((item) => {
         if (item.sysCode || item.url) {
+          item.sysCode && sysCodes.push(item.sysCode);
           let params = util.extend(
             {},
             item.sysCode ? { sysAppCode: item.sysCode } : {},
@@ -674,15 +629,29 @@ export default {
               .then((res) => {
                 if (res.rCode === 0) {
                   if (item.type == 'ganged') {
-                    this.$set(this.options, item.field || item.prop, [
-                      JSON.parse(JSON.stringify(res.results))
-                    ]);
+                    this.$set(
+                      this.options,
+                      item.sysCode || item.field || item.prop,
+                      [JSON.parse(JSON.stringify(res.results))]
+                    );
+                    if (item.sysCode) {
+                      bus.$emit(
+                        item.sysCode,
+                        JSON.parse(JSON.stringify(this.options[item.sysCode]))
+                      );
+                    }
                   } else {
                     this.$set(
                       this.options,
-                      item.field || item.prop,
+                      item.sysCode || item.field || item.prop,
                       JSON.parse(JSON.stringify(res.results))
                     );
+                    if (item.sysCode) {
+                      bus.$emit(
+                        item.sysCode,
+                        JSON.parse(JSON.stringify(res.results))
+                      );
+                    }
                   }
                   this.requests.push(key);
                 } else {
@@ -705,6 +674,9 @@ export default {
           }
         }
       });
+      this.sysCodes = sysCodes;
+
+      this.bindEventBus();
     },
     checkObject(item) {
       return util.getObjectType(item) === 'object';
@@ -822,10 +794,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 +819,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 +1132,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({
@@ -1313,7 +1297,7 @@ export default {
       });
     },
     validate(callback) {
-      let form = this.elForm || this.$refs.esTableForm;
+      let form = this.elForm || this.$el;
       form.validate((valid) => {
         callback(valid);
       });
@@ -1339,6 +1323,21 @@ export default {
       setTimeout(() => {
         this.show = true;
       }, 100);
+    },
+    setOptions(val, sysCode) {
+      this.$set(this.options, sysCode, val);
+    },
+    bindEventBus() {
+      this.sysCodes.forEach((item) => {
+        bus.$on(item, (val) => {
+          this.setOptions(val, item);
+        });
+      });
+    },
+    unbindEventBus() {
+      this.sysCodes.forEach((item) => {
+        bus.$off(item, this.setOptions);
+      });
     }
   }
 };

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/form/src/main.vue

@@ -3876,8 +3876,7 @@ export default {
   inheritAttrs: false,
   provide() {
     return {
-      esForm: this,
-      sysCodes: this.sysCodes
+      esForm: this
     };
   },
   inject: {
@@ -4051,8 +4050,7 @@ export default {
       newHeight: null,
       uuid: util.uuid(32),
       dialog: false,
-      refresh: true,
-      sysCodes: {}
+      refresh: true
     };
   },
   computed: {
@@ -5149,9 +5147,6 @@ export default {
         data: data,
         attrs: attrs
       });
-    },
-    setSysCodes(name, value) {
-      this.$set(this.sysCodes, name, value);
     }
   }
 };

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);

package/packages/radio-group/src/main.vue

@@ -58,15 +58,13 @@
 import { findSysCode } from 'eoss-ui/src/config/api.js';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
+import bus from 'eoss-ui/src/utils/bus';
 export default {
   name: 'EsRadioGroup',
   inheritAttrs: false,
   inject: {
     esForm: {
       default: ''
-    },
-    sysCodes: {
-      default: ''
     }
   },
   props: {
@@ -221,30 +219,11 @@ export default {
       handler() {
         this.url && this.getData(this.url);
       }
-    },
-    sysCodes: {
-      deep: true,
-      handler(val) {
-        if (
-          this.canceled &&
-          val &&
-          ((this.sysCode && val[this.sysCode]) ||
-            (this.dataKey && val[this.dataKey]))
-        ) {
-          if (this.parseData) {
-            this.options = this.parseData(
-              JSON.parse(JSON.stringify(val[this.sysCode || this.dataKey]))
-            );
-          } else {
-            this.options = JSON.parse(
-              JSON.stringify(val[this.sysCode || this.dataKey])
-            );
-          }
-        }
-      }
     }
   },
-  created() {},
+  created() {
+    this.bindEventBus();
+  },
   mounted() {},
   methods: {
     getData(url, sysCode) {
@@ -278,11 +257,10 @@ export default {
           if (res.rCode === 0) {
             this.options = JSON.parse(JSON.stringify(res.results));
             if (sysCode || this.dataKey) {
-              this.esForm &&
-                this.esForm.setSysCodes(
-                  sysCode || this.dataKey,
-                  JSON.parse(JSON.stringify(this.options))
-                );
+              bus.$emit(
+                sysCode || this.dataKey,
+                JSON.parse(JSON.stringify(this.options))
+              );
               store.set(sysCode, JSON.parse(JSON.stringify(res.results)));
             }
           }
@@ -307,7 +285,19 @@ export default {
         );
       }
       return util.isObject(res) ? { ...attrs, ...res } : attrs;
+    },
+    setOptions(val) {
+      this.options = val;
+    },
+    bindEventBus() {
+      bus.$on(this.sysCode || this.dataKey, this.setOptions);
+    },
+    unbindEventBus() {
+      bus.$off(this.sysCode || this.dataKey, this.setOptions);
     }
+  },
+  beforeDestroy() {
+    this.unbindEventBus();
   }
 };
 </script>

package/packages/select/src/main.vue

@@ -2,6 +2,7 @@
 import { findSysCode } from 'eoss-ui/src/config/api.js';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
+import bus from 'eoss-ui/src/utils/bus';
 export default {
   name: 'EsSelect',
   componentName: 'EsSelect',
@@ -14,9 +15,6 @@ export default {
   inject: {
     esForm: {
       default: ''
-    },
-    sysCodes: {
-      default: ''
     }
   },
   props: {
@@ -224,29 +222,11 @@ export default {
           this.getData(this.sysCode);
         }
       }
-    },
-    sysCodes: {
-      deep: true,
-      handler(val) {
-        if (
-          this.canceled &&
-          val &&
-          ((this.sysCode && val[this.sysCode]) ||
-            (this.dataKey && val[this.dataKey]))
-        ) {
-          if (this.parseData) {
-            this.options = this.parseData(
-              JSON.parse(JSON.stringify(val[this.sysCode || this.dataKey]))
-            );
-          } else {
-            this.options = JSON.parse(
-              JSON.stringify(val[this.sysCode || this.dataKey])
-            );
-          }
-        }
-      }
     }
   },
+  created() {
+    this.bindEventBus();
+  },
   mounted() {
     if (this.wait) {
       this.getData();
@@ -362,11 +342,10 @@ export default {
               this.options = JSON.parse(JSON.stringify(res.results));
             }
             if (sysCode || this.dataKey) {
-              this.esForm &&
-                this.esForm.setSysCodes(
-                  sysCode || this.dataKey,
-                  JSON.parse(JSON.stringify(this.options))
-                );
+              bus.$emit(
+                sysCode || this.dataKey,
+                JSON.parse(JSON.stringify(this.options))
+              );
               store.set(sysCode, JSON.parse(JSON.stringify(this.options)));
             }
           } else {
@@ -593,8 +572,20 @@ export default {
     },
     toggleMenu() {
       this.$refs.elSelect.toggleMenu();
+    },
+    setOptions(val) {
+      this.options = val;
+    },
+    bindEventBus() {
+      bus.$on(this.sysCode || this.dataKey, this.setOptions);
+    },
+    unbindEventBus() {
+      bus.$off(this.sysCode || this.dataKey, this.setOptions);
     }
   },
+  beforeDestroy() {
+    this.unbindEventBus();
+  },
   render(h) {
     if (!this.hide) {
       if (this.readonly) {

package/packages/select-ganged/src/main.vue

@@ -1,5 +1,6 @@
 <script>
 import util from 'eoss-ui/src/utils/util';
+import bus from 'eoss-ui/src/utils/bus';
 export default {
   name: 'EsSelectGanged',
   componentName: 'EsSelectGanged',
@@ -12,9 +13,6 @@ export default {
   inject: {
     esForm: {
       default: ''
-    },
-    sysCodes: {
-      default: ''
     }
   },
   props: {