eoss-ui 0.4.67 → 0.4.69

package/packages/flow-list/src/main.vue

@@ -13,20 +13,14 @@
     >
       <div class="es-flow-list-box">
         <es-data-table
+          v-if="show"
           :class="{ 'es-flow-group-data-table': item.type !== 'sign' }"
+          :display="display"
           number
           @cell-click="handleCellClick"
           full
           v-bind="item"
-          :data="
-            item.type === 'preset'
-              ? presetData
-              : item.type === 'sign'
-              ? signData
-              : item.type === 'splitReading'
-              ? splitReadingData
-              : flowData
-          "
+          :data="returnData(item.type)"
           @btn-click="handleBtnClick"
         ></es-data-table>
       </div>
@@ -56,6 +50,7 @@
     >
       <div style="height: 400px" v-loading="pressLoading">
         <es-data-table
+          v-if="show"
           :data="pressTableList"
           :thead="pressThead"
           @page-size-change="handleSizeChange"
@@ -85,103 +80,6 @@
       >
       </es-form>
     </es-dialog>
-    <!-- <div
-      v-if="hide.indexOf('flow') == -1"
-      :class="
-        fyTableList != undefined && fyTableList.length != 0
-          ? 'preset-list'
-          : 'preset-list-tow'
-      "
-      style="flex: 1"
-    >
-      <div class="es-toolbar" >
-        流程列表
-        <div v-if="isShort != 1" style="display:inline-block;margin-left:10px">
-         
-          <el-radio-group
-            class="list-radio"
-            v-model="showSuggest"
-            @input="handleChange"
-          >
-            <el-radio label="all">显示全部</el-radio>
-            <el-radio label="have">显示已填意见</el-radio>
-          </el-radio-group>
-           <es-select
-            v-model="viewType"
-            placeholder="请选择"
-            @change="handleChange"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </es-select>
-        </div>
-      </div>
-      <FlowTable
-        v-if="show"
-        style="height: calc(100% - 60px)"
-        :data="flowTableList"
-        :modify="modify"
-        :toolbar="newToolbar"
-        :fileStyle="attachmentPaperClipCssStyle"
-        v-bind="flowTableInfo"
-        @success="handleChange"
-      />
-    </div>
-    <div
-      v-if="
-        fyTableList != undefined &&
-        fyTableList.length != 0 &&
-        show &&
-        hide.indexOf('splitReading') == -1
-      "
-      :class="'preset-list'"
-      :style="hide.indexOf('preset') != -1 ? 'flex:1' : ''"
-    >
-      <FlowTable
-        style="height: calc(100% - 40px)"
-        :toolbar="[
-          {
-            type: 'text',
-            contents: (taskReadName ? taskReadName : '非流程') + '列表'
-          }
-        ]"
-        :data="fyTableList"
-        v-bind="flowTableInfo"
-        @success="handleChange"
-      />
-    </div>
-    <div
-      v-if="show && hide.indexOf('preset') == -1"
-      :class="
-        fyTableList != undefined && fyTableList.length != 0
-          ? 'preset-list'
-          : 'preset-list-tow'
-      "
-      :style="
-        fyTableList != undefined && fyTableList.length != 0 ? '' : 'flex:1'
-      "
-    >
-      <es-data-table
-        numbers
-        :data="presetData"
-        :thead="thead"
-        :toolbar="[
-          {
-            type: 'text',
-            contents: '预设列表'
-          }
-        ]"
-        stripe
-        full
-        style="width: 100%"
-        @btnClick="handleClick"
-      />
-    </div> -->
   </div>
 </template>
 
@@ -195,12 +93,10 @@ import {
   deleteFlow
 } from 'eoss-ui/src/config/api';
 import FileList from '../../flow/src/component/FileList.vue';
-import FlowTable from './flow-table.vue';
 import util from 'eoss-ui/src/utils/util';
 export default {
   name: 'EsFlowList',
   components: {
-    [FlowTable.name]: FlowTable,
     [FileList.name]: FileList
   },
   props: {
@@ -221,7 +117,8 @@ export default {
       default() {
         return ['flow', 'splitReading', 'preset'];
       }
-    }
+    },
+    display: Boolean
   },
   inheritAttrs: false,
   data() {
@@ -705,7 +602,7 @@ export default {
       };
     },
     content() {
-      return this.contents.map((item) => {
+      let contents = this.contents.map((item) => {
         if (typeof item === 'string') {
           return {
             type: item,
@@ -725,6 +622,7 @@ export default {
           return item;
         }
       });
+      return contents;
     },
     newToolbar() {
       if (this.toolbar && this.toolbar.length > 0) {
@@ -844,12 +742,22 @@ export default {
     this.getFlowList();
     this.getSysInfo('preset_type');
     this.getSysInfo('is_edit');
-    this.$nextTick(() => {
-      this.getListInfo();
-    });
+    this.getListInfo();
   },
 
   methods: {
+    returnData(type) {
+      switch (type) {
+        case 'preset':
+          return this.presetData;
+        case 'sign':
+          return this.signData;
+        case 'splitReading':
+          return this.splitReadingData;
+        default:
+          return this.flowData;
+      }
+    },
     handleCellClick(row, column) {
       if (column.property == 'hasAdjunct' && row.hasAdjunct) {
         this.showFile(row.wfpendingid);
@@ -1052,10 +960,10 @@ export default {
             this.flowData = wfHistoryList;
             this.splitReadingData = fyHistoryList;
             this.modify = modify;
+            this.show = true;
           } else {
             this.$message.error(message || '系统错误，请联系管理员！');
           }
-          this.show = true;
         })
         .catch((err) => {
           this.loading.close();

package/packages/main/src/main.vue

@@ -365,7 +365,10 @@ export default {
       type: String,
       default: '/main'
     },
-    setFirstAsDefault: Boolean,
+    setFirstAsDefault: {
+      type: Boolean,
+      default: true
+    },
     pathUrl: {
       type: String,
       default: '/primary'
@@ -641,8 +644,10 @@ export default {
     menuSuccess(res) {
       // this.menus
       this.menuType = 'custom';
-      this.customMenu = res;
-      this.setMenu(res);
+      if (res && res.length) {
+        this.customMenu = res;
+        this.setMenu(res);
+      }
     },
     //获取主题模板JSON
     getMainDetail(id) {
@@ -682,8 +687,10 @@ export default {
           if (_that.showDefault && _that.data === undefined) {
             _that.getMenu();
           } else if (_that.showDefault) {
-            _that.menus = JSON.parse(JSON.stringify(_that.data));
-            _that.setMenu(_that.data);
+            if (_that.data && _that.data.length) {
+              _that.menus = JSON.parse(JSON.stringify(_that.data));
+              _that.setMenu(_that.data);
+            }
           }
         })
         .catch((err) => {
@@ -838,7 +845,7 @@ export default {
         if (i === 'indexUrl') {
           this.homePage = results[i];
           if (this.isHomePage) {
-            if (this.menus) {
+            if (this.menus && this.menus.length) {
               let ids = null;
               this.homePage && (ids = this.getId(this.menus, this.homePage));
               if (ids) {
@@ -995,26 +1002,43 @@ export default {
         .ajax({ url: this.action, params: this.param ? this.param : {} })
         .then((res) => {
           if (res.rCode === 0) {
-            this.menus = JSON.parse(JSON.stringify(res.results));
-            let applicationid =
-              util.getParams('applicationid') ||
-              util.getParams('applicationId');
-            if (applicationid) {
-              let ids = this.getId(this.menus, applicationid);
-              if (ids) {
-                this.defaultActive = ids;
-              }
-            } else if (util.win.location.hash) {
-              let hash = util.win.location.hash;
-              if (hash) {
-                hash = hash.split('?')[0];
-              }
-              if (hash !== '#/' && hash !== '#/main') {
-                let ids = this.getId(this.menus, util.win.location.hash, true);
+            if (res.results && res.results.length) {
+              this.menus = JSON.parse(JSON.stringify(res.results));
+              let applicationid =
+                util.getParams('applicationid') ||
+                util.getParams('applicationId');
+              if (applicationid) {
+                let ids = this.getId(this.menus, applicationid);
                 if (ids) {
                   this.defaultActive = ids;
-                  this.navIds = ids;
-                  this.setTitle(ids[0]);
+                }
+              } else if (util.win.location.hash) {
+                let hash = util.win.location.hash;
+                if (hash) {
+                  hash = hash.split('?')[0];
+                }
+                if (hash !== '#/' && hash !== '#/main') {
+                  let ids = this.getId(
+                    this.menus,
+                    util.win.location.hash,
+                    true
+                  );
+                  if (ids) {
+                    this.defaultActive = ids;
+                    this.navIds = ids;
+                    this.setTitle(ids[0]);
+                  }
+                } else if (sessionStorage.getItem('jump') && this.history) {
+                  let ids = this.getId(
+                    this.menus,
+                    sessionStorage.getItem('jump'),
+                    true
+                  );
+                  if (ids) {
+                    this.defaultActive = ids;
+                    this.navIds = ids;
+                    this.setTitle(ids[0]);
+                  }
                 }
               } else if (sessionStorage.getItem('jump') && this.history) {
                 let ids = this.getId(
@@ -1028,21 +1052,12 @@ export default {
                   this.setTitle(ids[0]);
                 }
               }
-            } else if (sessionStorage.getItem('jump') && this.history) {
-              let ids = this.getId(
-                this.menus,
-                sessionStorage.getItem('jump'),
-                true
-              );
-              if (ids) {
-                this.defaultActive = ids;
-                this.navIds = ids;
-                this.setTitle(ids[0]);
-              }
+              this.setTips(this.menus);
+              store.set('nav', this.menus);
+              this.setMenu(this.menus);
+            } else {
+              this.$message.error('未分配菜单权限，请联系管理员！');
             }
-            this.setTips(this.menus);
-            store.set('nav', this.menus);
-            this.setMenu(this.menus);
           } else {
             let msg = res.msg || '系统错误，请联系管理员！';
             this.$message.error(msg);
@@ -1541,7 +1556,9 @@ export default {
           this.active = [];
           this.defaultActive = [];
           this.tabs = [];
-          this.setMenu(this.menus);
+          if (this.menus && this.menus.length) {
+            this.setMenu(this.menus);
+          }
           this.$nextTick(() => {
             this.reset = true;
           });

package/packages/main/src/message.vue

@@ -38,9 +38,7 @@
               </div>
             </el-card>
             <p class="es-msg-tips" v-if="loading">加载中...</p>
-            <p class="es-msg-tips" v-if="noMore && count > 0">
-              没有更多了
-            </p>
+            <p class="es-msg-tips" v-if="noMore && count > 0">没有更多了</p>
           </div>
         </el-scrollbar>
       </div>
@@ -145,7 +143,7 @@ export default {
               pageSize: this.pageSize
             }
           })
-          .then(res => {
+          .then((res) => {
             if (res && res.rCode === 0) {
               this.pageCount = res.results.pageCount;
               this.loading = false;
@@ -160,7 +158,7 @@ export default {
               this.$message.error(msg);
             }
           })
-          .catch(err => {
+          .catch((err) => {
             this.loading = false;
             if (err.message && err.message !== 'canceled') {
               this.$message.error(err.message);
@@ -177,7 +175,7 @@ export default {
             id: res.id
           }
         })
-        .then(res => {
+        .then((res) => {
           if (res.rCode == 0) {
             this.count -= 1;
             this.msgs.splice(i, 1);
@@ -193,12 +191,12 @@ export default {
         .ajax({
           url: ignoreAllSysMsg
         })
-        .then(res => {
+        .then((res) => {
           this.count = 0;
           this.msgs = [];
           this.$emit('ignore', { type: 'ignore', value: 'all' });
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }

package/packages/menu/src/main.vue

@@ -196,6 +196,9 @@ export default {
                     'es-dot-right': item.tips && typeof item.tips === 'boolean'
                   }
                 ],
+                attrs:{
+                  title: item.text.length > 18 ? item.text : undefined,
+                },
                 props:
                   typeof item.tips === 'boolean' && item.tips
                     ? {

package/packages/tabs/src/main.vue

@@ -37,7 +37,9 @@
           </span>
         </template>
         <es-tabs-panel v-bind="items" :show="activeName === String(indexs)">
-          <template slot-scope="{ contents, average, data, title, show }">
+          <template
+            slot-scope="{ contents, average, data, title, show, isShow }"
+          >
             <template v-if="Array.isArray(contents)">
               <template v-for="(item, index) in contents">
                 <div class="es-tab-pane-list" :key="index" v-if="average">

package/packages/tabs-panel/src/main.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="es-tabs-panel">
-    <slot v-bind="$attrs"></slot>
+    <slot v-bind="$attrs" :show="show" :isShow="isShow"></slot>
   </div>
 </template>
 
@@ -8,10 +8,21 @@
 export default {
   name: 'EsTabsPanel',
   inheritAttrs: false,
-  props: {},
-  watch: {},
+  props: {
+    show: Boolean
+  },
+  watch: {
+    show: {
+      immediate: true,
+      handler(val) {
+        val && (this.isShow = true);
+      }
+    }
+  },
   data() {
-    return {};
+    return {
+      isShow: false
+    };
   },
   mounted() {}
 };