eoss-ui 0.5.81-beta6 → 0.5.81-beta7

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

@@ -6,7 +6,7 @@
     ref="component"
     v-loading="tableLoading"
     element-loading-background="rgba(0, 0, 0, 0.65)"
-    :model="tag === 'div' ? '' : datas"
+    :model="tag === 'div' ? '' : list"
     :element-loading-text="tableLoadingText"
   >
     <es-toolbar
@@ -57,7 +57,7 @@
           dragSort: dragSort,
           dragSortClass: dragSortIcon
         }"
-        :data.sync="datas"
+        :data.sync="list"
         v-on="{
           ...$listeners,
           'row-click': rowClick,
@@ -149,7 +149,7 @@
       </el-table>
       <div v-if="infiniteScroll" class="es-table-page es-loading-page">
         <span>共{{ config.totalCount }}条，</span>
-        <span>已加载{{ datas.length }}条</span>
+        <span>已加载{{ list.length }}条</span>
       </div>
       <es-pagination
         v-else-if="page"
@@ -582,6 +582,12 @@ export default {
         return this.data;
       },
       set(val) {
+        if (this.list && this.list.length) {
+          this.$nextTick(() => {
+            this.list = val;
+          });
+          console.log(val, 7777788);
+        }
         this.$emit('update:data', val);
         return val;
       }
@@ -646,18 +652,12 @@ export default {
       this.resetHeight();
       this.doLayout();
     },
-    // data: {
-    //   deep: true,
-    //   handler(val) {
-    //     if (
-    //       this.page &&
-    //       typeof this.page === 'object' &&
-    //       !Object.prototype.hasOwnProperty.call(this.page, 'totalCount')
-    //     ) {
-    //       this.config.totalCount = val.length - this.lose;
-    //     }
-    //   }
-    // },
+    data: {
+      deep: true,
+      handler() {
+        this.list = this.setData();
+      }
+    },
     page() {
       this.resetHeight();
       this.doLayout();
@@ -688,7 +688,7 @@ export default {
       }
     },
     checked(newVal) {
-      this.datas.length && this.checkSelect(newVal);
+      this.list.length && this.checkSelect(newVal);
     },
     thead: {
       deep: true,
@@ -732,6 +732,7 @@ export default {
         this.$refs.oaTable &&
           this.$refs.oaTable.resetScroll &&
           this.$refs.oaTable.resetScroll(0, 0);
+        this.list = this.setData();
       }
     },
     height: {
@@ -770,10 +771,33 @@ export default {
     this.chekOpenTotalArea();
   },
   mounted() {
-    this.datas.length && this.checkSelect(this.checked);
+    if (this.data.length) {
+      this.list = this.setData();
+    }
+    this.list.length && this.checkSelect(this.checked);
     this.resetHeight();
   },
   methods: {
+    setData() {
+      if (
+        this.page &&
+        ((typeof this.page === 'object' &&
+          (!Object.prototype.hasOwnProperty.call(this.page, 'totalCount') ||
+            this.page.totalCount == 0)) ||
+          this.page === true)
+      ) {
+        this.config.totalCount = this.data.length - this.lose;
+      }
+      if (this.page && this.data.length > this.config.pageSize) {
+        return this.data.filter((item, index) => {
+          return (
+            index > (this.config.pageNum - 1) * this.config.pageSize - 1 &&
+            index < this.config.pageNum * this.config.pageSize
+          );
+        });
+      }
+      return this.data;
+    },
     getRequestKey(config) {
       const { method, url, params, data } = config;
       return [method, url, qs.stringify(params), qs.stringify(data)].join('&');
@@ -951,7 +975,7 @@ export default {
             if (util.isObject(row)) {
               this.$refs.oaTable.toggleRowSelection(row, true);
             } else
-              this.datas.forEach((item) => {
+              this.list.forEach((item) => {
                 if (item[this.checkedKey] === row) {
                   this.$refs.oaTable.toggleRowSelection(item, true);
                   return;
@@ -1129,14 +1153,14 @@ export default {
       this.$refs.oaTable.sort(prop, order);
     },
     formBlur(data) {
-      this.$emit('blur', data, this.datas);
+      this.$emit('blur', data, this.list);
     },
     formFocus(data) {
-      this.$emit('focus', data, this.datas);
+      this.$emit('focus', data, this.list);
     },
     formChange(data) {
-      this.$emit('edit', data, this.datas);
-      this.$emit('change', data, this.datas);
+      this.$emit('edit', data, this.list);
+      this.$emit('change', data, this.list);
     },
     handleAjax(handle, row) {
       this.changeLoading(true, `${handle.text}中...`);
@@ -1291,7 +1315,7 @@ export default {
           handle.event({
             ele: this,
             thead: thead,
-            data: this.datas,
+            data: this.list,
             selected: rows,
             ...res
           });
@@ -1394,13 +1418,13 @@ export default {
           });
           util.exportXls({
             thead: thead,
-            data: this.datas,
+            data: this.list,
             name: this.fileName,
             option: this.optionDatas
           });
         }
-        this.$emit('btnClick', res, this.datas, thead, rows);
-        this.$emit('btn-click', res, this.datas, thead, rows);
+        this.$emit('btnClick', res, this.list, thead, rows);
+        this.$emit('btn-click', res, this.list, thead, rows);
       }
     },
     sizeChange(res) {

package/packages/login/src/main.vue

@@ -579,6 +579,7 @@ export default {
       type: String,
       default: 'center'
     },
+    translate: String,
     useResults: {
       type: Boolean,
       default: true
@@ -591,31 +592,36 @@ export default {
   },
   computed: {
     transform() {
+      let translate = this.translate
+        ? this.translate
+        : this.align === 'center'
+        ? '-50%, -51%'
+        : '-51%';
       if (this.align.indexOf('%') > -1) {
         return {
           left: this.align,
           top: '50%',
-          transform: 'translateY(-51%)'
+          transform: `translateY(${translate})`
         };
       }
       if (this.align === 'left') {
         return {
           left: '30%',
           top: '50%',
-          transform: 'translateY(-51%)'
+          transform: `translateY(${translate})`
         };
       }
       if (this.align === 'right') {
         return {
           left: '70%',
           top: '50%',
-          transform: 'translateY(-51%)'
+          transform: `translateY(${translate})`
         };
       }
       return {
         left: '50%',
         top: '50%',
-        transform: 'translate(-50%, -51%)'
+        transform: `translate(${translate})`
       };
     },
     redirectUri() {

package/packages/main/src/simplicity/index.vue

@@ -2,7 +2,9 @@
   <div class="es-main">
     <div class="es-simplicity-side">
       <img class="es-simplicity-logo" v-if="mainLogo" :src="mainLogo" />
-      <div class="es-simplicity-org-name">{{ userModel.orgName }}</div>
+      <div class="es-simplicity-org-name">
+        {{ simpleUserInfo.orgShortName || simpleUserInfo.orgName }}
+      </div>
       <el-popover
         class="es-simplicity-user-popover"
         placement="right-start"
@@ -15,6 +17,7 @@
           :notifyList="notifyList"
           :notify="notify"
           :contents="userInfoContents"
+          @success="handleSuccess"
           @change="handleChangeConfig"
           @close="handlerClose"
         ></user>
@@ -183,6 +186,7 @@
         v-model="activeName"
         closable
         hide-bar
+        opacity
         @tab-remove="handleRemove"
         @tab-contextmenu="handleContextmenu"
       >
@@ -531,7 +535,7 @@ export default {
       //选中菜单
       active: '',
       //单位名称
-      orgName: ''
+      simpleUserInfo: {}
     };
   },
   computed: {
@@ -1259,6 +1263,15 @@ export default {
         this.tabs.push(tab);
       }
     },
+
+    /**
+     * @desc:用户详情请求成功
+     * @author huangbo
+     * @date 2024年9月7日
+     **/
+    handleSuccess(res) {
+      this.simpleUserInfo = res.simpleUserInfo;
+    },
     /**
      * @desc:修改用户配置
      * @author huangbo

package/packages/main/src/simplicity/menu-list.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-scrollbar :class="{ 'is-fold': fold }" ref="scrollbar">
+  <el-scrollbar :class="{ 'is-fold': fold }">
     <template v-for="(item, index) in data">
       <el-popover
         v-if="
@@ -10,21 +10,23 @@
         trigger="hover"
         popper-class="es-simplicity-menus-sub"
         :width="width"
-        :key="item.id"
-        @show="show = true"
-        @hide="show = false"
+        @show="handleShow"
+        @hide="handleHide"
       >
-        <menu-list
-          ref="menus"
-          :active="active"
-          :popover="show"
-          :data="[...(item.children || []), ...(item.fourthTabs || [])]"
-          :menuIcon="menuIcon"
-          :color="color"
-          :backgroundColor="backgroundColor"
-          :width="width"
-          @command="handleClick"
-        ></menu-list>
+        <template slot-scope="{ parent }">
+          <menu-list
+            ref="menus"
+            :parent="parent"
+            :active="active"
+            :popover="show"
+            :data="[...(item.children || []), ...(item.fourthTabs || [])]"
+            :menuIcon="menuIcon"
+            :color="color"
+            :backgroundColor="backgroundColor"
+            :width="width"
+            @command="handleClick"
+          ></menu-list>
+        </template>
         <div
           slot="reference"
           class="es-simplicity-menus-item"
@@ -103,7 +105,8 @@ export default {
     data: Array,
     fold: Boolean,
     width: Number,
-    popover: Boolean
+    popover: Boolean,
+    parent: Object
   },
   data() {
     return {
@@ -117,7 +120,6 @@ export default {
     popover() {
       if (this.$el.offsetHeight > this.height) {
         this.$el.style.height = this.height + 'px';
-        this.$refs.scrollbar.update();
       } else {
         this.$el.style.height = '';
       }
@@ -158,6 +160,18 @@ export default {
         }
       }
       this.$emit('command', res);
+    },
+    handleShow() {
+      this.show = true;
+      if (this.parent) {
+        this.parent.changeContinue(true);
+      }
+    },
+    handleHide() {
+      if (this.parent) {
+        this.parent.changeContinue(false);
+        //this.parent.hidePopper();
+      }
     }
   }
 };

package/packages/main/src/simplicity/user.vue

@@ -133,6 +133,7 @@ export default {
             this.checkPassword = results.checkPassword;
             this.checkPasswordMsg = results.checkPasswordMsg;
             this.headImgCode = results.headImgCode || undefined;
+            this.$emit('success', results);
           } else {
             let msg = res.msg || '系统错误，请联系管理员！';
             this.$message.error(msg);

package/packages/select/src/main.vue

@@ -498,7 +498,10 @@ export default {
             }
           }
         } else {
-          if (typeof data === 'string' || !data.length) {
+          if (
+            typeof data === 'string' ||
+            (!data.length && !this.sysCode && !this.url)
+          ) {
             return value;
           }
           if (Array.isArray(data) && data.length) {