eoss-ui 0.5.44 → 0.5.46

package/lib/cascader.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 70);
+/******/ 	return __webpack_require__(__webpack_require__.s = 71);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 70:
+/***/ 71:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/checkbox-group.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 38);
+/******/ 	return __webpack_require__(__webpack_require__.s = 40);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -1249,6 +1249,21 @@ var getHour = function getHour(datetime) {
   return datetimeObj.getHours();
 };
 
+/**
+ * getMyWinTop
+ * @desc 获取同域的top窗口
+ * @param {object} wind - window对象
+ **/
+var getMyWinTop = function getMyWinTop(wind) {
+  wind = wind ? wind : win;
+  try {
+    wind.parent.document;
+    return getMyWinTop(wind.parent);
+  } catch (error) {
+    return wind;
+  }
+};
+
 /**
  * getWeekNumber
  * @desc 当年第几周
@@ -3002,6 +3017,7 @@ var watermark = function watermark(option) {
   getCurrentDate: getCurrentDate,
   getCurrentDateTime: getCurrentDateTime,
   getHour: getHour,
+  getMyWinTop: getMyWinTop,
   getWeekNumber: getWeekNumber,
   getLength: getLength,
   getMainConfig: getMainConfig,
@@ -3752,7 +3768,9 @@ module.exports = require("vue");
 /* 35 */,
 /* 36 */,
 /* 37 */,
-/* 38 */
+/* 38 */,
+/* 39 */,
+/* 40 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/clients.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 40);
+/******/ 	return __webpack_require__(__webpack_require__.s = 41);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 40:
+/***/ 41:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/data-table-form.js

@@ -1249,6 +1249,21 @@ var getHour = function getHour(datetime) {
   return datetimeObj.getHours();
 };
 
+/**
+ * getMyWinTop
+ * @desc 获取同域的top窗口
+ * @param {object} wind - window对象
+ **/
+var getMyWinTop = function getMyWinTop(wind) {
+  wind = wind ? wind : win;
+  try {
+    wind.parent.document;
+    return getMyWinTop(wind.parent);
+  } catch (error) {
+    return wind;
+  }
+};
+
 /**
  * getWeekNumber
  * @desc 当年第几周
@@ -3002,6 +3017,7 @@ var watermark = function watermark(option) {
   getCurrentDate: getCurrentDate,
   getCurrentDateTime: getCurrentDateTime,
   getHour: getHour,
+  getMyWinTop: getMyWinTop,
   getWeekNumber: getWeekNumber,
   getLength: getLength,
   getMainConfig: getMainConfig,
@@ -3745,14 +3761,17 @@ var api = __webpack_require__(1);
 // EXTERNAL MODULE: ./src/utils/store.js
 var store = __webpack_require__(11);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table-form/src/table.vue?vue&type=template&id=736ff20c&
-var tablevue_type_template_id_736ff20c_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table-form/src/table.vue?vue&type=template&id=3953d5ce&
+var tablevue_type_template_id_3953d5ce_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   return _c(
     "div",
-    { staticClass: "es-data-form" },
+    {
+      staticClass: "es-data-form",
+      class: { "es-data-form-haspage": _vm.page },
+    },
     [
       _c(
         "el-scrollbar",
@@ -3858,7 +3877,10 @@ var tablevue_type_template_id_736ff20c_render = function () {
                           refInFor: true,
                           staticClass: "es-data-table-form-handle",
                           style: _vm.style,
-                          attrs: { data: _vm.options[item.field || item.prop] },
+                          attrs: {
+                            suffix: false,
+                            data: _vm.options[item.field || item.prop],
+                          },
                           on: {
                             "hide-menu": function ($event) {
                               _vm.selectShow = false
@@ -3933,10 +3955,10 @@ var tablevue_type_template_id_736ff20c_render = function () {
   )
 }
 var staticRenderFns = []
-tablevue_type_template_id_736ff20c_render._withStripped = true
+tablevue_type_template_id_3953d5ce_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table-form/src/table.vue?vue&type=template&id=736ff20c&
+// CONCATENATED MODULE: ./packages/data-table-form/src/table.vue?vue&type=template&id=3953d5ce&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table-form/src/colgroup.vue?vue&type=template&id=9b289ebe&
 var colgroupvue_type_template_id_9b289ebe_render = function () {
@@ -5278,6 +5300,7 @@ var tablevue_type_script_lang_js_components;
 //
 //
 //
+//
 
 
 //import rules from 'eoss-ui/src/utils/rules.js';
@@ -5294,6 +5317,11 @@ var tablevue_type_script_lang_js_components;
     };
   },
 
+  inject: {
+    esDialog: {
+      default: ''
+    }
+  },
   props: {
     height: String,
     readonly: Boolean,
@@ -5373,8 +5401,15 @@ var tablevue_type_script_lang_js_components;
       }
     },
     setStyle: function setStyle(res, data, field) {
-      this.style.left = res ? res.left + 'px' : '';
-      this.style.top = res ? res.top + 'px' : '';
+      var left = 0;
+      var top = 0;
+      if (this.esDialog) {
+        var style = this.esDialog.getDialog().getBoundingClientRect();
+        left = style.left;
+        top = style.top;
+      }
+      this.style.left = res ? res.left - left + 'px' : '';
+      this.style.top = res ? res.top - top + 'px' : '';
       this.style.width = res ? res.width + 'px' : '';
       this.target = data;
       this.field = field;
@@ -5416,7 +5451,7 @@ var tablevue_type_script_lang_js_components;
 
 var table_component = Object(componentNormalizer["a" /* default */])(
   src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_736ff20c_render,
+  tablevue_type_template_id_3953d5ce_render,
   staticRenderFns,
   false,
   null,
@@ -5427,6 +5462,8 @@ var table_component = Object(componentNormalizer["a" /* default */])(
 
 /* harmony default export */ var table = (table_component.exports);
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table-form/src/main.vue?vue&type=script&lang=js&
+var mainvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
 var mainvue_type_script_lang_js_components;
 
 
@@ -5563,15 +5600,17 @@ var mainvue_type_script_lang_js_components;
     }
   },
   render: function render(h) {
-    var _props;
+    var _extends2;
 
     var tag = this.elForm ? 'div' : 'form';
-    return h(tag, {}, [h('eo-table', {
-      props: (_props = {
+    return h(tag, {
+      class: { 'es-data-form-full': this.full, 'es-data-table-form': 1 }
+    }, [h('eo-table', {
+      props: mainvue_type_script_lang_js_extends((_extends2 = {
         cols: this.cols,
         thead: this.theads,
         numbers: this.numbers
-      }, _props['cols'] = this.cols, _props.data = this.models, _props.types = this.types, _props.options = this.options, _props.page = this.page, _props),
+      }, _extends2['cols'] = this.cols, _extends2.data = this.models, _extends2.types = this.types, _extends2.options = this.options, _extends2.page = this.page, _extends2), this.$attrs),
       on: this.$listeners
     })]);
   }

package/lib/data-table.js

@@ -1249,6 +1249,21 @@ var getHour = function getHour(datetime) {
   return datetimeObj.getHours();
 };
 
+/**
+ * getMyWinTop
+ * @desc 获取同域的top窗口
+ * @param {object} wind - window对象
+ **/
+var getMyWinTop = function getMyWinTop(wind) {
+  wind = wind ? wind : win;
+  try {
+    wind.parent.document;
+    return getMyWinTop(wind.parent);
+  } catch (error) {
+    return wind;
+  }
+};
+
 /**
  * getWeekNumber
  * @desc 当年第几周
@@ -3002,6 +3017,7 @@ var watermark = function watermark(option) {
   getCurrentDate: getCurrentDate,
   getCurrentDateTime: getCurrentDateTime,
   getHour: getHour,
+  getMyWinTop: getMyWinTop,
   getWeekNumber: getWeekNumber,
   getLength: getLength,
   getMainConfig: getMainConfig,
@@ -3732,8 +3748,8 @@ module.exports = require("vue");
 // 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/data-table/src/main.vue?vue&type=template&id=4d70cb63&
-var mainvue_type_template_id_4d70cb63_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=7f4bdc14&
+var mainvue_type_template_id_7f4bdc14_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3999,10 +4015,10 @@ var mainvue_type_template_id_4d70cb63_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_4d70cb63_render._withStripped = true
+mainvue_type_template_id_7f4bdc14_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=4d70cb63&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=7f4bdc14&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -6327,7 +6343,11 @@ var mainvue_type_script_lang_js_components, _watch;
     least: Boolean,
     //保留搜索参数
     retainSearh: Boolean,
-    infiniteScroll: Boolean
+    infiniteScroll: Boolean,
+    isJoin: {
+      type: Boolean,
+      default: true
+    }
   },
   data: function data() {
     return {
@@ -6781,7 +6801,6 @@ var mainvue_type_script_lang_js_components, _watch;
     getTableData: function getTableData(res) {
       var _this7 = this;
 
-      console.log(11212);
       var where = void 0;
       var first = void 0;
       if (res) {
@@ -6805,6 +6824,13 @@ var mainvue_type_script_lang_js_components, _watch;
       if (this.retainSearh) {
         reqData = util["a" /* default */].extend({}, reqData, this.wheres);
       }
+      if (this.isJoin) {
+        for (var i in reqData) {
+          if (Array.isArray(reqData[i])) {
+            reqData[i] = reqData[i].join(',');
+          }
+        }
+      }
       this.tableLoading = true;
       util["a" /* default */].ajax({
         url: this.url,
@@ -7326,7 +7352,7 @@ var mainvue_type_script_lang_js_components, _watch;
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_4d70cb63_render,
+  mainvue_type_template_id_7f4bdc14_render,
   staticRenderFns,
   false,
   null,

package/lib/date-picker.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 71);
+/******/ 	return __webpack_require__(__webpack_require__.s = 72);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -1250,6 +1250,21 @@ var getHour = function getHour(datetime) {
   return datetimeObj.getHours();
 };
 
+/**
+ * getMyWinTop
+ * @desc 获取同域的top窗口
+ * @param {object} wind - window对象
+ **/
+var getMyWinTop = function getMyWinTop(wind) {
+  wind = wind ? wind : win;
+  try {
+    wind.parent.document;
+    return getMyWinTop(wind.parent);
+  } catch (error) {
+    return wind;
+  }
+};
+
 /**
  * getWeekNumber
  * @desc 当年第几周
@@ -3003,6 +3018,7 @@ var watermark = function watermark(option) {
   getCurrentDate: getCurrentDate,
   getCurrentDateTime: getCurrentDateTime,
   getHour: getHour,
+  getMyWinTop: getMyWinTop,
   getWeekNumber: getWeekNumber,
   getLength: getLength,
   getMainConfig: getMainConfig,
@@ -3682,7 +3698,7 @@ var WebSocket = function () {
 
 /***/ }),
 
-/***/ 71:
+/***/ 72:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/dialog.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 41);
+/******/ 	return __webpack_require__(__webpack_require__.s = 42);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -1249,6 +1249,21 @@ var getHour = function getHour(datetime) {
   return datetimeObj.getHours();
 };
 
+/**
+ * getMyWinTop
+ * @desc 获取同域的top窗口
+ * @param {object} wind - window对象
+ **/
+var getMyWinTop = function getMyWinTop(wind) {
+  wind = wind ? wind : win;
+  try {
+    wind.parent.document;
+    return getMyWinTop(wind.parent);
+  } catch (error) {
+    return wind;
+  }
+};
+
 /**
  * getWeekNumber
  * @desc 当年第几周
@@ -3002,6 +3017,7 @@ var watermark = function watermark(option) {
   getCurrentDate: getCurrentDate,
   getCurrentDateTime: getCurrentDateTime,
   getHour: getHour,
+  getMyWinTop: getMyWinTop,
   getWeekNumber: getWeekNumber,
   getLength: getLength,
   getMainConfig: getMainConfig,
@@ -3739,14 +3755,15 @@ module.exports = require("wujie-vue2");
 /* 38 */,
 /* 39 */,
 /* 40 */,
-/* 41 */
+/* 41 */,
+/* 42 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 // 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/dialog/src/main.vue?vue&type=template&id=2b57a71d&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/dialog/src/main.vue?vue&type=template&id=2a4878f7&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4260,7 +4277,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/dialog/src/main.vue?vue&type=template&id=2b57a71d&
+// CONCATENATED MODULE: ./packages/dialog/src/main.vue?vue&type=template&id=2a4878f7&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(12);
@@ -4670,18 +4687,15 @@ var mainvue_type_script_lang_js_bus = external_wujie_vue2_default.a.bus;
 
     var availWidth = 0;
     var availHeight = 0;
+    var win = void 0;
     try {
-      availWidth = util["a" /* default */].win.top.document.body.offsetWidth - 260;
-      availHeight = util["a" /* default */].win.top.document.body.offsetHeight - 60;
+      util["a" /* default */].win.top.document;
+      win = util["a" /* default */].win.top;
     } catch (error) {
-      try {
-        availWidth = util["a" /* default */].win.parent.document.body.offsetWidth - 260;
-        availHeight = util["a" /* default */].win.parent.document.body.offsetHeight - 60;
-      } catch (error) {
-        availWidth = util["a" /* default */].win.document.body.offsetWidth - 260;
-        availHeight = util["a" /* default */].win.document.body.offsetHeight - 60;
-      }
+      win = util["a" /* default */].getMyWinTop();
     }
+    availWidth = win.document.body.offsetWidth - 260;
+    availHeight = win.document.body.offsetHeight - 60;
     this.sizes.max = { width: availWidth + 'px', height: availHeight + 'px' };
     if (this.size === 'full' || this.width == '100%' && this.height == '100%') {
       this.full = true;
@@ -4821,6 +4835,9 @@ var mainvue_type_script_lang_js_bus = external_wujie_vue2_default.a.bus;
       this.zoom = res;
       this.$set(this.scales, 'zoom', res);
       this.$emit('scale', res);
+    },
+    getDialog: function getDialog() {
+      return this.$refs[this.wujieName].$refs['dialog'];
     }
   }
 });

package/lib/enterprise.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 42);
+/******/ 	return __webpack_require__(__webpack_require__.s = 43);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 42:
+/***/ 43:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";