eoss-ui 0.5.74 → 0.5.76

package/lib/wxlogin.js

@@ -621,6 +621,35 @@ var calculateNetworkDays = function calculateNetworkDays(start_date, end_date) {
   return workdays;
 };
 
+/**
+ * chunkToChinese
+ * @desc 将四位数的整数转换为中文大写
+ * @param {number} chunk - 数字
+ **/
+function chunkToChinese(chunk) {
+  var numberToChinese = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+  var capitalDigits = ['', '拾', '佰', '仟'];
+
+  var result = '';
+  var digitIndex = 0;
+
+  while (chunk > 0) {
+    var digit = chunk % 10;
+    if (digit > 0) {
+      result = numberToChinese[digit] + capitalDigits[digitIndex] + result;
+    } else {
+      // 当前数字是零，需要判断是否需要添加零
+      if (result.charAt(0) !== '零') {
+        result = '零' + result;
+      }
+    }
+    chunk = Math.floor(chunk / 10);
+    digitIndex++;
+  }
+
+  return result;
+}
+
 /**
  * concatenate
  * @desc 指定连接符合并文本
@@ -1816,6 +1845,31 @@ var getWeekday = function getWeekday(date) {
   return adjustedDay === 0 ? 7 : adjustedDay;
 };
 
+/**
+ * getZoom
+ * @desc 获取缩放比
+ * @param {number} n - 可选参数，表示星期的起始日，0 表示星期天，1 表示星期一，以此类推，默认为 0
+ **/
+var getZoom = function getZoom() {
+  var ratio = 0;
+  var screen = window.screen;
+  var ua = navigator.userAgent.toLowerCase();
+  if (window.devicePixelRatio !== undefined) {
+    ratio = window.devicePixelRatio;
+  } else if (~ua.indexOf('msie')) {
+    if (screen.deviceXDPI && screen.logicalXDPI) {
+      ratio = screen.deviceXDPI / screen.logicalXDPI;
+    }
+  } else if (window.outerWidth !== undefined && window.innerWidth !== undefined) {
+    ratio = window.outerWidth / window.innerWidth;
+  }
+
+  if (ratio) {
+    ratio = Math.round(ratio * 100);
+  }
+
+  return ratio / 100;
+};
 /**
  * handlerUrl
  * @desc:更新url参数中的时间戳
@@ -2250,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地址是否以字符开头，没有则添加
@@ -2558,32 +2637,53 @@ var rmbToCapital = function rmbToCapital(number) {
 
   return result;
 };
+/**
+ * setScale
+ * @desc 设置缩放
+ * @param {number} width - 分辨率宽度
+ * @param {number} height - 分辨率高度
+ **/
+var setScale = function setScale() {
+  var width = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1920;
+  var height = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1080;
 
-// 辅助函数，将四位数的整数转换为中文大写
-function chunkToChinese(chunk) {
-  var numberToChinese = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
-  var capitalDigits = ['', '拾', '佰', '仟'];
-
-  var result = '';
-  var digitIndex = 0;
-
-  while (chunk > 0) {
-    var digit = chunk % 10;
-    if (digit > 0) {
-      result = numberToChinese[digit] + capitalDigits[digitIndex] + result;
+  var n = 1;
+  var isMac = /macintosh|mac os x/i.test(navigator.userAgent);
+  var zoom = getZoom();
+  if (isMac) {
+    n = 2;
+  } else {
+    n = 1;
+  }
+  if (zoom === 1) {
+    document.body.style.removeProperty('transform');
+    document.body.style.removeProperty('width');
+    document.body.style.removeProperty('height');
+    document.body.style.removeProperty('transform-origin');
+    return;
+  }
+  if (Math.abs(parseInt(width - window.innerWidth * zoom / n, 10)) > 15 && window.innerWidth * zoom / n !== width) {
+    var scale = 'scale(' + window.innerWidth * zoom / width / zoom + ',' + window.innerHeight * zoom / height / zoom + ')';
+    document.body.style.transform = scale;
+    document.body.style.width = width + 'px';
+    document.body.style.height = height + 'px';
+    document.body.style.transformOrigin = '0 0';
+  } else {
+    if (isMac) {
+      var _scale = 'scale(' + 1 * n / zoom + ')';
+      document.body.style.transform = _scale;
+      document.body.style.width = parseInt(window.innerWidth * zoom / n, 10) + 'px';
+      document.body.style.height = parseInt(window.innerHeight * zoom / n, 10) + 'px';
+      document.body.style.transformOrigin = '0 0';
     } else {
-      // 当前数字是零，需要判断是否需要添加零
-      if (result.charAt(0) !== '零') {
-        result = '零' + result;
-      }
+      var _scale2 = 'scale(' + 1 * n / zoom + ')';
+      document.body.style.transform = _scale2;
+      document.body.style.width = parseInt(window.innerWidth * zoom / n, 10) + 'px';
+      document.body.style.height = parseInt(window.innerHeight * zoom / n, 10) + 'px';
+      document.body.style.transformOrigin = '0 0';
     }
-    chunk = Math.floor(chunk / 10);
-    digitIndex++;
   }
-
-  return result;
-}
-
+};
 /**
  * sendMessage
  * @desc:向iframe发送信息
@@ -3105,6 +3205,7 @@ var watermark = function watermark(option) {
   isLogged: isLogged,
   isLogined: isLogined,
   isObject: isObject,
+  isObjectEqual: isObjectEqual,
   jointUrl: jointUrl,
   loadJs: loadJs,
   loading: loading,
@@ -3119,6 +3220,7 @@ var watermark = function watermark(option) {
   rmbToCapital: rmbToCapital,
   sendMessage: sendMessage,
   setFavicon: setFavicon,
+  setScale: setScale,
   setStorage: setStorage,
   socket: socket,
   startWith: startWith,
@@ -3778,7 +3880,7 @@ var WebSocket = function () {
 // 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/wxlogin/src/main.vue?vue&type=template&id=6da39de6&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/wxlogin/src/main.vue?vue&type=template&id=18c0a641&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3786,19 +3888,20 @@ var render = function () {
   return _c(
     "div",
     {
+      ref: "wxqrcode",
       staticClass: "es-wx-qrcode",
-      style: { width: _vm.width, height: _vm.height },
+      style: { width: _vm.mwidth, height: _vm.mheight },
       attrs: { id: "wxqrcode" },
     },
     [
-      _vm.src
+      _vm.src && _vm.mwidth && _vm.mheight
         ? _c("iframe", {
             attrs: {
               frameborder: "0",
               allowTransparency: "true",
               scrolling: "no",
-              width: _vm.width,
-              height: _vm.height,
+              width: _vm.mwidth,
+              height: _vm.mheight,
               src: _vm.src,
             },
           })
@@ -3810,7 +3913,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/wxlogin/src/main.vue?vue&type=template&id=6da39de6&
+// CONCATENATED MODULE: ./packages/wxlogin/src/main.vue?vue&type=template&id=18c0a641&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3837,6 +3940,7 @@ var external_qs_default = /*#__PURE__*/__webpack_require__.n(external_qs_);
 //
 //
 //
+//
 
 
 
@@ -3850,7 +3954,7 @@ var external_qs_default = /*#__PURE__*/__webpack_require__.n(external_qs_);
       default: false
     },
     appid: {
-      required: true,
+      //required: true,
       type: String
     },
     scope: {
@@ -3858,7 +3962,7 @@ var external_qs_default = /*#__PURE__*/__webpack_require__.n(external_qs_);
       type: [String, Array]
     },
     redirect_uri: {
-      required: true,
+      //required: true,
       type: String
     },
     state: String,
@@ -3881,8 +3985,9 @@ var external_qs_default = /*#__PURE__*/__webpack_require__.n(external_qs_);
     },
     height: {
       type: String,
-      default: '400px'
+      default: '300px'
     },
+    auto: Boolean,
     param: {
       type: Object,
       default: function _default() {
@@ -3892,16 +3997,29 @@ var external_qs_default = /*#__PURE__*/__webpack_require__.n(external_qs_);
   },
   data: function data() {
     return {
-      src: ''
+      src: '',
+      mwidth: 0,
+      mheight: 0
     };
   },
 
   computed: {},
   watch: {},
-  created: function created() {
+  created: function created() {},
+  mounted: function mounted() {
+    if (this.auto) {
+      var parent = this.$refs.wxqrcode.parentNode;
+      var h = parent.offsetHeight - parseInt(util["a" /* default */].getStyle(parent, 'padding-top'), 10) - parseInt(util["a" /* default */].getStyle(parent, 'padding-bottom'), 10);
+      if (h > 0) {
+        this.mwidth = h + 'px';
+        this.mheight = h + 'px';
+      }
+    } else {
+      this.mwidth = this.width;
+      this.mheight = this.height;
+    }
     this.wxLogin();
   },
-  mounted: function mounted() {},
 
   methods: {
     wxLogin: function wxLogin() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.74",
+  "version": "0.5.76",
   "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.99",
+    "eoss-element": "^0.2.102",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

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

@@ -447,7 +447,8 @@ export default {
         pageSize: 20,
         totalCount: 0
       },
-      wheres: {},
+      searchWhere: {},
+      advanceWhere: {},
       tableHeight: 'auto',
       styles: {},
       selected: null,
@@ -460,6 +461,9 @@ export default {
     };
   },
   computed: {
+    wheres() {
+      return { ...this.searchWhere, ...this.advanceWhere };
+    },
     params() {
       return {
         ...(this.param || {}),
@@ -476,6 +480,7 @@ export default {
     theads: {
       get() {
         let thead = [];
+        let addfilter = false;
         let types = this.theadData
           .filter((item) => {
             return (
@@ -488,6 +493,7 @@ export default {
             return item.type;
           });
         if (this.dragSort && !types.includes('sort')) {
+          addfilter = true;
           thead.push({
             type: 'sort',
             key: 'es-sort'
@@ -501,8 +507,12 @@ export default {
             fixed: 'left',
             selectable: this.selectable,
             reserveSelection: this.reserveSelection,
+            filterIcon: this.filter && !addfilter ? 'es-icon-biao' : undefined,
             key: 'es-checkbox'
           });
+          if (!addfilter) {
+            addfilter = true;
+          }
         }
         if (this.numbers && !types.includes('index')) {
           let index = 1;
@@ -521,9 +531,12 @@ export default {
             align: 'center',
             fixed: 'left',
             index: index,
-            filterIcon: this.filter ? 'es-icon-biao' : undefined,
+            filterIcon: this.filter && !addfilter ? 'es-icon-biao' : undefined,
             key: 'es-index'
           });
+          if (!addfilter) {
+            addfilter = true;
+          }
         }
         if (this.theadData.length) {
           thead = [...thead, ...this.theadData];
@@ -1399,7 +1412,7 @@ export default {
       this.$emit('next', res);
     },
     hanleSearch(data) {
-      this.wheres =
+      this.searchWhere =
         this.response !== undefined
           ? this.response({
               type: 'search',
@@ -1409,37 +1422,34 @@ export default {
       if (this.url && this.executeSearch) {
         this.getTableData({ where: this.wheres });
       }
-      this.$emit('search', this.wheres);
+      this.$emit('search', this.searchWhere);
     },
     hanleReset() {
+      this.searchWhere = {};
+      this.advanceWhere = {};
       if (this.url) {
-        this.wheres = {};
         this.getTableData();
       }
       this.$emit('reset', this.params);
     },
     hanleSubmit({ data, show }) {
-      let where =
+      this.advanceWhere =
         this.response !== undefined
           ? this.response({
               type: 'filter',
               data: JSON.parse(JSON.stringify(data))
             })
           : data;
-      this.wheres = {
-        ...this.wheres,
-        ...where
-      };
       if (this.url && this.executeFilter) {
         this.getTableData({ where: this.wheres });
       }
-      this.$emit('submit', { data: where, where: this.wheres, show });
+      this.$emit('submit', {
+        data: this.advanceWhere,
+        where: this.wheres,
+        show
+      });
     },
     hanleCancel() {
-      // if (this.url && JSON.stringify(this.wheres) !== '{}') {
-      //   this.wheres = {};
-      //   this.getTableData();
-      // }
       this.$emit('cancel', this.params);
     },
     handleTabs({ item, index }) {