eoss-ui 0.6.92 → 0.6.94

package/packages/flow/src/supervise.vue

@@ -26,7 +26,7 @@
           disabled
         />
       </el-form-item>
-      <el-form-item prop="noticeType" label="通知方式">
+      <el-form-item  v-show="nextNode.notificationType.length > 0" prop="noticeType" label="通知方式">
         <el-checkbox-group v-model="nextNode.noticeType">
           <el-checkbox
             v-for="(item, index) of nextNode.notificationType"
@@ -38,7 +38,7 @@
         </el-checkbox-group>
       </el-form-item>
       <!-- v-show="nextNode.noticeType.length != 0" -->
-      <el-form-item prop="notifyMessage" label="通知消息">
+      <el-form-item v-show="nextNode.noticeType.length != 0" prop="notifyMessage" label="通知消息">
         <es-input
           style="
             border-color: #ccc;
@@ -87,11 +87,11 @@ export default {
   },
   methods: {
     subProcess() {
-      if (this.nextNode.noticeType.length == 0) {
-        this.$message.warning('请选择通知方式');
-        return;
-      }
-      if (!this.nextNode.notifyMessage) {
+      // if (this.nextNode.noticeType.length == 0) {
+      //   this.$message.warning('请选择通知方式');
+      //   return;
+      // }
+      if (this.nextNode.noticeType.length != 0 && !this.nextNode.notifyMessage) {
         this.$message.warning('请填写通知消息内容');
         return;
       }
@@ -132,13 +132,20 @@ export default {
         })
         .then((res) => {
           this.loading.close();
-          if (res.rCode == 0) {
+          if (res.rCode == 0 || res.status == "success") {
             this.nextNode = { ...this.nextNode, ...res.results };
+            let arr = []
             this.nextNode.noticeType =
               res.results.defaultNotificationType.split(',');
+              this.nextNode.notificationType.map(x => {
+                if (this.nextNode.noticeType.indexOf(x.cciValue) != -1) {
+                  arr.push(x.cciValue);
+                }
+              })
+              this.nextNode.noticeType = arr
           } else {
             this.$message({
-              message: res.rMsg,
+              message: res.msg || res.message,
               type: 'error'
             });
             this.$emit('cancel');

package/packages/main/src/public/search.vue

@@ -232,7 +232,7 @@ export default {
     }
   },
   beforeCreate() {
-    this.handleSearchAll = debounce(500, (res) => {
+    this.handleSearchAll = debounce(1000, (res) => {
       this.searchAll(res);
     });
     this.handleSearchd = debounce(500, (obj, index) => {
@@ -321,6 +321,12 @@ export default {
       for (let i = 0; i < this.types.length; i++) {
         let item = this.types[i];
         if (keyWords && !this.hides.includes(item.name) && !item.hide) {
+          this.types[i].records = [];
+          this.types[i].totalCount = 0;
+          this.types[i].pageCount = 1;
+          this.types[i].pageNum = 0;
+          this.$set(this.loadings, item.id || String(i), true);
+          this.$set(this.noMore, item.id || String(i), false);
           if (item.name == '菜单' && this.menus.length) {
             this.isLoading = false;
             this.types[i].records = this.searchData(this.menus, keyWords);

package/packages/select/src/main.vue

@@ -658,6 +658,7 @@ export default {
         } else {
           dom = [this.getLabel(this.models, this.results)];
         }
+        console.log('dom', dom);
         return h(
           'div',
           {
@@ -667,9 +668,12 @@ export default {
                 'es-textarea__inner el-textarea__inner': this.multiple,
                 'el-input__inner es-input__inner': !this.multiple
               }
-            ]
+            ],
+            domProps: {
+              innerHTML: dom.join(this.symbol)
+            }
           },
-          [dom.join(this.symbol)]
+          []
         );
       }
       let doms = [];
@@ -751,7 +755,7 @@ export default {
             tree:
               typeof this.tree === 'boolean'
                 ? this.tree
-                : { ...this.tree, lazy: this.label },
+                : { ...this.tree, lazy: this.lazy },
             data: this.results,
             // 父级是否可选
             parentCheck: this.parentCheck,

package/packages/tree/src/main.vue

@@ -58,6 +58,7 @@
           :empty-text="!loading ? '暂无数据' : ''"
           :node-key="nodeKey"
           :indent="12"
+          :lazy="lazy"
           :data="treeData"
           :props="defaultProps"
           :filter-node-method="filterNode"
@@ -218,7 +219,7 @@ export default {
     //懒加载
     lazy: {
       type: Boolean,
-      default: true
+      default: false
     },
     onChange: Function,
     onSearch: Function,

package/packages/upload/src/main.vue

@@ -239,12 +239,7 @@ export default {
       type: Boolean,
       default: true
     },
-    headers: {
-      type: Object,
-      default() {
-        return util.getStorage();
-      }
-    },
+    headers: Object,
     listType: {
       type: String,
       default: 'table' // text,table,picture,picture-card

package/src/config/api.js

@@ -305,3 +305,4 @@ export const endFlowAndStartTaskCircularRead =
 export const getNodeInfoForStart =
   flowPendingPrefix + '/task/taskHandle/getNodeInfoForStart.dhtml';
 export const freeStartFlow = '/bpm/bpmBackend/freeStartFlow';
+export const getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelChangedNotificationType';

package/src/index.js

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