eoss-ui 0.5.75 → 0.5.76

package/lib/button-group.js

@@ -2304,6 +2304,31 @@ var isObject = function isObject(obj) {
   return typeof Ctor === 'function' && Object.prototype.hasOwnProperty.toString.call(Ctor) === ObjectFunctionString;
 };
 
+/**
+ * isObjectEqual
+ * @desc:判断对象是否相等
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] - 对象
+ * @param {Object} [_obj] - 对象
+ **/
+var isObjectEqual = function isObjectEqual(obj, _obj) {
+  if (obj === undefined && _obj || obj && _obj === undefined) {
+    return false;
+  }
+  var aProps = Object.getOwnPropertyNames(obj);
+  var bProps = Object.getOwnPropertyNames(_obj);
+  if (aProps.length !== bProps.length) {
+    return false;
+  }
+  for (var i in obj) {
+    if (obj[i] !== _obj[i]) {
+      return false;
+    }
+  }
+  return true;
+};
+
 /**
  * jointUrl
  * @desc:判断url地址是否以字符开头，没有则添加
@@ -3180,6 +3205,7 @@ var watermark = function watermark(option) {
   isLogged: isLogged,
   isLogined: isLogined,
   isObject: isObject,
+  isObjectEqual: isObjectEqual,
   jointUrl: jointUrl,
   loadJs: loadJs,
   loading: loading,

package/lib/button.js

@@ -2304,6 +2304,31 @@ var isObject = function isObject(obj) {
   return typeof Ctor === 'function' && Object.prototype.hasOwnProperty.toString.call(Ctor) === ObjectFunctionString;
 };
 
+/**
+ * isObjectEqual
+ * @desc:判断对象是否相等
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] - 对象
+ * @param {Object} [_obj] - 对象
+ **/
+var isObjectEqual = function isObjectEqual(obj, _obj) {
+  if (obj === undefined && _obj || obj && _obj === undefined) {
+    return false;
+  }
+  var aProps = Object.getOwnPropertyNames(obj);
+  var bProps = Object.getOwnPropertyNames(_obj);
+  if (aProps.length !== bProps.length) {
+    return false;
+  }
+  for (var i in obj) {
+    if (obj[i] !== _obj[i]) {
+      return false;
+    }
+  }
+  return true;
+};
+
 /**
  * jointUrl
  * @desc:判断url地址是否以字符开头，没有则添加
@@ -3180,6 +3205,7 @@ var watermark = function watermark(option) {
   isLogged: isLogged,
   isLogined: isLogined,
   isObject: isObject,
+  isObjectEqual: isObjectEqual,
   jointUrl: jointUrl,
   loadJs: loadJs,
   loading: loading,

package/lib/checkbox-group.js

@@ -2303,6 +2303,31 @@ var isObject = function isObject(obj) {
   return typeof Ctor === 'function' && Object.prototype.hasOwnProperty.toString.call(Ctor) === ObjectFunctionString;
 };
 
+/**
+ * isObjectEqual
+ * @desc:判断对象是否相等
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] - 对象
+ * @param {Object} [_obj] - 对象
+ **/
+var isObjectEqual = function isObjectEqual(obj, _obj) {
+  if (obj === undefined && _obj || obj && _obj === undefined) {
+    return false;
+  }
+  var aProps = Object.getOwnPropertyNames(obj);
+  var bProps = Object.getOwnPropertyNames(_obj);
+  if (aProps.length !== bProps.length) {
+    return false;
+  }
+  for (var i in obj) {
+    if (obj[i] !== _obj[i]) {
+      return false;
+    }
+  }
+  return true;
+};
+
 /**
  * jointUrl
  * @desc:判断url地址是否以字符开头，没有则添加
@@ -3179,6 +3204,7 @@ var watermark = function watermark(option) {
   isLogged: isLogged,
   isLogined: isLogined,
   isObject: isObject,
+  isObjectEqual: isObjectEqual,
   jointUrl: jointUrl,
   loadJs: loadJs,
   loading: loading,

package/lib/data-table-form.js

@@ -2303,6 +2303,31 @@ var isObject = function isObject(obj) {
   return typeof Ctor === 'function' && Object.prototype.hasOwnProperty.toString.call(Ctor) === ObjectFunctionString;
 };
 
+/**
+ * isObjectEqual
+ * @desc:判断对象是否相等
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] - 对象
+ * @param {Object} [_obj] - 对象
+ **/
+var isObjectEqual = function isObjectEqual(obj, _obj) {
+  if (obj === undefined && _obj || obj && _obj === undefined) {
+    return false;
+  }
+  var aProps = Object.getOwnPropertyNames(obj);
+  var bProps = Object.getOwnPropertyNames(_obj);
+  if (aProps.length !== bProps.length) {
+    return false;
+  }
+  for (var i in obj) {
+    if (obj[i] !== _obj[i]) {
+      return false;
+    }
+  }
+  return true;
+};
+
 /**
  * jointUrl
  * @desc:判断url地址是否以字符开头，没有则添加
@@ -3179,6 +3204,7 @@ var watermark = function watermark(option) {
   isLogged: isLogged,
   isLogined: isLogined,
   isObject: isObject,
+  isObjectEqual: isObjectEqual,
   jointUrl: jointUrl,
   loadJs: loadJs,
   loading: loading,

package/lib/data-table.js

@@ -2303,6 +2303,31 @@ var isObject = function isObject(obj) {
   return typeof Ctor === 'function' && Object.prototype.hasOwnProperty.toString.call(Ctor) === ObjectFunctionString;
 };
 
+/**
+ * isObjectEqual
+ * @desc:判断对象是否相等
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] - 对象
+ * @param {Object} [_obj] - 对象
+ **/
+var isObjectEqual = function isObjectEqual(obj, _obj) {
+  if (obj === undefined && _obj || obj && _obj === undefined) {
+    return false;
+  }
+  var aProps = Object.getOwnPropertyNames(obj);
+  var bProps = Object.getOwnPropertyNames(_obj);
+  if (aProps.length !== bProps.length) {
+    return false;
+  }
+  for (var i in obj) {
+    if (obj[i] !== _obj[i]) {
+      return false;
+    }
+  }
+  return true;
+};
+
 /**
  * jointUrl
  * @desc:判断url地址是否以字符开头，没有则添加
@@ -3179,6 +3204,7 @@ var watermark = function watermark(option) {
   isLogged: isLogged,
   isLogined: isLogined,
   isObject: isObject,
+  isObjectEqual: isObjectEqual,
   jointUrl: jointUrl,
   loadJs: loadJs,
   loading: loading,
@@ -3902,8 +3928,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=202d0a16&
-var mainvue_type_template_id_202d0a16_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=f80417f8&
+var mainvue_type_template_id_f80417f8_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4214,10 +4240,10 @@ var mainvue_type_template_id_202d0a16_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_202d0a16_render._withStripped = true
+mainvue_type_template_id_f80417f8_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=202d0a16&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=f80417f8&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -6634,7 +6660,8 @@ var mainvue_type_script_lang_js_components, _watch;
         pageSize: 20,
         totalCount: 0
       },
-      wheres: {},
+      searchWhere: {},
+      advanceWhere: {},
       tableHeight: 'auto',
       styles: {},
       selected: null,
@@ -6648,6 +6675,9 @@ var mainvue_type_script_lang_js_components, _watch;
   },
 
   computed: {
+    wheres: function wheres() {
+      return mainvue_type_script_lang_js_extends({}, this.searchWhere, this.advanceWhere);
+    },
     params: function params() {
       return mainvue_type_script_lang_js_extends({}, this.param || {}, this.searchValue || {}, this.advanceValue || {});
     },
@@ -7506,18 +7536,19 @@ var mainvue_type_script_lang_js_components, _watch;
       this.$emit('next', res);
     },
     hanleSearch: function hanleSearch(data) {
-      this.wheres = this.response !== undefined ? this.response({
+      this.searchWhere = this.response !== undefined ? this.response({
         type: 'search',
         data: JSON.parse(JSON.stringify(data))
       }) : data;
       if (this.url && this.executeSearch) {
         this.getTableData({ where: this.wheres });
       }
-      this.$emit('search', this.wheres);
+      this.$emit('search', this.searchWhere);
     },
     hanleReset: function hanleReset() {
+      this.searchWhere = {};
+      this.advanceWhere = {};
       if (this.url) {
-        this.wheres = {};
         this.getTableData();
       }
       this.$emit('reset', this.params);
@@ -7526,21 +7557,20 @@ var mainvue_type_script_lang_js_components, _watch;
       var data = _ref.data,
           show = _ref.show;
 
-      var where = this.response !== undefined ? this.response({
+      this.advanceWhere = this.response !== undefined ? this.response({
         type: 'filter',
         data: JSON.parse(JSON.stringify(data))
       }) : data;
-      this.wheres = mainvue_type_script_lang_js_extends({}, this.wheres, where);
       if (this.url && this.executeFilter) {
         this.getTableData({ where: this.wheres });
       }
-      this.$emit('submit', { data: where, where: this.wheres, show: show });
+      this.$emit('submit', {
+        data: this.advanceWhere,
+        where: this.wheres,
+        show: show
+      });
     },
     hanleCancel: function hanleCancel() {
-      // if (this.url && JSON.stringify(this.wheres) !== '{}') {
-      //   this.wheres = {};
-      //   this.getTableData();
-      // }
       this.$emit('cancel', this.params);
     },
     handleTabs: function handleTabs(_ref2) {
@@ -7674,7 +7704,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_202d0a16_render,
+  mainvue_type_template_id_f80417f8_render,
   staticRenderFns,
   false,
   null,

package/lib/date-picker.js

@@ -2304,6 +2304,31 @@ var isObject = function isObject(obj) {
   return typeof Ctor === 'function' && Object.prototype.hasOwnProperty.toString.call(Ctor) === ObjectFunctionString;
 };
 
+/**
+ * isObjectEqual
+ * @desc:判断对象是否相等
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] - 对象
+ * @param {Object} [_obj] - 对象
+ **/
+var isObjectEqual = function isObjectEqual(obj, _obj) {
+  if (obj === undefined && _obj || obj && _obj === undefined) {
+    return false;
+  }
+  var aProps = Object.getOwnPropertyNames(obj);
+  var bProps = Object.getOwnPropertyNames(_obj);
+  if (aProps.length !== bProps.length) {
+    return false;
+  }
+  for (var i in obj) {
+    if (obj[i] !== _obj[i]) {
+      return false;
+    }
+  }
+  return true;
+};
+
 /**
  * jointUrl
  * @desc:判断url地址是否以字符开头，没有则添加
@@ -3180,6 +3205,7 @@ var watermark = function watermark(option) {
   isLogged: isLogged,
   isLogined: isLogined,
   isObject: isObject,
+  isObjectEqual: isObjectEqual,
   jointUrl: jointUrl,
   loadJs: loadJs,
   loading: loading,

package/lib/dialog.js

@@ -2303,6 +2303,31 @@ var isObject = function isObject(obj) {
   return typeof Ctor === 'function' && Object.prototype.hasOwnProperty.toString.call(Ctor) === ObjectFunctionString;
 };
 
+/**
+ * isObjectEqual
+ * @desc:判断对象是否相等
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] - 对象
+ * @param {Object} [_obj] - 对象
+ **/
+var isObjectEqual = function isObjectEqual(obj, _obj) {
+  if (obj === undefined && _obj || obj && _obj === undefined) {
+    return false;
+  }
+  var aProps = Object.getOwnPropertyNames(obj);
+  var bProps = Object.getOwnPropertyNames(_obj);
+  if (aProps.length !== bProps.length) {
+    return false;
+  }
+  for (var i in obj) {
+    if (obj[i] !== _obj[i]) {
+      return false;
+    }
+  }
+  return true;
+};
+
 /**
  * jointUrl
  * @desc:判断url地址是否以字符开头，没有则添加
@@ -3179,6 +3204,7 @@ var watermark = function watermark(option) {
   isLogged: isLogged,
   isLogined: isLogined,
   isObject: isObject,
+  isObjectEqual: isObjectEqual,
   jointUrl: jointUrl,
   loadJs: loadJs,
   loading: loading,