eoss-ui 0.4.84 → 0.4.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.84",
+  "version": "0.4.86",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

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

@@ -10,7 +10,9 @@
         :type="item.type"
         @click="handleClick({ row: data, handle: item })"
       >
-        {{ item.text }}
+        {{
+          item.template ? item.template({ row: data, config: item }) : item.text
+        }}
       </es-button>
       <el-dropdown
         v-if="other.length > 0 && index == btns.length - 1"
@@ -27,7 +29,11 @@
             :command="item"
           >
             <i :class="item.icon" v-if="item.icon"></i
-            >{{ item.text }}</el-dropdown-item
+            >{{
+              item.template
+                ? item.template({ row: data, config: item })
+                : item.text
+            }}</el-dropdown-item
           >
         </el-dropdown-menu>
       </el-dropdown>

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

@@ -202,6 +202,7 @@ import children from './children.vue';
 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';
 export default {
   name: 'EsDataTable',
   inheritAttrs: false,
@@ -416,6 +417,7 @@ export default {
   },
   data() {
     return {
+      requests: [],
       theadData: [],
       list: null,
       tableLoading: this.loading,
@@ -447,7 +449,7 @@ export default {
     },
     theads: {
       get() {
-        return this.theadData.length ? this.theadData : this.thead;
+        return typeof this.thead === 'string' ? this.theadData : this.thead;
       },
       set(val) {
         return val;
@@ -544,20 +546,19 @@ export default {
       this.datas.length && this.checkSelect(newVal);
     },
     thead: {
-      immediate: true,
+      deep: true,
       handler(val) {
         if (typeof val === 'string') {
           this.getTheads();
+        } else {
+          this.getOptions(val);
         }
       }
     },
     theads: {
-      immediate: true,
-      handler(val) {
+      deep: true,
+      handler() {
         this.chekOpenTotalArea();
-        if (val && val.length) {
-          this.getOptions(val);
-        }
       }
     },
     param: {
@@ -597,6 +598,9 @@ export default {
     }
   },
   created() {
+    if (Array.isArray(this.thead) && this.thead.length) {
+      this.getOptions(this.thead);
+    }
     this.immediate && this.getTableData();
   },
   mounted() {
@@ -604,6 +608,10 @@ export default {
     this.resetHeight();
   },
   methods: {
+    getRequestKey(config) {
+      const { method, url, params, data } = config;
+      return [method, url, qs.stringify(params), qs.stringify(data)].join('&');
+    },
     getIcon(res) {
       if (
         this.sizer &&
@@ -627,36 +635,45 @@ export default {
             item.sysCode ? { sysAppCode: item.sysCode } : {},
             item.param ? item.param : {}
           );
-          util
-            .ajax({
-              url: item.sysCode ? findSysCode : item.url,
-              method: this.method,
-              params: params,
-              data: params
-            })
-            .then((res) => {
-              if (res.rCode === 0) {
-                if (item.type == 'ganged') {
-                  this.$set(this.options, item.field || item.prop, [
-                    JSON.parse(JSON.stringify(res.results))
-                  ]);
+          let key = this.getRequestKey({
+            method: this.method,
+            url: item.sysCode ? findSysCode : item.url,
+            params: params,
+            data: {}
+          });
+          if (!this.requests.includes(key)) {
+            util
+              .ajax({
+                url: item.sysCode ? findSysCode : item.url,
+                method: this.method,
+                params: params,
+                data: params
+              })
+              .then((res) => {
+                if (res.rCode === 0) {
+                  if (item.type == 'ganged') {
+                    this.$set(this.options, item.field || item.prop, [
+                      JSON.parse(JSON.stringify(res.results))
+                    ]);
+                  } else {
+                    this.$set(
+                      this.options,
+                      item.field || item.prop,
+                      JSON.parse(JSON.stringify(res.results))
+                    );
+                  }
+                  this.requests.push(key);
                 } else {
-                  this.$set(
-                    this.options,
-                    item.field || item.prop,
-                    JSON.parse(JSON.stringify(res.results))
-                  );
+                  let msg = res.msg || '系统错误，请联系管理员！';
+                  this.$message.error(msg);
                 }
-              } else {
-                let msg = res.msg || '系统错误，请联系管理员！';
-                this.$message.error(msg);
-              }
-            })
-            .catch((err) => {
-              if (err.message && err.message !== 'canceled') {
-                this.$message.error(err.message);
-              }
-            });
+              })
+              .catch((err) => {
+                if (err.message && err.message !== 'canceled') {
+                  this.$message.error(err.message);
+                }
+              });
+          }
         } else {
           if (item.childHead && item.childHead.length) {
             this.getOptions(item.childHead);
@@ -675,7 +692,7 @@ export default {
         this.showTotal = true;
         return;
       }
-      const arr = JSON.parse(JSON.stringify(this.thead));
+      const arr = JSON.parse(JSON.stringify(this.theads));
       arr.forEach((item) => {
         if (item.total) {
           this.showTotal = true;
@@ -748,6 +765,7 @@ export default {
               this.list = results.data || results.records || [];
               this.config.totalCount =
                 results.count || results.total || results.totalCount;
+              this.getOptions(this.theadData);
             }
           } else {
             this.theadData = [];
@@ -991,7 +1009,7 @@ export default {
       } else if (row) {
         rows = JSON.parse(JSON.stringify(row));
       }
-      let thead = this.thead;
+      let thead = this.theads;
       if (this.$refs.oaTable) {
         thead = this.$refs.oaTable.getThead();
       }
@@ -1102,10 +1120,10 @@ export default {
         if (handle.exportXls) {
           let text = '操作';
           if (
-            this.thead[this.thead.length - 1] &&
-            this.thead[this.thead.length - 1].type === 'handle'
+            this.theads[this.theads.length - 1] &&
+            this.theads[this.theads.length - 1].type === 'handle'
           ) {
-            text = this.thead[this.thead.length - 1].title;
+            text = this.theads[this.theads.length - 1].title;
           }
           thead = thead.map((item) => {
             return item.filter((ele) => {
@@ -1207,56 +1225,60 @@ export default {
       }
     },
     resetHeight(warn) {
-      if (this.full && !this.height && !this.maxHeight) {
-        let height = parseInt(
-          util.getStyle(this.$el.parentNode, 'height', '%'),
-          10
-        );
-        height =
-          (height == NaN ? 0 : height) -
-          parseInt(util.getStyle(this.$el.parentNode, 'padding-top'), 10) -
-          parseInt(util.getStyle(this.$el.parentNode, 'padding-bottom'), 10);
-        for (let i = 0; i < this.$el.parentNode.childNodes.length; i++) {
-          let ele = this.$el.parentNode.childNodes[i];
-          if (ele !== this.$el && ele.offsetHeight !== undefined) {
+      this.$nextTick(() => {
+        if (this.full && !this.height && !this.maxHeight) {
+          let height = this.$el.parentNode.offsetHeight;
+          if (height) {
+            height = parseInt(
+              util.getStyle(this.$el.parentNode, 'height', '%'),
+              10
+            );
             height =
-              height -
-              ele.offsetHeight -
-              parseInt(util.getStyle(ele, 'margin-top'), 10) -
-              parseInt(util.getStyle(ele, 'margin-bottom'), 10);
+              (height == NaN ? 0 : height) -
+              parseInt(util.getStyle(this.$el.parentNode, 'padding-top'), 10) -
+              parseInt(
+                util.getStyle(this.$el.parentNode, 'padding-bottom'),
+                10
+              );
+            for (let i = 0; i < this.$el.parentNode.childNodes.length; i++) {
+              let ele = this.$el.parentNode.childNodes[i];
+              if (ele !== this.$el && ele.offsetHeight !== undefined) {
+                height =
+                  height -
+                  ele.offsetHeight -
+                  parseInt(util.getStyle(ele, 'margin-top'), 10) -
+                  parseInt(util.getStyle(ele, 'margin-bottom'), 10);
+              }
+            }
+            height -= this.showToolbar ? 45 : 0;
+            height -= this.page === false ? 0 : 46;
+            height -= this.title ? this.$refs.title.offsetHeight : 0;
+            height -= parseInt(
+              util.getStyle(this.$refs.esTableContent, 'padding-top'),
+              10
+            );
+            height -= parseInt(
+              util.getStyle(this.$refs.esTableContent, 'padding-bottom'),
+              10
+            );
+            let emptyText = this.$refs.esTableContent.querySelector(
+              '.el-table__empty-text'
+            );
+            let eht = 0;
+            if (emptyText) {
+              eht = emptyText.offsetHeight;
+              let thead =
+                this.$refs.esTableContent.querySelector('.el-table__header');
+              thead && (eht += thead.offsetHeight);
+            }
+            if (height > 1 && height - eht > 1) {
+              this.tableHeight = height;
+            } else {
+              console.warn(this.$el.parentNode, `获取不到高度！`);
+            }
           }
         }
-        height -= this.showToolbar ? 45 : 0;
-        height -= this.page === false ? 0 : 46;
-        height -= this.title ? this.$refs.title.offsetHeight : 0;
-        height -= parseInt(
-          util.getStyle(this.$refs.esTableContent, 'padding-top'),
-          10
-        );
-        height -= parseInt(
-          util.getStyle(this.$refs.esTableContent, 'padding-bottom'),
-          10
-        );
-        let emptyText = this.$refs.esTableContent.querySelector(
-          '.el-table__empty-text'
-        );
-        let eht = 0;
-        if (emptyText) {
-          eht = emptyText.offsetHeight;
-          let thead =
-            this.$refs.esTableContent.querySelector('.el-table__header');
-          thead && (eht += thead.offsetHeight);
-        }
-        if (height > 1 && height - eht > 1) {
-          this.tableHeight = height;
-        } else if (warn) {
-          console.warn(this.$el.parentNode, `获取不到高度！`);
-        } else {
-          this.$nextTick(() => {
-            this.resetHeight(true);
-          });
-        }
-      }
+      });
     },
     validate(callback) {
       let form = this.elForm || this.$refs.esTableForm;

package/packages/flow/src/main.vue

@@ -451,7 +451,7 @@
 
         <div
           v-if="
-            btnList.length > 2 ||
+            btnList.length > 1 ||
             (!isFlow && (rejectObj.fun || pointsReadingObj.fun || moreList))
           "
           placement="top"

package/packages/form/src/main.vue

@@ -195,9 +195,8 @@
                       {{ item.text }}
                     </div>
                     <el-form-item
-                      v-else
+                      v-else-if="!item.hide"
                       ref="es-form-pane"
-                      v-show="!item.hide"
                       :key="item.name"
                       :label-width="labelWidth"
                       :prop="item.name"
@@ -246,12 +245,17 @@
                         v-if="
                           item.showLabel !== false &&
                           item.type !== 'table' &&
-                          showLabel &&
-                          item.label
+                          showLabel
                         "
                         :contents="item.label"
-                        :event="item.label.event"
-                        :events="item.label.events"
+                        v-bind="
+                          item.label
+                            ? {
+                                event: item.label.event,
+                                events: item.label.events
+                              }
+                            : {}
+                        "
                         :plain="item.plain || item.name === undefined"
                       ></es-label>
                       <es-input-number
@@ -1134,9 +1138,8 @@
                   {{ item.text }}
                 </div>
                 <el-form-item
-                  v-else
+                  v-else-if="!item.hide"
                   ref="es-form-pane"
-                  v-show="!item.hide"
                   :key="item.name"
                   :label-width="labelWidth"
                   :prop="item.name"
@@ -1184,12 +1187,17 @@
                     v-if="
                       item.showLabel !== false &&
                       item.type !== 'table' &&
-                      showLabel &&
-                      item.label
+                      showLabel
                     "
                     :contents="item.label"
-                    :event="item.label.event"
-                    :events="item.label.events"
+                    v-bind="
+                      item.label
+                        ? {
+                            event: item.label.event,
+                            events: item.label.events
+                          }
+                        : {}
+                    "
                     :plain="item.plain || item.name === undefined"
                   ></es-label>
                   <es-input-number
@@ -2096,9 +2104,8 @@
                     {{ item.text }}
                   </div>
                   <el-form-item
-                    v-else
+                    v-else-if="!item.hide"
                     ref="es-form-pane"
-                    v-show="!item.hide"
                     :key="item.name"
                     :label-width="labelWidth"
                     :prop="item.name"
@@ -2150,12 +2157,17 @@
                       v-if="
                         item.showLabel !== false &&
                         item.type !== 'table' &&
-                        showLabel &&
-                        item.label
+                        showLabel
                       "
                       :contents="item.label"
-                      :event="item.label.event"
-                      :events="item.label.events"
+                      v-bind="
+                        item.label
+                          ? {
+                              event: item.label.event,
+                              events: item.label.events
+                            }
+                          : {}
+                      "
                       :plain="item.plain || item.name === undefined"
                     ></es-label>
                     <es-input-number
@@ -2990,9 +3002,8 @@
                 {{ item.text }}
               </div>
               <el-form-item
-                v-else
+                v-else-if="!item.hide"
                 ref="es-form-pane"
-                v-show="!item.hide"
                 :key="item.name"
                 :label-width="labelWidth"
                 :prop="item.name"
@@ -3040,12 +3051,17 @@
                   v-if="
                     item.showLabel !== false &&
                     item.type !== 'table' &&
-                    showLabel &&
-                    item.label
+                    showLabel
                   "
                   :contents="item.label"
-                  :event="item.label.event"
-                  :events="item.label.events"
+                  v-bind="
+                    item.label
+                      ? {
+                          event: item.label.event,
+                          events: item.label.events
+                        }
+                      : {}
+                  "
                   :plain="item.plain || item.name === undefined"
                 ></es-label>
                 <es-input-number

package/packages/form/src/table.vue

@@ -110,10 +110,16 @@
                 :rowspan="item.labelRow"
               >
                 <es-label
-                  v-if="item.type !== 'table' && item.label"
+                  v-if="item.type !== 'table'"
                   :contents="item.label"
-                  :event="item.label.event"
-                  :events="item.label.events"
+                  v-bind="
+                    item.label
+                      ? {
+                          event: item.label.event,
+                          events: item.label.events
+                        }
+                      : {}
+                  "
                   :plain="item.plain"
                   :rules="item.rules"
                 ></es-label>
@@ -156,13 +162,18 @@
                 ></expand-dom>
                 <template v-else>
                   <es-label
-                    v-if="item.type === 'label' || item.type === 'empty'"
+                    v-if="
+                      (item.type === 'label' || item.type === 'empty') &&
+                      !item.hide
+                    "
                     :contents="item.text"
-                    :event="item.label.event"
-                    :events="item.label.events"
+                    v-bind="{
+                      event: item.event,
+                      events: item.events
+                    }"
                   ></es-label>
                   <el-form-item
-                    v-else
+                    v-else-if="!item.hide"
                     label-width="0"
                     :prop="item.name"
                     :rules="getRules(item)"

package/packages/nav/src/main.vue

@@ -122,8 +122,7 @@ export default {
           return '70px';
         }
       }
-
-      return this.subMenu.length && this.isShow
+      return this.subMenu && this.subMenu.length && this.isShow
         ? parseInt(this.width, 10) + 70 + 'px'
         : '70px';
     }

package/packages/upload/src/main.vue

@@ -190,6 +190,7 @@ import {
 } from 'eoss-ui/src/config/api.js';
 import util from 'eoss-ui/src/utils/util.js';
 import picture from './picture.js';
+import store from 'eoss-ui/src/utils/store';
 export default {
   name: 'EsUpload',
   components: {
@@ -694,37 +695,50 @@ export default {
     //根据code获取附件参数配置
     getAdjunctPropertie() {
       if (this.code !== undefined) {
-        util
-          .ajax({
-            method: this.method,
-            url: this.properties,
-            data: { code: this.code, ...this.param },
-            params: { code: this.code, ...this.param }
-          })
-          .then((res) => {
-            if (res.rCode === 0) {
-              if (res.results) {
-                this.excludeNames = res.results.excludeName;
-                if (res.results.fileTypeExtName) {
-                  let fileTypeExtName = res.results.fileTypeExtName.split(';');
-                  this.fileAccept = fileTypeExtName
-                    .filter((item) => {
-                      return item;
-                    })
-                    .join(',');
+        let config = store.get(this.code);
+        if (config) {
+          this.fileAccept = config.accept;
+          this.fileSize = config.size;
+          this.fileTotalSize = config.totalSize;
+        } else {
+          util
+            .ajax({
+              method: this.method,
+              url: this.properties,
+              data: { code: this.code, ...this.param },
+              params: { code: this.code, ...this.param }
+            })
+            .then((res) => {
+              if (res.rCode === 0) {
+                if (res.results) {
+                  this.excludeNames = res.results.excludeName;
+                  if (res.results.fileTypeExtName) {
+                    let fileTypeExtName =
+                      res.results.fileTypeExtName.split(';');
+                    this.fileAccept = fileTypeExtName
+                      .filter((item) => {
+                        return item;
+                      })
+                      .join(',');
+                  }
+                  this.fileSize = res.results.limitFileSize
+                    ? res.results.limitFileSize
+                    : 0;
+                  this.fileTotalSize = res.results.limitTotalSize;
+                  store.set(this.code, {
+                    accept: this.fileAccept,
+                    size: this.fileSize,
+                    totalSize: this.fileTotalSize
+                  });
                 }
-                this.fileSize = res.results.limitFileSize
-                  ? res.results.limitFileSize
-                  : 0;
-                this.fileTotalSize = res.results.limitTotalSize;
               }
-            }
-          })
-          .catch((err) => {
-            if (err.message && err.message !== 'canceled') {
-              this.$message.error(err.message);
-            }
-          });
+            })
+            .catch((err) => {
+              if (err.message && err.message !== 'canceled') {
+                this.$message.error(err.message);
+              }
+            });
+        }
       }
     },
     getFiles(params) {

package/src/index.js

@@ -117,7 +117,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.84',
+  version: '0.4.86',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -396,6 +396,10 @@ const ajax = function ({
     if (!header['content-type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
+  } else {
+    if (!header['content-type']) {
+      header['content-type'] = 'application/json;charset=UTF-8';
+    }
   }
   return http({
     method,