eoss-ui 0.5.13 → 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">
-            <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>
+        <template v-for="(item, index) in theads">
+          <template v-if="item.hide !== true">
             <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,
@@ -448,7 +381,8 @@ export default {
       selected: null,
       options: {},
       icon: true,
-      show: true
+      show: true,
+      sysCodes: []
     };
   },
   computed: {
@@ -457,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;
@@ -520,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;
@@ -584,12 +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.resetScroll(0, 0);
+        this.$refs.oaTable &&
+          this.$refs.oaTable.resetScroll &&
+          this.$refs.oaTable.resetScroll(0, 0);
       }
     },
     height: {
@@ -631,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 } : {},
@@ -685,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 {
@@ -716,6 +674,9 @@ export default {
           }
         }
       });
+      this.sysCodes = sysCodes;
+
+      this.bindEventBus();
     },
     checkObject(item) {
       return util.getObjectType(item) === 'object';
@@ -1336,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);
       });
@@ -1362,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/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/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: {

package/packages/theme-chalk/lib/data-table.css

@@ -1 +1 @@
-@charset "UTF-8";.es-data-table,.es-data-table-content .es-table .el-table__body-wrapper .el-table__body{position:relative}.es-data-table .es-toolbar+.es-data-table-content{padding:16px}.es-data-table-content{background-color:#fafafa}.es-data-table-content .es-table:not(.el-table--border){border:1px solid #e1e1e1;border-bottom:0}.es-data-table-content .es-table thead th,.es-data-table-content .es-table thead tr{background-color:#f8f8f8;border-color:#e1e1e1}.es-data-table-content .es-table th,.es-data-table-content .es-table thead tr{padding:6px 0;text-align:center}.es-data-table-content .es-table th .cell,.es-data-table-content .es-table thead tr .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td{padding:6px 0}.es-data-table-content .es-table td.es-table-handle-box .cell,.es-data-table-content .es-table td.is-center .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td.is-right .cell{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-data-table-content .es-table .es-table-handle-box{text-align:center}.es-data-table-content .es-table+.es-table-page{margin-top:-1px}.es-data-table-content .es-table .el-table__fixed-right::before,.es-data-table-content .es-table .el-table__fixed::before{background-color:transparent}.es-data-table-content .es-table .cell{min-height:28px;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-line-pack:center;align-content:center}.es-data-table-content .es-table .cell:not(.el-tooltip){display:-webkit-box;display:-ms-flexbox;display:flex}.es-data-table-content .es-table .cell.el-tooltip{line-height:28px}.es-data-table-content .es-table .el-form-item{margin-bottom:0;width:100%}.es-data-table-content .es-table .el-form-item .el-input:not(.el-input--prefix) .el-input__inner{padding:0 8px;margin-top:0}.es-data-table-content .es-table .el-form-item .el-input-number{width:100%}.es-data-table-content .el-table__header,.es-data-table-content .el-table__header thead{color:#404040}.es-data-table-content .el-table__body tr.hover-row.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped>td,.es-data-table-content .el-table__body tr.hover-row>td,.es-data-table-content .el-table__body tr:hover>td{background-color:#e6f7ff}.es-data-table-content .el-table__body tr.current-row>td{background-color:#91d5ff}.es-data-table-content .es-table-page{height:46px;border:1px solid #e1e1e1;padding:8px 12px;background-color:#f8f8f8}.es-data-table-content .es-thead-border .el-table__header th:not(.gutter){border-right:1px solid #e1e1e1}.es-data-table-content .es-thead-border .el-table__header thead:not(.is-group) th:last-child{border-right:0;border-bottom:1px solid #e1e1e1}.es-data-table-content .es-thead-border .el-table__fixed-right:not(.el-table-box-shadow) thead th:last-child{border-left:1px solid #e1e1e1}.es-data-table-content .es-thead-border .is-scrolling-right~.el-table__fixed-right:not(.el-table-box-shadow) thead th:last-child{border-left:0}.es-data-table-content .el-form-item__error{top:unset;bottom:0}.es-data-table-content .es-table:not(.el-table--border) .el-table--border td,.es-data-table-content .es-table:not(.el-table--border) .el-table--border th,.es-data-table-content .es-table:not(.el-table--border) .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{border-right:0}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td{border-right:1px solid #e1e1e1}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td:last-child{border-right:0}.el-table--border::after,.el-table--group::after,.el-table::before{z-index:5}.sizer-btn-box{text-align:right;margin-top:7px}
+@charset "UTF-8";.es-data-table,.es-data-table-content .es-table .el-table__body-wrapper .el-table__body{position:relative}.es-data-table .es-toolbar+.es-data-table-content{padding:16px}.es-data-table-content{background-color:#fafafa}.es-data-table-content .es-table:not(.el-table--border){border:1px solid #e1e1e1;border-bottom:0}.es-data-table-content .es-table thead th,.es-data-table-content .es-table thead tr{background-color:#f8f8f8;border-color:#e1e1e1}.es-data-table-content .es-table th,.es-data-table-content .es-table thead tr{padding:6px 0;text-align:center}.es-data-table-content .es-table th .cell,.es-data-table-content .es-table thead tr .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td{padding:6px 0}.es-data-table-content .es-table td.es-table-handle-box .cell,.es-data-table-content .es-table td.is-center .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td.is-right .cell{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-data-table-content .es-table .es-table-handle-box{text-align:center}.es-data-table-content .es-table+.es-table-page{margin-top:-1px}.es-data-table-content .es-table .el-table__fixed-right::before,.es-data-table-content .es-table .el-table__fixed::before{background-color:transparent}.es-data-table-content .es-table .cell{min-height:28px;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-line-pack:center;align-content:center}.es-data-table-content .es-table .cell:not(.el-tooltip){display:-webkit-box;display:-ms-flexbox;display:flex}.es-data-table-content .es-table .cell.el-tooltip{line-height:28px}.es-data-table-content .es-table .el-form-item{margin-bottom:0;width:100%}.es-data-table-content .es-table .el-form-item .el-input:not(.el-input--prefix) .el-input__inner{padding:0 8px;margin-top:0}.es-data-table-content .es-table .el-form-item .el-input-number,.es-data-table-content .es-table .el-form-item .el-select{width:100%}.es-data-table-content .el-table__header,.es-data-table-content .el-table__header thead{color:#404040}.es-data-table-content .el-table__body tr.hover-row.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped>td,.es-data-table-content .el-table__body tr.hover-row>td,.es-data-table-content .el-table__body tr:hover>td{background-color:#e6f7ff}.es-data-table-content .el-table__body tr.current-row>td{background-color:#91d5ff}.es-data-table-content .es-table-page{height:46px;border:1px solid #e1e1e1;padding:8px 12px;background-color:#f8f8f8}.es-data-table-content .es-thead-border .el-table__header th:not(.gutter){border-right:1px solid #e1e1e1}.es-data-table-content .es-thead-border .el-table__header thead:not(.is-group) th:last-child{border-right:0;border-bottom:1px solid #e1e1e1}.es-data-table-content .es-thead-border .el-table__fixed-right:not(.el-table-box-shadow) thead th:last-child{border-left:1px solid #e1e1e1}.es-data-table-content .es-thead-border .is-scrolling-right~.el-table__fixed-right:not(.el-table-box-shadow) thead th:last-child{border-left:0}.es-data-table-content .el-form-item__error{top:unset;bottom:0}.es-data-table-content .es-table:not(.el-table--border) .el-table--border td,.es-data-table-content .es-table:not(.el-table--border) .el-table--border th,.es-data-table-content .es-table:not(.el-table--border) .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{border-right:0}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td{border-right:1px solid #e1e1e1}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td:last-child{border-right:0}.el-table--border::after,.el-table--group::after,.el-table::before{z-index:5}.sizer-btn-box{text-align:right;margin-top:7px}