eoss-ui 0.4.15 → 0.4.18

package/lib/tree.js

@@ -141,9 +141,9 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {String} [host] - host
  * @param {Object} [data] - 请求参数
  * @param {Object} [params] - 请求参数
- * @param {Boolean} [format] - post请求是否使用表单类型
- * @param {Boolean} [mix] - 是否混合传参
- * @param {Boolean} [defaults] - 是否传入默认参数userId
+ * @param {Boolean} [format = true] - post请求是否使用表单类型
+ * @param {Boolean} [mix = false] - 是否混合传参
+ * @param {Boolean} [defaults = false] - 是否传入默认参数userId
  * @param {Object} [loading] - loading加载对象
  **/
 // 请求
@@ -2696,7 +2696,7 @@ module.exports = require("eoss-element");
 // 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/tree/src/main.vue?vue&type=template&id=146a4a1c&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree/src/main.vue?vue&type=template&id=69d560b8&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2739,7 +2739,10 @@ var render = function () {
                 [
                   _c(
                     "div",
-                    { staticClass: "es-tree-filtrate" },
+                    {
+                      staticClass: "es-tree-filtrate",
+                      class: { "es-tree-hasfiltrate": _vm.$slots.filtrate },
+                    },
                     [_vm._t("filtrate")],
                     2
                   ),
@@ -2885,7 +2888,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=146a4a1c&
+// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=69d560b8&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -2974,6 +2977,9 @@ var util = __webpack_require__(0);
 //
 //
 //
+//
+//
+//
 
 
 

package/lib/upload.js

@@ -141,9 +141,9 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {String} [host] - host
  * @param {Object} [data] - 请求参数
  * @param {Object} [params] - 请求参数
- * @param {Boolean} [format] - post请求是否使用表单类型
- * @param {Boolean} [mix] - 是否混合传参
- * @param {Boolean} [defaults] - 是否传入默认参数userId
+ * @param {Boolean} [format = true] - post请求是否使用表单类型
+ * @param {Boolean} [mix = false] - 是否混合传参
+ * @param {Boolean} [defaults = false] - 是否传入默认参数userId
  * @param {Object} [loading] - loading加载对象
  **/
 // 请求
@@ -2682,8 +2682,8 @@ module.exports = require("qs");
 // 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=d94f1c5e&
-var mainvue_type_template_id_d94f1c5e_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=f1df4e00&
+var mainvue_type_template_id_f1df4e00_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3017,10 +3017,10 @@ var mainvue_type_template_id_d94f1c5e_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_d94f1c5e_render._withStripped = true
+mainvue_type_template_id_f1df4e00_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=d94f1c5e&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=f1df4e00&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3657,6 +3657,7 @@ var _props;
     getFiles: function getFiles(params) {
       var _this3 = this;
 
+      console.log(111, params);
       if (!this.show || this.isRequiredOwnId && !Object.prototype.hasOwnProperty.call(params, 'ownId')) {
         return false;
       }
@@ -3957,7 +3958,7 @@ var componentNormalizer = __webpack_require__(2);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_d94f1c5e_render,
+  mainvue_type_template_id_f1df4e00_render,
   staticRenderFns,
   false,
   null,

package/lib/utils/util.js

@@ -56,9 +56,9 @@ var JSONbigToString = (0, _jsonBigint2.default)({ storeAsString: true });
  * @param {String} [host] - host
  * @param {Object} [data] - 请求参数
  * @param {Object} [params] - 请求参数
- * @param {Boolean} [format] - post请求是否使用表单类型
- * @param {Boolean} [mix] - 是否混合传参
- * @param {Boolean} [defaults] - 是否传入默认参数userId
+ * @param {Boolean} [format = true] - post请求是否使用表单类型
+ * @param {Boolean} [mix = false] - 是否混合传参
+ * @param {Boolean} [defaults = false] - 是否传入默认参数userId
  * @param {Object} [loading] - loading加载对象
  **/
 // 请求

package/lib/wujie.js

@@ -141,9 +141,9 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {String} [host] - host
  * @param {Object} [data] - 请求参数
  * @param {Object} [params] - 请求参数
- * @param {Boolean} [format] - post请求是否使用表单类型
- * @param {Boolean} [mix] - 是否混合传参
- * @param {Boolean} [defaults] - 是否传入默认参数userId
+ * @param {Boolean} [format = true] - post请求是否使用表单类型
+ * @param {Boolean} [mix = false] - 是否混合传参
+ * @param {Boolean} [defaults = false] - 是否传入默认参数userId
  * @param {Object} [loading] - loading加载对象
  **/
 // 请求

package/lib/wxlogin.js

@@ -141,9 +141,9 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {String} [host] - host
  * @param {Object} [data] - 请求参数
  * @param {Object} [params] - 请求参数
- * @param {Boolean} [format] - post请求是否使用表单类型
- * @param {Boolean} [mix] - 是否混合传参
- * @param {Boolean} [defaults] - 是否传入默认参数userId
+ * @param {Boolean} [format = true] - post请求是否使用表单类型
+ * @param {Boolean} [mix = false] - 是否混合传参
+ * @param {Boolean} [defaults = false] - 是否传入默认参数userId
  * @param {Object} [loading] - loading加载对象
  **/
 // 请求

package/package.json

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

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

@@ -152,6 +152,7 @@
           type="handle"
           align="center"
           label="操作"
+          fixed="right"
           class="eoss-ui-eidt-column"
           :total="false"
         >
@@ -582,7 +583,7 @@ export default {
       return false;
     },
     getOptions(res) {
-      res.forEach(item => {
+      res.forEach((item) => {
         if (item.sysCode || item.url) {
           let params = util.extend(
             {},
@@ -596,7 +597,7 @@ export default {
               params: params,
               data: params
             })
-            .then(res => {
+            .then((res) => {
               if (res.rCode === 0) {
                 if (item.type == 'ganged') {
                   this.$set(this.options, item.field || item.prop, [
@@ -614,7 +615,7 @@ export default {
                 this.$message.error(msg);
               }
             })
-            .catch(err => {
+            .catch((err) => {
               if (err.message && err.message !== 'canceled') {
                 this.$message.error(err.message);
               }
@@ -638,7 +639,7 @@ export default {
         return;
       }
       const arr = JSON.parse(JSON.stringify(this.thead));
-      arr.forEach(item => {
+      arr.forEach((item) => {
         if (item.total) {
           this.showTotal = true;
         }
@@ -675,7 +676,7 @@ export default {
     checkSelect(newVal) {
       if (!this.isFirsetCheck && newVal) {
         if (util.getObjectType(newVal) === 'array') {
-          newVal.forEach(row => {
+          newVal.forEach((row) => {
             this.$refs.oaTable.toggleRowSelection(row, true);
           });
         } else if (newVal === true) {
@@ -693,7 +694,7 @@ export default {
           params: this.param,
           data: this.param
         })
-        .then(res => {
+        .then((res) => {
           if (res.rCode === 0) {
             let results = res.results;
             if (Array.isArray(results)) {
@@ -711,7 +712,7 @@ export default {
           }
           this.$emit('success', res);
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -747,7 +748,7 @@ export default {
           params: reqData,
           data: reqData
         })
-        .then(res => {
+        .then((res) => {
           this.tableLoading = false;
           if (res.rCode === 0 || res.status === 'success') {
             let results =
@@ -764,7 +765,7 @@ export default {
           }
           this.$emit('success', res);
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -822,7 +823,7 @@ export default {
         } else if (Array.isArray(handle.syncKeys)) {
           for (let i in handle.syncKeys) {
             if (Array.isArray(row)) {
-              let param = row.map(item => {
+              let param = row.map((item) => {
                 return item[handle.syncKeys[i]];
               });
               params[handle.syncKeys[i]] = param.join(',');
@@ -833,7 +834,7 @@ export default {
         } else {
           for (let i in handle.syncKeys) {
             if (Array.isArray(row)) {
-              let param = row.map(item => {
+              let param = row.map((item) => {
                 return item[handle.syncKeys[i]];
               });
               params[i] = param.join(',');
@@ -844,7 +845,7 @@ export default {
         }
       } else {
         if (Array.isArray(row)) {
-          let param = row.map(item => {
+          let param = row.map((item) => {
             return item.id;
           });
           params.id = param.join(',');
@@ -867,7 +868,7 @@ export default {
           method: handle.method,
           format: handle.format
         })
-        .then(res => {
+        .then((res) => {
           this.changeLoading(false);
           if (res.rCode === 0) {
             this.$message({
@@ -893,7 +894,7 @@ export default {
             );
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.changeLoading(false);
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -902,7 +903,7 @@ export default {
     },
     checkParse(data, parse) {
       if (Array.isArray(data)) {
-        return data.map(items => {
+        return data.map((items) => {
           let item = JSON.parse(JSON.stringify(items));
           let obj = {};
           for (let i in parse) {
@@ -1005,7 +1006,7 @@ export default {
       } else if (handle.changeData) {
         let changeData = {};
         if (Array.isArray(handle.changeData)) {
-          handle.changeData.forEach(item => {
+          handle.changeData.forEach((item) => {
             if (util.isObject(item)) {
               for (let i in item) {
                 if (typeof item[i] === 'boolean') {
@@ -1056,8 +1057,8 @@ export default {
           ) {
             text = this.thead[this.thead.length - 1].title;
           }
-          thead = thead.map(item => {
-            return item.filter(ele => {
+          thead = thead.map((item) => {
+            return item.filter((ele) => {
               return ele.label !== text && ele.label;
             });
           });
@@ -1175,9 +1176,8 @@ export default {
             }
           }
           this.styles = { height: height + 'px' };
-          const loadingDom = this.$refs.esTableContent.querySelector(
-            '.el-loading-mask'
-          );
+          const loadingDom =
+            this.$refs.esTableContent.querySelector('.el-loading-mask');
           for (
             let i = 0;
             i < this.$refs.esTableContent.childNodes.length;
@@ -1205,7 +1205,7 @@ export default {
     },
     validate(callback) {
       let form = this.elForm || this.$refs.esTableForm;
-      form.validate(valid => {
+      form.validate((valid) => {
         callback(valid);
       });
     },

package/packages/dialog/src/main.vue

@@ -8,6 +8,7 @@
     :close-on-click-modal="shadeClose"
     :fullscreen="full"
     :drag="drag"
+    :modal-append-to-body="modalAppendToBody"
     v-bind="$attrs"
     v-on="$listeners"
     :class="{ 'is-middle': middle }"
@@ -307,6 +308,10 @@ export default {
       type: Boolean,
       default: true
     },
+    modalAppendToBody: {
+      type: Boolean,
+      default: true
+    },
     appendToBody: {
       type: [Boolean, String],
       default: true
@@ -376,7 +381,7 @@ export default {
       this.ht = this.height ? this.height : this.sizes[this.size]['height'];
     }
     if (this.busEvent) {
-      mbus.$on(this.busEvent, async res => {
+      mbus.$on(this.busEvent, async (res) => {
         this.titles = res.title;
         this.handler && (await this.handler(res, this));
         this.handleShow();

package/packages/flow/src/selectUser.vue

@@ -42,7 +42,7 @@
       </el-option>
     </el-select> -->
     <!-- class="select-user-icon el-button--primary" -->
-    <div style="position:relative">
+    <div style="position: relative">
       <!-- <es-selector
         v-if="isChange"
         v-model="newSelectUserList"
@@ -72,6 +72,7 @@
         @cancel="cancelSelectUser"
         @change="getSelectUser"
         :param="newParams"
+        ><i class="es-icon-user"></i
       ></es-selector>
       <!-- :action="url" -->
       <!-- :where="{type:'user',a:'1'}" -->
@@ -262,14 +263,14 @@ export default {
             url: handleInfo,
             params: { searchKey: query, query, type: 'user' }
           })
-          .then(res => {
+          .then((res) => {
             const { status, data } = res;
             this.searchLoading = false;
             if (status === 'success') {
               this.newOptions = data;
             }
           })
-          .catch(err => {
+          .catch((err) => {
             this.searchLoading = false;
             if (err.message && err.message !== 'canceled') {
               this.$message.error(err.message);
@@ -282,8 +283,8 @@ export default {
     changeSelectUser(val) {
       this.newSelectUserList = [];
       if (this.newMultiple) {
-        val.map(item => {
-          this.newOptions.map(items => {
+        val.map((item) => {
+          this.newOptions.map((items) => {
             if (item === items.id) {
               this.newSelectUserList.push({
                 showname: items.name,
@@ -293,7 +294,7 @@ export default {
           });
         });
       } else {
-        this.newOptions.map(item => {
+        this.newOptions.map((item) => {
           if (item.id === val) {
             this.newSelectUserList.push({
               showname: item.name,
@@ -329,7 +330,7 @@ export default {
       if (this.newMultiple) {
         this.newNextUser = [];
 
-        this.newSelectUserList.map(item => {
+        this.newSelectUserList.map((item) => {
           if (this.mix) {
             this.newOptions.push({
               ...item,
@@ -371,7 +372,7 @@ export default {
       let data = {};
       if (this.mix) data = this.getMixList();
       if (this.newMultiple) {
-        this.newNextUser.map(item => {
+        this.newNextUser.map((item) => {
           //  if (this.mix) {
           //   this.newOptions.push({
           //     id: item.showid,
@@ -381,8 +382,8 @@ export default {
           // } else {
           //   this.newOptions.push({...item, id: item.showid, name: item.showname });
           // }
-          this.newOptions.map(items => {
-            oldUserList.map(val => {
+          this.newOptions.map((items) => {
+            oldUserList.map((val) => {
               if (items.showid != val.showid && val.showid == item) {
                 this.newSelectUserList.push({
                   ...val
@@ -397,7 +398,7 @@ export default {
           });
         });
         var obj = {};
-        this.newSelectUserList = this.newSelectUserList.reduce(function(
+        this.newSelectUserList = this.newSelectUserList.reduce(function (
           item,
           next
         ) {
@@ -406,7 +407,7 @@ export default {
         },
         []);
       } else {
-        this.newOptions.map(item => {
+        this.newOptions.map((item) => {
           if (item.showid === this.newNextUser) {
             this.newSelectUserList.push({
               ...item