eoss-ui 0.4.68 → 0.4.70

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,7 +80,6 @@
       >
       </es-form>
     </es-dialog>
-    
   </div>
 </template>
 
@@ -123,7 +117,8 @@ export default {
       default() {
         return ['flow', 'splitReading', 'preset'];
       }
-    }
+    },
+    display: Boolean
   },
   inheritAttrs: false,
   data() {
@@ -607,7 +602,7 @@ export default {
       };
     },
     content() {
-      return this.contents.map((item) => {
+      let contents = this.contents.map((item) => {
         if (typeof item === 'string') {
           return {
             type: item,
@@ -627,6 +622,7 @@ export default {
           return item;
         }
       });
+      return contents;
     },
     newToolbar() {
       if (this.toolbar && this.toolbar.length > 0) {
@@ -746,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);
@@ -954,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/form/src/main.vue

@@ -357,16 +357,6 @@
                         v-model="models[item.name]"
                         :plain="item.plain || item.name === undefined"
                         :readonly="readonly ? readonly : item.readonly"
-                        @blur="
-                          (event) => {
-                            handleBlur(item, event);
-                          }
-                        "
-                        @focus="
-                          (event) => {
-                            handleFocus(item, event);
-                          }
-                        "
                         @change="
                           (val) => {
                             handleChange(item, val);

package/packages/main/src/message.vue

@@ -98,7 +98,6 @@ export default {
       return this.msgs.length >= this.count;
     },
     disabled() {
-      console.log(this.loading, this.noMore);
       return this.loading || this.noMore;
     }
   },

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() {}
 };

package/packages/tree/src/main.vue

@@ -61,6 +61,7 @@
           :expand-on-click-node="false"
           :highlight-current="true"
           :show-checkbox="showCheckbox"
+          :default-checked-keys="defaultCheckeds"
           :current-node-key="currentNodeKey"
           v-on="{
             ...$listeners,
@@ -160,7 +161,9 @@ export default {
     },
     // 	选择项本地数据
     data: Array,
+    //是否选中首级节点
     currentFirst: Boolean,
+    //当前选中的节点
     currentNodeKey: [String, Number],
     icon: {
       type: Boolean,
@@ -240,10 +243,20 @@ export default {
         return {};
       }
     },
+    //节点是否可被选择
     showCheckbox: {
       type: Boolean,
       default: false
     },
+    //是否勾选首级节点
+    checkedFirst: Boolean,
+    //默认勾选的节点的 key 的数组
+    defaultCheckedKeys: {
+      type: Array,
+      default() {
+        return [];
+      }
+    },
     multiple: {
       type: Boolean,
       default: false
@@ -311,7 +324,8 @@ export default {
       loading: false,
       searchValue: '',
       expandedKeys: [],
-      treeList: []
+      treeList: [],
+      checkedKeys: this.defaultCheckedKeys
     };
   },
   computed: {
@@ -337,6 +351,9 @@ export default {
         return false;
       }
       return this.remote;
+    },
+    defaultCheckeds() {
+      return [...this.defaultCheckedKeys, ...this.checkedKeys];
     }
   },
   watch: {
@@ -383,21 +400,31 @@ export default {
         .then((res) => {
           this.loading = false;
           if (res.rCode === 0) {
-            this.treeList = JSON.parse(JSON.stringify(res.results));
+            let treeList = JSON.parse(JSON.stringify(res.results));
+            this.$emit('results', treeList);
             if (this.currentFirst) {
-              let currentNode = this.treeList[0].id;
-              this.$emit('current-first', this.treeList[0]);
-              if (!this.currentNodeKey) {
+              let currentNode = treeList[0].id;
+              if (!this.currentNodeKey && this.currentNodeKey != 0) {
                 this.$nextTick(() => {
                   this.$refs.oaTree.setCurrentKey(currentNode);
                 });
               }
             }
-            this.expandedKeys = this.treeList.filter((item) => {
+            if (this.checkedFirst) {
+              let checkedNode = treeList[0].id;
+              if (
+                this.defaultCheckedKeys &&
+                this.defaultCheckedKeys.indexOf(checkedNode) == -1
+              ) {
+                this.checkedKeys = [checkedNode];
+              }
+            }
+            this.expandedKeys = treeList.filter((item) => {
               if (item.open) {
                 return item.id;
               }
             });
+            this.treeList = treeList;
           }
         })
         .catch((err) => {
@@ -437,6 +464,7 @@ export default {
               if (res.rCode === 0) {
                 this.loading = false;
                 let results = JSON.parse(JSON.stringify(res.results));
+                this.$emit('sub-results', results);
                 if (Array.isArray(results)) {
                   if (data.id === results[0].id) {
                     this.$set(data, 'children', results[0].children);

package/src/index.js

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