eoss-mobiles 0.3.21 → 0.3.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-mobiles",
-  "version": "0.3.21",
+  "version": "0.3.23",
   "description": "eoss内部移动端业务组件",
   "main": "lib/eoss-mobile.common.js",
   "files": [

package/packages/selector/src/selector-tree.vue

@@ -617,10 +617,10 @@ export default {
     // });
   },
   methods: {
-    handleClick(index) {
+    async handleClick(index) {
       this.selectIndex = index;
+      await this.getContent();
       this.inputSearch = false;
-      this.getContent();
     },
     getNodeList(isSearch) {
       this.personnel = JSON.parse(JSON.stringify(this.nodeList));
@@ -710,14 +710,14 @@ export default {
       if (this.timer != null) {
         clearTimeout(this.timer);
       }
-      this.timer = setTimeout(() => {
+      this.timer = setTimeout( async() => {
         if (this.$listeners.search) {
           this.oldIsSearch = this.isSearch;
           this.isSearch = !this.isSearch;
           this.$emit('search', this.namelike);
         } else {
-          this.inputSearch = true;
-          this.getContent();
+         await this.getContent();
+          this.inputSearch = !!this.namelike.trim();
         }
       }, 1000);
     },
@@ -752,7 +752,7 @@ export default {
       }
       delete this.newParam.department
       delete this.newParam.myemployee
-      request({
+      return request({
         url: this.url
           ? this.url
           : this.baseUrl
@@ -769,11 +769,6 @@ export default {
         this.$toast.clear();
         const { rCode, msg } = res;
         if (rCode == 0) {
-          if (this.inputSearch && !this.namelike) {
-            this.inputSearch = false;
-          } else if (this.namelike.trim()) {
-            this.inputSearch = true;
-          }
           if (typeof this.selectList == 'string') {
             this.selectData = [];
             this.list = this.getSelectData(
@@ -1040,7 +1035,7 @@ export default {
         if (res.obj.isAllCheck) {
           let selectData = [];
           model.map((x) => {
-            if(!x.disabled && !x.nocheck && !x.isAllCheck){
+            if(!x.disabled && !x.nocheck && !x.isAllCheck && x.selecttype == this.newParam.selecttype){
               this.$set(x, 'checked', true);
               selectData.push(x);
             }
@@ -1063,7 +1058,8 @@ export default {
           obj[next.showid] ? '' : (obj[next.showid] = true && item.push(next));
           return item;
         }, []);
-        if (model.length - 1 === checkList.length) {
+        let newArr = model.filter((x) => !x.disabled&&!x.nocheck&& x.selecttype == this.newParam.selecttype);
+        if (newArr.length === checkList.length) {
           model.map((x) => {
             if (!x.disabled) {
               this.$set(model[0], 'checked', true);

package/packages/selector/src/tree.vue

@@ -184,12 +184,12 @@
                 ? item[labelKey].slice(0, 12) + '...'
                 : item[labelKey] -->
             <slot name="tree-icon" :value="item"></slot>
+                <!-- (selectType == departmentValueKey &&
+                  item[departmentLabelKey] == departmentValueKey)
+                  (!item.nocheck ||
+                enterprise) && -->
             {{
               item.attr &&
-              (!item.nocheck ||
-                enterprise ||
-                (selectType == departmentValueKey &&
-                  item[departmentLabelKey] == departmentValueKey)) &&
               !showTree &&
               inputSearch &&
               selectType === 'employee'

package/packages/theme-chalk/lib/flow-list.css

@@ -1 +1 @@
-@charset "UTF-8";.em-flow-list{width:100%;height:100%}.em-flow-list .list{padding:32px 16px 0}.em-flow-list .list .item{position:relative;border-left:1px solid #eee;padding:10px 0;margin:10px 0}.em-flow-list .list .item .icon-gou{position:absolute;top:-15px;left:-8px;color:#12278B}.em-flow-list .list .item .process-pending{position:absolute;top:-15px;left:-8.5px;width:16px;height:16px;border-radius:50%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.em-flow-list .list .item .process-pending .process-pending-yuan{display:inline-block;width:6px;height:6px;border-radius:50%;background:#12278B}.em-flow-list .list .item:last-child{border-left-color:transparent;height:auto}.em-flow-list .list .item .icon-finish{width:16px;height:auto;position:relative;left:-8px}.em-flow-list .list .item .icon-ing{width:34px;height:auto;position:relative;left:-14px}.em-flow-list .list .item .item-box{padding-left:29px;width:100%}.em-flow-list .list .item .item-box .one{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:absolute;top:-18px}.em-flow-list .list .item .item-box .one .label{font-size:14px;font-family:PingFang SC;font-weight:400;color:#666}.em-flow-list .list .item .item-box .one .time{font-size:12px;font-family:PingFang SC;font-weight:400;color:#999}.em-flow-list .list .item .item-box .two{font-size:16px;font-family:PingFang SC;font-weight:400;color:#333;padding-bottom:10px;border-bottom:1px solid #eee}.em-flow-list .list .item .item-box .tree{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;font-size:12px;font-family:PingFang SC;color:#999;line-height:16px;margin-bottom:16px;margin-top:10px}.em-flow-list .list .item .time{text-align:right;color:#333;font-size:13px;padding-top:10px;height:16px;line-height:15px}.em-flow-list .list .success-icon{border-left-color:#12278B}.em-flow-list .more{color:#12278B}.em-flow-list .custom-image .van-empty__image{width:90px;height:90px}
+@charset "UTF-8";.process-page{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;height:100%}.process-page .main{padding:20px 12px;-webkit-box-flex:1;-ms-flex:1;flex:1;overflow-y:auto}.process-page .box{background:#fff;border-radius:8px;height:auto}.process-page .box .title{font-size:16px;color:#3a3211;padding:16px;border-bottom:1px solid #f0f0f0}.process-page .box .title .check-btn{float:right}.process-page .box .list-area{padding:0 12px}.process-page .box .list-area .van-checkbox__label{-webkit-box-flex:1;-ms-flex:1;flex:1;border-bottom:1px solid #f0f0f0;padding:14px 0 14px 4px}.process-page .box .list-area .list-item .name-area{font-size:12px;color:#222;display:-webkit-box;display:-ms-flexbox;display:flex}.process-page .box .list-area .list-item .name-area span{display:inline-block}.process-page .box .list-area .list-item .name-area .user-name,.process-page .box .list-area .list-item .name-area .user-name-flow{display:inline-block;margin-right:8px;border-right:1px solid #f0f0f0;width:36px}.process-page .box .list-area .list-item .name-area .handle-name,.process-page .box .list-area .list-item .name-area .handle-name-flow{-webkit-box-flex:1;-ms-flex:1;flex:1;padding-right:8px}.process-page .box .list-area .list-item .name-area .handle-name-flow{-webkit-box-flex:unset;-ms-flex:unset;flex:unset}.process-page .box .list-area .list-item .name-area .user-name-flow{border:unset;-webkit-box-flex:1;-ms-flex:1;flex:1;width:unset}.process-page .box .list-area .list-item .name-area .handle-status{width:44px;height:22px;float:right;border-radius:4px;background:rgba(232,35,52,.1);color:#e82334;font-size:12px;text-align:center;line-height:22px}.process-page .box .list-area .list-item .name-area .handle-status.success{background:rgba(41,225,41,.1);color:#29e129}.process-page .box .list-area .list-item .time{font-size:12px;color:#999;margin-top:12px}.process-page .box .list-area .list-item.list-item2{border-bottom:1px solid #f0f0f0;padding:14px 0}.btn-area{width:100%;height:90px;background:#fff;padding:12px 16px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.btn-area .btn{width:calc(50% - 10px);color:#12278B;border:1px solid #12278B;font-size:16px}.btn-area .btn:last-child{color:#fff}.no-data{text-align:center;padding:20px 0;color:#999}.em-flow-list{width:100%;height:100%}.em-flow-list .list{padding:32px 16px 0}.em-flow-list .list .item{position:relative;border-left:1px solid #eee;padding:10px 0;margin:10px 0}.em-flow-list .list .item .icon-gou{position:absolute;top:-15px;left:-8px;color:#12278B}.em-flow-list .list .item .process-pending{position:absolute;top:-15px;left:-8.5px;width:16px;height:16px;border-radius:50%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.em-flow-list .list .item .process-pending .process-pending-yuan{display:inline-block;width:6px;height:6px;border-radius:50%;background:#12278B}.em-flow-list .list .item:last-child{border-left-color:transparent;height:auto}.em-flow-list .list .item .icon-finish{width:16px;height:auto;position:relative;left:-8px}.em-flow-list .list .item .icon-ing{width:34px;height:auto;position:relative;left:-14px}.em-flow-list .list .item .item-box{padding-left:29px;width:100%}.em-flow-list .list .item .item-box .one{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center;position:absolute;top:-18px}.em-flow-list .list .item .item-box .one .label{font-size:14px;font-family:PingFang SC;font-weight:400;color:#666}.em-flow-list .list .item .item-box .one .time{font-size:12px;font-family:PingFang SC;font-weight:400;color:#999}.em-flow-list .list .item .item-box .two{font-size:16px;font-family:PingFang SC;font-weight:400;color:#333;padding-bottom:10px;border-bottom:1px solid #eee}.em-flow-list .list .item .item-box .tree{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;font-size:12px;font-family:PingFang SC;color:#999;line-height:16px;margin-bottom:16px;margin-top:10px}.em-flow-list .list .item .time{text-align:right;color:#333;font-size:13px;padding-top:10px;height:16px;line-height:15px}.em-flow-list .list .success-icon{border-left-color:#12278B}.em-flow-list .more{color:#12278B}.em-flow-list .custom-image .van-empty__image{width:90px;height:90px}