eoss-ui 0.5.74 → 0.5.76

package/packages/theme-chalk/src/main.scss

@@ -21,7 +21,7 @@
 
     .es-main-logo {
       max-height: 60%;
-      margin-left: 20px;
+      margin-left: 50px;
     }
 
     .es-logo-error {
@@ -185,7 +185,10 @@
       padding-top: 16px;
       padding-bottom: 16px;
     }
-    .es-nav-main {
+    .es-main-left {
+      border-right: $--border-base;
+    }
+    .es-nav-main:not(.es-nav-overlap) {
       background-color: transparent;
       border-right: 0;
     }

package/packages/toolbar/src/main.vue

@@ -137,8 +137,16 @@ export default {
     let filter = [];
 
     this.contents.forEach((items) => {
-      let { config, type, reset, multiCondition, contents, group, ...other } =
-        items;
+      let {
+        config,
+        type,
+        reset,
+        multiCondition,
+        contents,
+        group,
+        events,
+        ...other
+      } = items;
       if (type === 'text') {
         text = [
           h(
@@ -370,10 +378,12 @@ export default {
                           model: this.advancedData,
                           contents: contents
                         },
-                        on: {
-                          submit: this.hanleSubmit,
-                          reset: this.hanleCancel
-                        }
+                        on: events
+                          ? events
+                          : {
+                              submit: this.hanleSubmit,
+                              reset: this.hanleCancel
+                            }
                       },
                       []
                     )

package/packages/tree/src/main.vue

@@ -365,6 +365,18 @@ export default {
           this.$refs.oaTree.filter(val);
         }
       }
+    },
+    param: {
+      deep: true,
+      handler() {
+        this.getTreeData();
+      }
+    },
+    where: {
+      deep: true,
+      handler() {
+        this.getTreeData();
+      }
     }
   },
   beforeCreate() {
@@ -393,7 +405,7 @@ export default {
     },
     //获取树节点
     getTreeDatas(param) {
-      let params = util.extend({}, this.param, this.where, param);
+      let params = util.extend({}, this.param, this.where, param || {});
       if (!this.url || !this.isRemote) return;
       this.loading = true;
       util

package/packages/tree-group/src/main.vue

@@ -87,7 +87,7 @@
         <template v-if="buttons" slot="button">
           <es-button
             v-for="(item, index) in buttons"
-            :key="index"
+            :key="item.id || index"
             size="small"
             v-bind="item"
             v-on="item.events"
@@ -112,11 +112,15 @@
       >
       </es-tabs> -->
         <es-data-table
-          :key="count"
           v-else-if="table"
           size="mini"
-          v-bind="{ close: true, ...table }"
-          :param="param"
+          v-bind="
+            handleExclAttribute({
+              data: { close: true, ...table },
+              attrs: ['param']
+            })
+          "
+          :param="params"
           :ref="table.ref ? table.ref : 'esDataTable'"
           v-on="{ ...$listeners, ...table.events }"
         >
@@ -276,17 +280,6 @@ export default {
           return 'wujie';
         }
       }
-    },
-    param() {
-      if (this.params) {
-        return this.params;
-      } else if (
-        this.table &&
-        Object.prototype.hasOwnProperty.call(this.table, 'param')
-      ) {
-        return this.table.param;
-      }
-      return undefined;
     }
   },
   watch: {
@@ -306,34 +299,23 @@ export default {
         }
       }
     },
+    'table.param': {
+      immediate: true,
+      deep: true,
+      handler(val, old) {
+        if (!util.isObjectEqual(val, old)) {
+          this.params = JSON.parse(JSON.stringify(val || {}));
+        }
+      }
+    },
     checkeds: {
       deep: true,
       handler() {
         let params = this.setParams();
         if (params) {
-          if (
-            this.table &&
-            Object.prototype.hasOwnProperty.call(this.table, 'param')
-          ) {
-            this.params = util.extend(true, this.table.param, params);
-          } else {
-            this.params = params;
-          }
+          this.params = { ...this.params, ...params };
         }
       }
-    },
-    //监听table，变化后重新加载，解决点击树节点后改变table对象导致的样式错乱问题
-    table: {
-      handler(val, oldVal) {
-        if (val && val.param) {
-          this.params = { ...this.params, ...val.param };
-        }
-        if (oldVal && val && val.url !== oldVal.url) {
-          this.count++;
-        }
-      },
-      deep: true,
-      immediate: true
     }
   },
   data() {
@@ -341,13 +323,18 @@ export default {
       active: '0',
       checkeds: null,
       params: null,
-      count: 0,
       wjprops: {}
     };
   },
   created() {},
   mounted() {},
   methods: {
+    handleExclAttribute({ data, attrs }) {
+      return util.exclAttribute({
+        data: data,
+        attrs: attrs
+      });
+    },
     getUrl(url, param, res) {
       let urls = url.split('?');
       if (urls[0].indexOf('.js') > 0) {

package/packages/wxlogin/src/main.vue

@@ -1,16 +1,17 @@
 <template>
   <div
     id="wxqrcode"
+    ref="wxqrcode"
     class="es-wx-qrcode"
-    :style="{ width: width, height: height }"
+    :style="{ width: mwidth, height: mheight }"
   >
     <iframe
-      v-if="src"
+      v-if="src && mwidth && mheight"
       frameborder="0"
       allowTransparency="true"
       scrolling="no"
-      :width="width"
-      :height="height"
+      :width="mwidth"
+      :height="mheight"
       :src="src"
     ></iframe>
   </div>
@@ -28,7 +29,7 @@ export default {
       default: false
     },
     appid: {
-      required: true,
+      //required: true,
       type: String
     },
     scope: {
@@ -36,20 +37,20 @@ export default {
       type: [String, Array]
     },
     redirect_uri: {
-      required: true,
+      //required: true,
       type: String
     },
     state: String,
     color: {
       type: String,
-      validator: value => {
+      validator: (value) => {
         return ['black', 'white'].includes(value);
       }
     },
     href: String,
     lang: {
       type: String,
-      validator: value => {
+      validator: (value) => {
         return ['en', 'cn'].includes(value);
       }
     },
@@ -59,8 +60,9 @@ export default {
     },
     height: {
       type: String,
-      default: '400px'
+      default: '300px'
     },
+    auto: Boolean,
     param: {
       type: Object,
       default() {
@@ -70,15 +72,31 @@ export default {
   },
   data() {
     return {
-      src: ''
+      src: '',
+      mwidth: 0,
+      mheight: 0
     };
   },
   computed: {},
   watch: {},
-  created() {
+  created() {},
+  mounted() {
+    if (this.auto) {
+      let parent = this.$refs.wxqrcode.parentNode;
+      let h =
+        parent.offsetHeight -
+        parseInt(util.getStyle(parent, 'padding-top'), 10) -
+        parseInt(util.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() {},
   methods: {
     wxLogin() {
       let option = util.extend(

package/src/index.js

@@ -121,7 +121,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.5.74',
+  version: '0.5.76',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -555,6 +555,35 @@ const calculateNetworkDays = function (start_date, end_date, holidays = []) {
   return workdays;
 };
 
+/**
+ * chunkToChinese
+ * @desc 将四位数的整数转换为中文大写
+ * @param {number} chunk - 数字
+ **/
+function chunkToChinese(chunk) {
+  const numberToChinese = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+  const capitalDigits = ['', '拾', '佰', '仟'];
+
+  let result = '';
+  let digitIndex = 0;
+
+  while (chunk > 0) {
+    const 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 指定连接符合并文本
@@ -1753,6 +1782,34 @@ const getWeekday = function (date, type = 0) {
   return adjustedDay === 0 ? 7 : adjustedDay;
 };
 
+/**
+ * getZoom
+ * @desc 获取缩放比
+ * @param {number} n - 可选参数，表示星期的起始日，0 表示星期天，1 表示星期一，以此类推，默认为 0
+ **/
+const getZoom = function () {
+  let ratio = 0;
+  let screen = window.screen;
+  let 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参数中的时间戳
@@ -2226,6 +2283,31 @@ const isObject = function (obj) {
   );
 };
 
+/**
+ * isObjectEqual
+ * @desc:判断对象是否相等
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] - 对象
+ * @param {Object} [_obj] - 对象
+ **/
+const isObjectEqual = function (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 (let i in obj) {
+    if (obj[i] !== _obj[i]) {
+      return false;
+    }
+  }
+  return true;
+};
+
 /**
  * jointUrl
  * @desc:判断url地址是否以字符开头，没有则添加
@@ -2525,32 +2607,63 @@ const rmbToCapital = function (number) {
 
   return result;
 };
-
-// 辅助函数，将四位数的整数转换为中文大写
-function chunkToChinese(chunk) {
-  const numberToChinese = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
-  const capitalDigits = ['', '拾', '佰', '仟'];
-
-  let result = '';
-  let digitIndex = 0;
-
-  while (chunk > 0) {
-    const digit = chunk % 10;
-    if (digit > 0) {
-      result = numberToChinese[digit] + capitalDigits[digitIndex] + result;
+/**
+ * setScale
+ * @desc 设置缩放
+ * @param {number} width - 分辨率宽度
+ * @param {number} height - 分辨率高度
+ **/
+const setScale = function (width = 1920, height = 1080) {
+  let n = 1;
+  let isMac = /macintosh|mac os x/i.test(navigator.userAgent);
+  let 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
+  ) {
+    let 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) {
+      let 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;
-      }
+      let 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';
     }
-    chunk = Math.floor(chunk / 10);
-    digitIndex++;
   }
-
-  return result;
-}
-
+};
 /**
  * sendMessage
  * @desc:向iframe发送信息
@@ -3049,6 +3162,7 @@ export default {
   isLogged,
   isLogined,
   isObject,
+  isObjectEqual,
   jointUrl,
   loadJs,
   loading,
@@ -3063,6 +3177,7 @@ export default {
   rmbToCapital,
   sendMessage,
   setFavicon,
+  setScale,
   setStorage,
   socket,
   startWith,