eoss-ui 0.5.77 → 0.5.78

package/lib/tips.js

@@ -2313,7 +2313,7 @@ var isObject = function isObject(obj) {
  * @param {Object} [_obj] - 对象
  **/
 var isObjectEqual = function isObjectEqual(obj, _obj) {
-  if (obj === undefined && _obj || obj && _obj === undefined) {
+  if (obj === undefined && _obj || obj && _obj === undefined || obj === undefined && _obj === undefined) {
     return false;
   }
   var aProps = Object.getOwnPropertyNames(obj);

package/lib/tree-group.js

@@ -2313,7 +2313,7 @@ var isObject = function isObject(obj) {
  * @param {Object} [_obj] - 对象
  **/
 var isObjectEqual = function isObjectEqual(obj, _obj) {
-  if (obj === undefined && _obj || obj && _obj === undefined) {
+  if (obj === undefined && _obj || obj && _obj === undefined || obj === undefined && _obj === undefined) {
     return false;
   }
   var aProps = Object.getOwnPropertyNames(obj);

package/lib/tree.js

@@ -2313,7 +2313,7 @@ var isObject = function isObject(obj) {
  * @param {Object} [_obj] - 对象
  **/
 var isObjectEqual = function isObjectEqual(obj, _obj) {
-  if (obj === undefined && _obj || obj && _obj === undefined) {
+  if (obj === undefined && _obj || obj && _obj === undefined || obj === undefined && _obj === undefined) {
     return false;
   }
   var aProps = Object.getOwnPropertyNames(obj);

package/lib/upload.js

@@ -2312,7 +2312,7 @@ var isObject = function isObject(obj) {
  * @param {Object} [_obj] - 对象
  **/
 var isObjectEqual = function isObjectEqual(obj, _obj) {
-  if (obj === undefined && _obj || obj && _obj === undefined) {
+  if (obj === undefined && _obj || obj && _obj === undefined || obj === undefined && _obj === undefined) {
     return false;
   }
   var aProps = Object.getOwnPropertyNames(obj);

package/lib/utils/util.js

@@ -2230,7 +2230,7 @@ var isObject = function isObject(obj) {
  * @param {Object} [_obj] - 对象
  **/
 var isObjectEqual = function isObjectEqual(obj, _obj) {
-  if (obj === undefined && _obj || obj && _obj === undefined) {
+  if (obj === undefined && _obj || obj && _obj === undefined || obj === undefined && _obj === undefined) {
     return false;
   }
   var aProps = Object.getOwnPropertyNames(obj);

package/lib/wujie.js

@@ -2313,7 +2313,7 @@ var isObject = function isObject(obj) {
  * @param {Object} [_obj] - 对象
  **/
 var isObjectEqual = function isObjectEqual(obj, _obj) {
-  if (obj === undefined && _obj || obj && _obj === undefined) {
+  if (obj === undefined && _obj || obj && _obj === undefined || obj === undefined && _obj === undefined) {
     return false;
   }
   var aProps = Object.getOwnPropertyNames(obj);

package/lib/wxlogin.js

@@ -2313,7 +2313,7 @@ var isObject = function isObject(obj) {
  * @param {Object} [_obj] - 对象
  **/
 var isObjectEqual = function isObjectEqual(obj, _obj) {
-  if (obj === undefined && _obj || obj && _obj === undefined) {
+  if (obj === undefined && _obj || obj && _obj === undefined || obj === undefined && _obj === undefined) {
     return false;
   }
   var aProps = Object.getOwnPropertyNames(obj);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.77",
+  "version": "0.5.78",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/clients/src/main.vue

@@ -3,35 +3,61 @@
     <img v-if="logo" class="es-clients-logo" :src="logo" />
     <div class="es-clients-title">
       请通过手机浏览器
-      <template v-if="ios"> （iOS11版本以上的苹果手机使用照相功能） </template>
+      <template v-if="downloads.ios">
+        （iOS11版本以上的苹果手机使用照相功能）
+      </template>
       扫码下载安装
     </div>
     <ul class="es-clients-list">
-      <li v-if="ios" class="es-clients-item">
+      <li
+        class="es-clients-item"
+        v-for="(item, key) in downloads"
+        :key="key"
+        :style="{ width: 100 / num + '%' }"
+      >
         <div class="es-clients-item-title">
-          <i class="es-icon-ios"></i>苹果系统
+          <template v-if="key == 'ios'">
+            <i class="es-icon-ios"></i>苹果系统
+          </template>
+          <template v-if="key == 'android'">
+            <i class="es-icon-android"></i>安卓系统
+          </template>
+          <template v-if="key == 'pad'">
+            <i class="es-icon-pad"></i>平板
+          </template>
+          <template v-if="key == 'uos'">
+            <i class="es-icon-monitor"></i>UOS统信系统
+          </template>
         </div>
-        <es-qr-code :content="ios"></es-qr-code>
-        <div class="es-clients-remark">
+        <div
+          class="es-clients-pc-image"
+          v-if="key == 'mac' || key == 'win' || key == 'linux' || key == 'uos'"
+        >
+          <img :src="pcImage" width="100%" @click.stop="handleDownload(item)" />
+          <div
+            class="es-clients-item-title es-clients-pc-download"
+            @click.stop="handleDownload(item)"
+          >
+            下载
+          </div>
+        </div>
+        <div class="es-qr-code-box" v-else>
+          <es-qr-code :content="item" auto></es-qr-code>
+        </div>
+        <div class="es-clients-remark" v-if="key == 'ios'">
           备注： 苹果手机安装后请在设置- -通用- -设备管理中进行激活操作
         </div>
       </li>
-      <li v-if="android" class="es-clients-item">
+      <li
+        v-if="downloads.mac || downloads.win || downloads.linux"
+        class="es-clients-item"
+        :style="{ width: 100 / num + '%' }"
+      >
         <div class="es-clients-item-title">
-          <i class="es-icon-android"></i>安卓系统
-        </div>
-        <es-qr-code :content="android"></es-qr-code>
-      </li>
-      <li v-if="pad" class="es-clients-item">
-        <div class="es-clients-item-title"><i class="es-icon-pad"></i>平板</div>
-        <es-qr-code :content="pad"></es-qr-code>
-      </li>
-      <li v-if="mac || win || linux" class="es-clients-item">
-        <div class="es-clients-item-title" @click.stop="handleDownload">
           <i class="es-icon-monitor"></i>PC桌面端
         </div>
         <div class="es-clients-pc-image">
-          <img :src="pcImage" width="300" @click.stop="handleDownload" />
+          <img :src="pcImage" width="100%" @click.stop="handleDownload" />
           <div
             class="es-clients-item-title es-clients-pc-download"
             @click.stop="handleDownload"
@@ -49,14 +75,8 @@ export default {
   name: 'EsClients',
   inheritAttrs: false,
   props: {
+    downloads: Object,
     logo: String,
-    ios: String,
-    android: String,
-    pad: String,
-    logo: String,
-    mac: String,
-    win: String,
-    linux: String,
     pcImage: {
       type: String,
       default:
@@ -66,11 +86,19 @@ export default {
   data() {
     return {};
   },
-  computed: {},
+  computed: {
+    num() {
+      return this.downloads ? Object.keys(this.downloads).length : 0;
+    }
+  },
   watch: {},
   mounted() {},
   methods: {
-    handleDownload() {
+    handleDownload(url) {
+      if (url) {
+        window.open(url);
+        return;
+      }
       var isWin =
         navigator.platform == 'Win32' || navigator.platform == 'Windows';
       var isMac =

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

@@ -273,6 +273,10 @@ export default {
       type: Boolean,
       default: false
     },
+    orders: {
+      type: String,
+      default: 'asc'
+    },
     // 是否筛选列功能
     filter: {
       type: Boolean,
@@ -516,7 +520,11 @@ export default {
         }
         if (this.numbers && !types.includes('index')) {
           let index = 1;
-          if (this.infiniteScroll) {
+          if (this.orders == 'desc') {
+            index = (num) => {
+              return this.config.totalCount - num;
+            };
+          } else if (this.infiniteScroll) {
             index = typeof this.index == 'boolean' ? 1 : this.index;
           } else if (this.index || this.index === 0) {
             index =
@@ -554,7 +562,9 @@ export default {
         if (this.list && this.list.length) {
           return this.list;
         }
-        this.config.totalCount = this.data.length - this.lose;
+        if (this.config.totalCount == 0 && this.data.length) {
+          this.config.totalCount = this.data.length - this.lose;
+        }
         if (this.page && this.data.length > this.config.pageSize) {
           return this.data.filter((item, index) => {
             return (
@@ -1104,7 +1114,6 @@ export default {
     },
     doLayout() {
       this.$refs.oaTable.doLayout();
-      this.$refs.oaTable.updateScroll();
     },
     sort(prop, order) {
       this.$refs.oaTable.sort(prop, order);

package/packages/form/src/main.vue

@@ -5040,6 +5040,9 @@ export default {
       if (!handle) {
         handle = this.handles || {};
       }
+      if (Object.prototype.hasOwnProperty.call(handle, 'validate')) {
+        validate = handle.validate;
+      }
       return new Promise((resolve, reject) => {
         validate
           ? this.$refs.esForm.validate(async (valid, fields, triggers) => {
@@ -5049,8 +5052,11 @@ export default {
                   handle,
                   type
                 );
-                if (this.validated && !this.validated(models, validate)) {
-                  return reject(err);
+                if (
+                  models === false ||
+                  (this.validated && !this.validated(models, validate))
+                ) {
+                  return reject();
                 }
                 let param = this.param;
                 if (handle.param) {
@@ -5131,8 +5137,11 @@ export default {
                 handle,
                 type
               );
-              if (this.validated && !this.validated(models, validate)) {
-                return reject(err);
+              if (
+                models === false ||
+                (this.validated && !this.validated(models, validate))
+              ) {
+                return reject();
               }
               let param = this.param;
               if (handle.param) {

package/packages/handler/src/main.vue

@@ -20,7 +20,8 @@
           <span v-if="show"
             >当前<span
               class="es-online-num"
-              @click="handleClick({ type: 'online' })"
+              :class="{ 'es-pointer': onlineList }"
+              @click="onlineList ? handleClick({ type: 'online' }) : ''"
               >{{ online }}</span
             >人在线</span
           >
@@ -188,6 +189,9 @@ export default {
         return false;
       }
       return true;
+    },
+    onlineList() {
+      return this.useCaseCodes.includes('sys_user_onlineList');
     }
   },
   data() {
@@ -232,7 +236,8 @@ export default {
           title: '设置'
         }
       ],
-      showPopper: false
+      showPopper: false,
+      useCaseCodes: util.getStorage('useCaseCodes')
     };
   },
   created() {

package/packages/input/src/main.vue

@@ -243,7 +243,17 @@ export default {
       let doms = [];
       if (this.readonly) {
         let content = this.model ? this.model : this.text;
-        if (this.$attrs.type === 'textarea') {
+        if (this.$attrs.disabled && this.$attrs.disabledTips) {
+          content =
+            typeof this.$attrs.disabledTips == 'string'
+              ? this.$attrs.disabledTips
+              : this.$attrs.placeholder;
+        }
+        if (
+          this.$attrs.type === 'textarea' &&
+          !this.$attrs.disabled &&
+          !this.$attrs.disabledTips
+        ) {
           if (this.model) {
             content = this.model.replace(RegExp('\\n', 'g'), '<br/>');
             content = content.replace(RegExp(' ', 'g'), '&nbsp;');
@@ -258,7 +268,14 @@ export default {
           return h(
             'div',
             {
-              class: ['es-input__inner', { 'es-plain': this.plain }]
+              class: [
+                'es-input__inner',
+                {
+                  'es-plain': this.plain,
+                  'es-disabled-tips':
+                    this.$attrs.disabled && this.$attrs.disabledTips
+                }
+              ]
             },
             [content]
           );

package/packages/login/src/main.vue

@@ -348,7 +348,7 @@
       custom-class="es-clients-dialog"
       :visible.sync="showDownLoadApp"
     >
-      <es-clients v-bind="download"></es-clients>
+      <es-clients :downloads="download"></es-clients>
     </es-dialog>
     <slot name="calogin"></slot>
     <es-dialog
@@ -1107,6 +1107,9 @@ export default {
         if (res.subsystemExtend.linuxDownloadUrl) {
           downloads.linux = res.subsystemExtend.linuxDownloadUrl;
         }
+        if (res.subsystemExtend.uosDownloadUrl) {
+          downloads.uos = res.subsystemExtend.uosDownloadUrl;
+        }
       }
       this.passModifyModel = res.passModifyModel;
       this.wechatAppid = res.wechatAppid;

package/packages/main/src/main.vue

@@ -1762,10 +1762,8 @@ export default {
       }
       return false;
     },
-    handleTrigger(res) {},
     //头部工具交互事件
     handleClick(res) {
-      console.log(res);
       const { type } = res;
       switch (type) {
         //刷新

package/packages/qr-code/src/main.vue

@@ -85,7 +85,7 @@ export default {
   mounted() {
     if (this.auto) {
       let h =
-        this.$refs.qrcode.offsetHeight -
+        (this.$refs.qrcode.offsetHeight || this.$refs.qrcode.offsetWidth) -
         parseInt(util.getStyle(this.$refs.qrcode, 'padding-top'), 10) -
         parseInt(util.getStyle(this.$refs.qrcode, 'padding-bottom'), 10);
       if (h > 0) {

package/packages/selector/src/main.vue

@@ -425,6 +425,8 @@ export default {
           } else {
             this.selected = val;
           }
+        } else {
+          this.selected = [];
         }
       }
     },