eoss-ui 0.5.79 → 0.5.80

package/lib/tips.js

@@ -351,7 +351,7 @@ var ajax = function ajax(_ref) {
         }, 1000);
       }
       // eslint-disable-next-line no-undef
-      return Promise.resolve(response.data);
+      return Promise.resolve(JSON.parse(JSON.stringify(response.data)));
     }
   }, function (error) {
     loading && loading.close();

package/lib/tree-group.js

@@ -351,7 +351,7 @@ var ajax = function ajax(_ref) {
         }, 1000);
       }
       // eslint-disable-next-line no-undef
-      return Promise.resolve(response.data);
+      return Promise.resolve(JSON.parse(JSON.stringify(response.data)));
     }
   }, function (error) {
     loading && loading.close();

package/lib/tree.js

@@ -351,7 +351,7 @@ var ajax = function ajax(_ref) {
         }, 1000);
       }
       // eslint-disable-next-line no-undef
-      return Promise.resolve(response.data);
+      return Promise.resolve(JSON.parse(JSON.stringify(response.data)));
     }
   }, function (error) {
     loading && loading.close();

package/lib/upload.js

@@ -350,7 +350,7 @@ var ajax = function ajax(_ref) {
         }, 1000);
       }
       // eslint-disable-next-line no-undef
-      return Promise.resolve(response.data);
+      return Promise.resolve(JSON.parse(JSON.stringify(response.data)));
     }
   }, function (error) {
     loading && loading.close();
@@ -3943,8 +3943,8 @@ module.exports = require("js-base64");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=5a391a7a&
-var mainvue_type_template_id_5a391a7a_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=2013892f&
+var mainvue_type_template_id_2013892f_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4325,10 +4325,10 @@ var mainvue_type_template_id_5a391a7a_render = function () {
     : _vm._e()
 }
 var staticRenderFns = []
-mainvue_type_template_id_5a391a7a_render._withStripped = true
+mainvue_type_template_id_2013892f_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=5a391a7a&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=2013892f&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4776,9 +4776,10 @@ var _props;
       videoChange: false,
       source: '',
       excludeNames: '',
-      previewAdjunct: api["jb" /* previewAdjunct */],
       boxHeight: this.listHeight,
-      kkfileview: null
+      previewAdjunct: api["jb" /* previewAdjunct */],
+      kkfileview: null,
+      dochubConfig: {}
     };
   },
 
@@ -4822,7 +4823,7 @@ var _props;
       return this.showFileList;
     },
     url: function url() {
-      var url = this.action ? this.action : this.portrait ? api["Zb" /* uploadOnlyOne */] : api["bc" /* uploads */];
+      var url = this.action ? this.action : this.portrait ? this.dochubConfig.reuploadDocument || api["Zb" /* uploadOnlyOne */] : this.dochubConfig.uploadDocument || api["bc" /* uploads */];
       return url.indexOf(this.host) > -1 ? url : this.host + url;
     },
     excludes: function excludes() {
@@ -5026,6 +5027,7 @@ var _props;
           this.fileAccept = config.accept;
           this.fileSize = config.size;
           this.fileTotalSize = config.totalSize;
+          this.dochubConfig = config.dochubConfig;
         } else {
           util["a" /* default */].ajax({
             method: this.method,
@@ -5042,6 +5044,9 @@ var _props;
                     return item;
                   }).join(',');
                 }
+                if (res.results.dochubConfig && Object.keys(res.results.dochubConfig).length) {
+                  _this3.dochubConfig = res.results.dochubConfig;
+                }
                 if (res.results.kkViewRootPath) {
                   _this3.kkfileview = res.results.kkViewRootPath;
                 }
@@ -5050,7 +5055,8 @@ var _props;
                 store["a" /* default */].set(_this3.code, {
                   accept: _this3.fileAccept,
                   size: _this3.fileSize,
-                  totalSize: _this3.fileTotalSize
+                  totalSize: _this3.fileTotalSize,
+                  dochubConfig: _this3.dochubConfig
                 });
               }
             }
@@ -5130,36 +5136,55 @@ var _props;
           if (res.status === 'success') {
             var suffix = file.suffix;
             suffix = suffix.toLowerCase();
-            if (suffix.includes('doc') || suffix.includes('docx') || suffix.includes('xls') || suffix.includes('xlsx') || suffix.includes('ppt')) {
-              if (this.kkfileview) {
-                this.openKkfileview(file);
-              } else {
-                util["a" /* default */].win.open(this.host + (url ? url : api["lb" /* previewAdjunctOffice */]) + '?cmd=view&bucketName=' + file.absolutePath + '&fileId=' + file.adjunctId + '&fileName=' + file.newName);
-              }
-            } else if (suffix.includes('pdf')) {
-              if (this.kkfileview) {
-                this.openKkfileview(file);
+            if (this.dochubConfig.previewDocumentUrl) {
+              if (suffix.includes('jpge') || suffix.includes('jpg') || suffix.includes('gif') || suffix.includes('png')) {
+                this.imgUrl = res.url && util["a" /* default */].startWith(url, ['http', '/', true]) ? res.url : this.host + (url ? url : this.previewAdjunct + '?adjunctId=' + file.adjunctId);
+                this.title = file.originalName;
+                this.showImg = true;
+                this.$nextTick(function () {
+                  _this5.loadImage();
+                });
+              } else if (suffix.includes('mp4')) {
+                this.source = {
+                  src: this.host + (url ? url : this.previewAdjunct + '?adjunctId=' + file.adjunctId)
+                };
+                this.title = file.originalName;
+                this.showVideo = true;
               } else {
-                util["a" /* default */].win.open(this.host + (url ? url : api["kb" /* previewAdjunct2 */]) + '/' + file.originalName + '?adjunctId=' + file.adjunctId);
+                util["a" /* default */].win.open(this.host + (url ? url : this.dochubConfig.previewDocumentUrl + '?documentId=' + file.adjunctId + '&action=\u9644\u4EF6\u9884\u89C8'));
               }
-            } else if (suffix.includes('jpge') || suffix.includes('jpg') || suffix.includes('gif') || suffix.includes('png')) {
-              this.imgUrl = res.url && util["a" /* default */].startWith(url, ['http', '/', true]) ? res.url : this.host + (url ? url : this.previewAdjunct) + '?adjunctId=' + file.adjunctId;
-              this.title = file.originalName;
-              this.showImg = true;
-              this.$nextTick(function () {
-                _this5.loadImage();
-              });
-            } else if (suffix.includes('mp4')) {
-              this.source = {
-                src: this.host + (url ? url : this.previewAdjunct) + '?adjunctId=' + file.adjunctId
-              };
-              this.title = file.originalName;
-              this.showVideo = true;
             } else {
-              if (this.kkfileview) {
-                this.openKkfileview(file);
+              if (suffix.includes('doc') || suffix.includes('docx') || suffix.includes('xls') || suffix.includes('xlsx') || suffix.includes('ppt')) {
+                if (this.kkfileview) {
+                  this.openKkfileview(file);
+                } else {
+                  util["a" /* default */].win.open(this.host + (url ? url : api["lb" /* previewAdjunctOffice */]) + '?cmd=view&bucketName=' + file.absolutePath + '&fileId=' + file.adjunctId + '&fileName=' + file.newName);
+                }
+              } else if (suffix.includes('pdf')) {
+                if (this.kkfileview) {
+                  this.openKkfileview(file);
+                } else {
+                  util["a" /* default */].win.open(this.host + (url ? url : api["kb" /* previewAdjunct2 */]) + '/' + file.originalName + '?adjunctId=' + file.adjunctId);
+                }
+              } else if (suffix.includes('jpge') || suffix.includes('jpg') || suffix.includes('gif') || suffix.includes('png')) {
+                this.imgUrl = res.url && util["a" /* default */].startWith(url, ['http', '/', true]) ? res.url : this.host + (url ? url : this.previewAdjunct) + '?adjunctId=' + file.adjunctId;
+                this.title = file.originalName;
+                this.showImg = true;
+                this.$nextTick(function () {
+                  _this5.loadImage();
+                });
+              } else if (suffix.includes('mp4')) {
+                this.source = {
+                  src: this.host + (url ? url : this.previewAdjunct) + '?adjunctId=' + file.adjunctId
+                };
+                this.title = file.originalName;
+                this.showVideo = true;
               } else {
-                util["a" /* default */].win.open(this.host + (url ? url : this.previewAdjunct) + '?adjunctId=' + file.adjunctId);
+                if (this.kkfileview) {
+                  this.openKkfileview(file);
+                } else {
+                  util["a" /* default */].win.open(this.host + (url ? url : this.previewAdjunct) + '?adjunctId=' + file.adjunctId);
+                }
               }
             }
           } else {
@@ -5265,16 +5290,18 @@ var _props;
             var userName = file.userName || file.response && file.response.userName || util["a" /* default */].getStorage('userName');
             // eslint-disable-next-line no-undef
             return new Promise(function (resolve, reject) {
-              var url = typeof _this7.deleted === 'string' ? _this7.deleted : _this7.remove === 'string' ? _this7.remove : api["g" /* delAdjunct */];
+              var url = typeof _this7.deleted === 'string' ? _this7.deleted : _this7.remove === 'string' ? _this7.remove : _this7.dochubConfig.deleteDocumentUrl || api["g" /* delAdjunct */];
               util["a" /* default */].ajax({
                 method: _this7.method,
                 url: url,
                 data: {
                   userName: userName,
+                  documentId: file.adjunctId || file.response.adjunctId,
                   id: file.adjunctId || file.response.adjunctId
                 },
                 params: {
                   userName: userName,
+                  documentId: file.adjunctId || file.response.adjunctId,
                   id: file.adjunctId || file.response.adjunctId
                 }
               }).then(function (res) {
@@ -5302,13 +5329,13 @@ var _props;
       }
     },
     handleDownloads: function handleDownloads() {
-      var url = typeof this.downloads === 'string' ? this.downloads : api["Yb" /* uploadDownloads */];
+      var url = typeof this.downloads === 'string' ? this.downloads : this.dochubConfig.compressDownloadDocument || api["Yb" /* uploadDownloads */];
       util["a" /* default */].win.open(this.host + url + '?ownId=' + this.ownId + '&code=' + this.code + (this.extendCode ? '&extendCode=' + this.extendCode : ''));
     },
     handleDownload: function handleDownload(file) {
       if (file.status === 'success') {
-        var url = typeof this.download === 'string' ? this.download : api["r" /* downloadByAdjunctId */];
-        util["a" /* default */].win.open(this.host + url + '?adjunctId=' + (file.adjunctId || file.response.adjunctId));
+        var url = typeof this.download === 'string' ? this.download : this.dochubConfig.downloadDocumentUrl || api["r" /* downloadByAdjunctId */];
+        util["a" /* default */].win.open(this.host + url + '?adjunctId=' + (file.adjunctId || file.response.adjunctId) + '&documentId=' + (file.adjunctId || file.response.adjunctId));
       } else {
         this.aLinkDownload(file);
       }
@@ -5342,7 +5369,7 @@ var _props;
           ids = ids.join(',');
           util["a" /* default */].ajax({
             method: this.method,
-            url: api["ac" /* uploadSort */],
+            url: this.dochubConfig.sortDocumentsUrl || api["ac" /* uploadSort */],
             data: {
               ids: ids
             },
@@ -5444,7 +5471,7 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_5a391a7a_render,
+  mainvue_type_template_id_2013892f_render,
   staticRenderFns,
   false,
   null,

package/lib/utils/util.js

@@ -268,7 +268,7 @@ var ajax = function ajax(_ref) {
         }, 1000);
       }
       // eslint-disable-next-line no-undef
-      return Promise.resolve(response.data);
+      return Promise.resolve(JSON.parse(JSON.stringify(response.data)));
     }
   }, function (error) {
     loading && loading.close();

package/lib/wujie.js

@@ -351,7 +351,7 @@ var ajax = function ajax(_ref) {
         }, 1000);
       }
       // eslint-disable-next-line no-undef
-      return Promise.resolve(response.data);
+      return Promise.resolve(JSON.parse(JSON.stringify(response.data)));
     }
   }, function (error) {
     loading && loading.close();

package/lib/wxlogin.js

@@ -351,7 +351,7 @@ var ajax = function ajax(_ref) {
         }, 1000);
       }
       // eslint-disable-next-line no-undef
-      return Promise.resolve(response.data);
+      return Promise.resolve(JSON.parse(JSON.stringify(response.data)));
     }
   }, function (error) {
     loading && loading.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.79",
+  "version": "0.5.80",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -97,7 +97,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.102",
+    "eoss-element": "^0.3.4",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/clients/src/main.vue

@@ -100,7 +100,7 @@ export default {
   mounted() {},
   methods: {
     handleDownload(url) {
-      if (url) {
+      if (url && typeof url == 'string') {
         window.open(url);
         return;
       }
@@ -114,24 +114,24 @@ export default {
       var isLinux =
         navigator.platform == 'X11' || navigator.platform.indexOf('Linux') > -1;
       if (isWin) {
-        if (this.win) {
-          window.open(this.win);
+        if (this.downloads.win) {
+          window.open(this.downloads.win);
         } else {
           this.$message.error('下载地址不存在！');
           return;
         }
       }
       if (isMac) {
-        if (this.mac) {
-          window.open(this.mac);
+        if (this.downloads.mac) {
+          window.open(this.downloads.mac);
         } else {
           this.$message.error('下载地址不存在！');
           return;
         }
       }
       if (isLinux) {
-        if (this.linux) {
-          window.open(this.linux);
+        if (this.downloads.linux) {
+          window.open(this.downloads.linux);
         } else {
           this.$message.error('下载地址不存在！');
           return;

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

@@ -562,7 +562,13 @@ export default {
         if (this.list && this.list.length) {
           return this.list;
         }
-        if (this.config.totalCount == 0 && this.data.length) {
+        if (
+          this.page &&
+          ((typeof this.page === 'object' &&
+            (!Object.prototype.hasOwnProperty.call(this.page, 'totalCount') ||
+              this.page.totalCount == 0)) ||
+            this.page === true)
+        ) {
           this.config.totalCount = this.data.length - this.lose;
         }
         if (this.page && this.data.length > this.config.pageSize) {
@@ -641,10 +647,15 @@ export default {
       this.doLayout();
     },
     // data: {
-    //   immediate: true,
     //   deep: true,
     //   handler(val) {
-    //     this.config.totalCount = val.length - this.lose;
+    //     if (
+    //       this.page &&
+    //       typeof this.page === 'object' &&
+    //       !Object.prototype.hasOwnProperty.call(this.page, 'totalCount')
+    //     ) {
+    //       this.config.totalCount = val.length - this.lose;
+    //     }
     //   }
     // },
     page() {
@@ -1013,7 +1024,7 @@ export default {
       if (where) {
         reqData = util.extend({}, reqData, where);
       }
-      if (this.retainSearh) {
+      if (this.retainSearh || first === false) {
         reqData = util.extend({}, reqData, this.wheres);
       }
       if (this.isJoin) {
@@ -1258,7 +1269,7 @@ export default {
       }
       let thead = this.theads;
       if (this.$refs.oaTable) {
-        thead = this.$refs.oaTable.getThead();
+        thead = this.$refs.oaTable.getThead().thead;
       }
       if (handle.action) {
         let isConfirm = handle.confirm || true;

package/packages/form/src/main.vue

@@ -54,10 +54,12 @@
                 class="es-collapse-item"
                 v-if="!items.hide"
                 v-show="items.show !== false"
+                v-bind="items.config"
                 :class="{
                   'es-collapse-readonly': accordion ? false : !collapse,
                   'es-collapse-caption': items.caption
                 }"
+                :show-title="items.showTitle"
                 :name="items.name || String(indexs)"
                 :key="indexs"
                 :readonly="accordion ? false : !collapse"
@@ -591,7 +593,10 @@
                         v-else-if="item.type === 'component'"
                         v-model="models[item.name]"
                         v-bind="
-                          handleExclAttribute({ data: item, attrs: ['value'] })
+                          handleExclAttribute({
+                            data: item,
+                            attrs: ['value', 'type']
+                          })
                         "
                         v-on="item.events"
                       ></component>
@@ -657,6 +662,7 @@
                               </div>
                               <el-form-item
                                 label-width="0"
+                                :class="{ 'fixed-width': inline.width }"
                                 :prop="inline.name"
                                 :rules="getRules(inline)"
                               >
@@ -845,7 +851,7 @@
                                   v-bind="
                                     handleExclAttribute({
                                       data: inline,
-                                      attrs: ['value']
+                                      attrs: ['value', 'type']
                                     })
                                   "
                                   v-on="inline.events"
@@ -900,6 +906,7 @@
                           </div>
                           <el-form-item
                             label-width="0"
+                            :class="{ 'fixed-width': item.inline.width }"
                             :prop="item.inline.name"
                             :rules="getRules(item.inline)"
                           >
@@ -1093,7 +1100,7 @@
                               v-bind="
                                 handleExclAttribute({
                                   data: inline,
-                                  attrs: ['value']
+                                  attrs: ['value', 'type']
                                 })
                               "
                               v-on="inline.events"
@@ -1549,7 +1556,7 @@
                     v-bind="
                       handleExclAttribute({
                         data: item,
-                        attrs: ['value']
+                        attrs: ['value', 'type']
                       })
                     "
                     v-on="item.events"
@@ -1609,6 +1616,7 @@
                           </div>
                           <el-form-item
                             label-width="0"
+                            :class="{ 'fixed-width': inline.width }"
                             :prop="inline.name"
                             :rules="getRules(inline)"
                           >
@@ -1776,7 +1784,7 @@
                               v-bind="
                                 handleExclAttribute({
                                   data: inline,
-                                  attrs: ['value']
+                                  attrs: ['value', 'type']
                                 })
                               "
                               v-on="inline.events"
@@ -1824,6 +1832,7 @@
                       </div>
                       <el-form-item
                         label-width="0"
+                        :class="{ 'fixed-width': item.inline.width }"
                         :prop="item.inline.name"
                         :rules="getRules(item.inline)"
                       >
@@ -1983,7 +1992,7 @@
                           v-bind="
                             handleExclAttribute({
                               data: item.inline,
-                              attrs: ['value']
+                              attrs: ['value', 'type']
                             })
                           "
                           v-on="item.inline.events"
@@ -2554,7 +2563,7 @@
                       v-bind="
                         handleExclAttribute({
                           data: item,
-                          attrs: ['value']
+                          attrs: ['value', 'type']
                         })
                       "
                       v-on="item.events"
@@ -2618,6 +2627,7 @@
                             </div>
                             <el-form-item
                               label-width="0"
+                              :class="{ 'fixed-width': inline.width }"
                               :prop="inline.name"
                               :rules="getRules(inline)"
                             >
@@ -2805,7 +2815,7 @@
                                 v-bind="
                                   handleExclAttribute({
                                     data: inline,
-                                    attrs: ['value']
+                                    attrs: ['value', 'type']
                                   })
                                 "
                                 v-on="inline.events"
@@ -2860,6 +2870,7 @@
                         </div>
                         <el-form-item
                           label-width="0"
+                          :class="{ 'fixed-width': item.inline.width }"
                           :prop="item.inline.name"
                           :rules="getRules(item.inline)"
                         >
@@ -3034,7 +3045,7 @@
                             v-bind="
                               handleExclAttribute({
                                 data: item.inline,
-                                attrs: ['value']
+                                attrs: ['value', 'type']
                               })
                             "
                             v-on="item.inline.events"
@@ -3468,7 +3479,7 @@
                   v-bind="
                     handleExclAttribute({
                       data: item,
-                      attrs: ['value']
+                      attrs: ['value', 'type']
                     })
                   "
                   v-on="item.events"
@@ -3544,6 +3555,7 @@
                         >
                         <el-form-item
                           label-width="0"
+                          :class="{ 'fixed-width': inline.width }"
                           :prop="inline.name"
                           :rules="getRules(inline)"
                         >
@@ -3711,7 +3723,7 @@
                             v-bind="
                               handleExclAttribute({
                                 data: inline,
-                                attrs: ['value']
+                                attrs: ['value', 'type']
                               })
                             "
                             v-on="inline.events"
@@ -3759,6 +3771,7 @@
                     </div>
                     <el-form-item
                       label-width="0"
+                      :class="{ 'fixed-width': item.inline.width }"
                       :prop="item.inline.name"
                       :rules="getRules(item.inline)"
                     >
@@ -3918,7 +3931,7 @@
                         v-bind="
                           handleExclAttribute({
                             data: item.inline,
-                            attrs: ['value']
+                            attrs: ['value', 'type']
                           })
                         "
                         v-on="item.inline.events"
@@ -4524,7 +4537,8 @@ export default {
   mounted() {
     this.$nextTick(() => {
       !this.height && this.getHeight();
-      this.$refs.esForm.$el.addEventListener('keyup', this.handleEnter);
+      this.$refs.esForm &&
+        this.$refs.esForm.$el.addEventListener('keyup', this.handleEnter);
     });
   },
   methods: {

package/packages/input/src/main.vue

@@ -30,10 +30,6 @@ export default {
         return {};
       }
     },
-    autocomplete: {
-      type: [String, Boolean],
-      default: ''
-    },
     fetchSuggestions: Function,
     focusShow: {
       type: Boolean,

package/packages/login/src/main.vue

@@ -79,7 +79,6 @@
                   :focusShow="focusShow"
                   :data="users"
                   @select="handleBlur"
-                  :autocomplete="true"
                 >
                   <template slot="prefix">
                     <i class="es-icon-zhanghao es-label-user"></i>