eoss-ui 0.5.46 → 0.5.48

package/lib/toolbar.js

@@ -260,21 +260,21 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
     searchValue: {
       deep: true,
       handler: function handler(val) {
-        this.searchData = val;
+        this.searchData = JSON.parse(JSON.stringify(val));
       }
     },
     advanceValue: {
       deep: true,
       handler: function handler(val) {
-        this.advancedData = val;
+        this.advancedData = JSON.parse(JSON.stringify(val));
       }
     }
   },
   data: function data() {
     return {
       show: false,
-      searchData: this.searchValue,
-      advancedData: this.advanceValue
+      searchData: JSON.parse(JSON.stringify(this.searchValue)),
+      advancedData: JSON.parse(JSON.stringify(this.advanceValue))
     };
   },
   created: function created() {
@@ -324,13 +324,14 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
     },
     hanleReset: function hanleReset() {
       this.$refs.filter && this.$refs.filter.resetFields();
-      this.searchData = {};
-      this.advancedData = {};
-      this.$emit('reset');
+      this.searchData = JSON.parse(JSON.stringify(this.searchValue));
+      this.advancedData = JSON.parse(JSON.stringify(this.advanceValue));
+      this.$emit('reset', this.searchData);
     },
     hanleCancel: function hanleCancel() {
       this.show = false;
-      this.$emit('cancel');
+      this.advancedData = JSON.parse(JSON.stringify(this.advanceValue));
+      this.$emit('cancel', this.advancedData);
     }
   },
   render: function render(h) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.46",
+  "version": "0.5.48",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/button/src/main.vue

@@ -70,15 +70,8 @@ export default {
           evt.preventDefault();
           let width = 0;
           let height = 0;
-          let win;
-          try {
-            util.win.top.document;
-            win = util.win.top;
-          } catch (error) {
-            win = util.getMyWinTop();
-          }
-          width = win.screen.availWidth - 10;
-          height = win.screen.availHeight - 60;
+          width = util.win.top.screen.availWidth - 10;
+          height = util.win.top.screen.availHeight - 60;
           let flag = true;
           if (this.esForm) {
             let params = util.getParams({ url: this.link });

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

@@ -409,6 +409,13 @@ export default {
     };
   },
   computed: {
+    params() {
+      return {
+        ...(this.param || {}),
+        ...(this.searchValue || {}),
+        ...(this.advanceValue || {})
+      };
+    },
     tag() {
       return this.form && this.elForm == '' ? 'el-form' : 'div';
     },
@@ -882,7 +889,7 @@ export default {
       this.tableLoadingText = '加载中...';
       let reqData = util.extend(
         {},
-        this.param,
+        this.params,
         this.page
           ? {
               pageNum: this.config.pageNum,
@@ -1292,50 +1299,44 @@ export default {
       this.$emit('next', res);
     },
     hanleSearch(data) {
-      this.wheres = data;
-      if (this.url) {
-        if (this.response !== undefined) {
-          this.getTableData({
-            where: this.response({
+      this.wheres =
+        this.response !== undefined
+          ? this.response({
               type: 'search',
               data: JSON.parse(JSON.stringify(data))
             })
-          });
-        } else {
-          this.getTableData({ where: this.wheres });
-        }
+          : data;
+      if (this.url) {
+        this.getTableData({ where: this.wheres });
       }
-      this.$emit('search', data);
+      this.$emit('search', this.wheres);
     },
     hanleReset() {
       if (this.url) {
         this.wheres = {};
         this.getTableData();
       }
-      this.$emit('reset');
+      this.$emit('reset', this.params);
     },
     hanleSubmit({ data, show }) {
-      this.wheres = data;
-      if (this.url) {
-        if (this.response !== undefined) {
-          this.getTableData({
-            where: this.response({
+      this.wheres =
+        this.response !== undefined
+          ? this.response({
               type: 'filter',
               data: JSON.parse(JSON.stringify(data))
             })
-          });
-        } else {
-          this.getTableData({ where: this.wheres });
-        }
+          : data;
+      if (this.url) {
+        this.getTableData({ where: this.wheres });
       }
-      this.$emit('submit', { data, show });
+      this.$emit('submit', { data: this.wheres, show });
     },
     hanleCancel() {
-      if (this.url && JSON.stringify(this.wheres) !== '{}') {
-        this.wheres = {};
-        this.getTableData();
-      }
-      this.$emit('cancel');
+      // if (this.url && JSON.stringify(this.wheres) !== '{}') {
+      //   this.wheres = {};
+      //   this.getTableData();
+      // }
+      this.$emit('cancel', this.params);
     },
     handleTabs({ item, index }) {
       if (this.url) {

package/packages/dialog/src/main.vue

@@ -381,15 +381,8 @@ export default {
   created() {
     let availWidth = 0;
     let availHeight = 0;
-    let win;
-    try {
-      util.win.top.document;
-      win = util.win.top;
-    } catch (error) {
-      win = util.getMyWinTop();
-    }
-    availWidth = win.document.body.offsetWidth - 260;
-    availHeight = win.document.body.offsetHeight - 60;
+    availWidth = util.win.top.document.body.offsetWidth - 260;
+    availHeight = util.win.top.document.body.offsetHeight - 60;
     this.sizes.max = { width: `${availWidth}px`, height: `${availHeight}px` };
     if (
       this.size === 'full' ||

package/packages/flow/src/main.vue

@@ -471,12 +471,12 @@
             </el-button>
             <el-button
               v-if="pointsReadingObj.fun"
-              class="btn"
+              class="es-flow-btn"
               @click="taskReadBtn"
               >分阅</el-button
             >
             <el-button
-              class="btn"
+              class="es-flow-btn"
               v-for="item of moreList"
               :key="item.key"
               @click="goView(item)"
@@ -513,12 +513,12 @@
               <el-button>...</el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item v-for="item of moreList" :key="item.key">
-                  <div class="btn" @click="goView(item)">
+                  <div class="es-flow-btn" @click="goView(item)">
                     {{ item.value }}
                   </div>
                 </el-dropdown-item>
                 <el-dropdown-item v-if="pointsReadingObj.fun">
-                  <div class="btn" @click="taskReadBtn">分阅</div>
+                  <div class="es-flow-btn" @click="taskReadBtn">分阅</div>
                 </el-dropdown-item>
                 <el-dropdown-item v-if="rejectObj.fun">
                   <div style="color: red" @click="rejectBtn">
@@ -541,7 +541,7 @@
         阅结
       </el-button>
       <el-button
-        class="btn"
+        class="es-flow-btn"
         v-if="isCanFenyue == '1'"
         size="medium"
         style="margin-left: 0px"

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

@@ -575,13 +575,7 @@ export default {
         let name = item.name;
         let width = 0;
         let height = 0;
-        let win;
-        try {
-          util.win.top.document;
-          win = util.win.top;
-        } catch (error) {
-          win = util.getMyWinTop();
-        }
+        let win = util.win.top;
         width = win.screen.availWidth - 10;
         height = win.screen.availHeight - 60;
         if (item.url) {
@@ -654,16 +648,10 @@ export default {
     handleSuccess() {
       if (this.closeDialog && this.esDialog) {
         this.esDialog.handleClose();
-      } else if (util.win.opener) {
-        let win;
-        try {
-          util.win.top.document;
-          win = util.win.top;
-        } catch (error) {
-          win = util.getMyWinTop();
-        }
-        win.close();
-        win.postMessage({ type: 0 }, '*');
+      } else if (util.win.top.COOS_SDK) {
+        util.win.top.COOS_SDK.closePopup && util.win.top.COOS_SDK.closePopup();
+      } else if (util.win.top.opener) {
+        util.win.top.close();
       }
       if (this.events && this.events.success) {
         this.events.success();

package/packages/handle-user/src/main.vue

@@ -98,13 +98,7 @@ export default {
                 duration: 500,
                 onClose: () => {
                   util.removeStorage(['mainConfig', 'jump']);
-                  let win;
-                  try {
-                    util.win.top.document;
-                    win = util.win.top;
-                  } catch (error) {
-                    win = util.getMyWinTop();
-                  }
+                  let win = util.win.top;
                   win.location.reload();
                 }
               });

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

@@ -1 +1 @@
-@charset "UTF-8";.commonOpinion-set,.es-flow-index{-webkit-box-orient:vertical;-webkit-box-direction:normal}.es-common-opinions,.es-fenyue-buttons,.es-flow-buttons,.es-flow-title,.es-opinion{padding:0 12px}.es-user-defined{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.es-user-defined .el-button--primary{-webkit-box-flex:1;-ms-flex:1;flex:1}.required .el-textarea__inner::-webkit-input-placeholder{color:red}.required .el-textarea__inner::-moz-placeholder{color:red}.required .el-textarea__inner:-ms-input-placeholder{color:red}.required .el-textarea__inner::-ms-input-placeholder{color:red}.required .el-textarea__inner::placeholder{color:red}.no-checked .el-checkbox__input{display:none!important}.es-flow-index{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding-bottom:12px;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;position:relative}.es-flow-index .em-flow-more-btn{display:block;width:100%}.es-flow-index .el-checkbox-group{display:contents}.es-flow-index .es-eidt-title{font-size:13px;color:#333;line-height:20px}.es-flow-index .es-flow-top{height:350px}.es-flow-index .es-flow-top .es-flow-title{height:40px;line-height:40px}.es-flow-index .es-flow-top .es-flow-title .es-icon{position:absolute;right:8px;top:4px}.es-flow-index .es-flow-top .es-opinion{display:-webkit-box;display:-ms-flexbox;display:flex;margin:8px 0;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.es-flow-index .es-flow-top .es-opinion .es-opinion-file{cursor:pointer;position:relative}.es-flow-index .es-flow-top .es-opinion .es-opinion-file .es-file-num{color:red}.es-flow-index .es-button-agree{width:calc(43% - 15px)}.es-flow-index .es-button-agree-save{margin-top:10px}.commonOpinion-set{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;height:100%}.commonOpinion-set .el-table__body-wrapper{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-flow-index-shrink{width:24px}.es-flow-index-shrink img{cursor:pointer;width:24px;height:24px}.es-flow-btn:hover{background-color:#f5f5f5;color:#1890ff}.es-flow-btn:hover ::v-deep .el-popover{padding:12px 0!important}.es-flow-form .el-checkbox-group{display:contents}.es-flow-index .el-input-group--prepend>.el-input__inner,.es-flow-index .select-process>.el-input__inner{display:none!important}.es-flow-form .el-textarea:first-child,.es-flow-index .el-textarea{width:100%;margin-bottom:10px!important}.es-flow-form .es-opinions .el-select,.es-flow-index .el-select{width:calc(100% + 40px)!important}.es-flow-index .el-select .el-input{width:100%;height:40px}.es-flow-index .process .el-select{width:calc(100% + 40px)!important}.es-flow-index .input-with-select .el-input-group__prepend{background-color:#fff;width:100%}.es-flow-index .select-process .el-input-group__append{height:40px}.es-flow-index button.el-button.sub.el-button--primary.el-button--medium{width:calc(100% - 85px)}.es-flow-index .el-input-group--prepend>.el-input-group__append{height:40px}.es-flow-index .demo-dynamic .el-select{width:100%!important}.es-flow-index .demo-dynamic .select-process .el-select,.es-flow-index .demo-dynamic .selectUser,.es-flow-index.task-union-examine .el-select{width:calc(100% + 40px)!important}.es-flow-index .el-input.el-input-group.el-input-group--append.el-input-group--prepend{margin:0!important}.es-flow-index .demo-dynamic,.es-flow-index .es-footer-btn{margin-top:10px}.es-flow-index .es-footer-btn .el-button+.el-button{margin:10px 10px 0 0}.es-flow-index .el-input.is-disabled .el-input__inner{color:#606266}.es-flow-index .btn{margin-right:10px}.es-flow-index .es-info{padding:0 8px;-webkit-box-flex:1;-ms-flex:1;flex:1;overflow-y:auto;overflow-x:hidden}.es-flow-index .es-info::-webkit-scrollbar{width:5px}.es-flow-index .news{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;cursor:pointer;padding:10px 0}.es-flow-index .news .sj,.show{width:10px;height:10px;border-right:1px solid #000;border-bottom:1px solid #000;margin-right:10px;-webkit-transform:rotate(-135deg);transform:rotate(-135deg);-webkit-transition:.5s;transition:.5s}.es-flow-index .news .show{-webkit-transform:rotate(45deg);transform:rotate(45deg)}.es-flow-index .el-checkbox{margin:0 10px 10px 0}.es-flow-index .info::-webkit-scrollbar-track{-webkit-box-shadow:inset006pxrgba(0,0,0,.3);border-radius:10px}::-webkit-scrollbar-thumb{border-radius:10px;background:rgba(0,0,0,.1);-webkit-box-shadow:inset006pxrgba(0,0,0,.5)}.el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after{right:5px!important}.es-flow-form .input-with-select{width:100%;margin-top:0}.es-flow-form .el-select{width:100%}.es-flow-form .es-opinions .el-select{width:calc(100% + 40px)!important}.select-users .el-input-group__append .el-button span,.select-users .no-icon .el-input-group__append{display:none}.select-users .el-input-group__append{background-color:#1890ff}.select-users .el-input-group__append .el-button i{font-size:18px;color:#fff}.es-flow-form .input-with-select .el-input-group__prepend{background-color:#fff;width:100%}.es-flow-form .el-input-group--prepend>.el-input__inner{display:none!important}.es-flow-form button.el-button.sub.el-button--danger.el-button--medium{width:calc(100% - 85px)}.es-flow-form .el-input-group--prepend>.el-input-group__append{height:40px}.es-flow-form .el-form-item__label{font-weight:700}.es-flow-form .el-input.is-disabled .el-input__inner{color:#000}.select-user{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.select-user .left{width:30%}.select-user .right{padding:3px;width:69%}.select-user .el-checkbox{width:170px;margin-top:11px;margin-bottom:11px}.select-user .all{margin:0!important}
+@charset "UTF-8";.commonOpinion-set,.es-flow-index{-webkit-box-orient:vertical;-webkit-box-direction:normal}.es-common-opinions,.es-fenyue-buttons,.es-flow-buttons,.es-flow-title,.es-opinion{padding:0 12px}.es-user-defined{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.es-user-defined .el-button--primary{-webkit-box-flex:1;-ms-flex:1;flex:1}.required .el-textarea__inner::-webkit-input-placeholder{color:red}.required .el-textarea__inner::-moz-placeholder{color:red}.required .el-textarea__inner:-ms-input-placeholder{color:red}.required .el-textarea__inner::-ms-input-placeholder{color:red}.required .el-textarea__inner::placeholder{color:red}.no-checked .el-checkbox__input{display:none!important}.es-flow-index{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding-bottom:12px;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;position:relative}.es-flow-index .em-flow-more-btn{display:block;width:100%}.es-flow-index .el-checkbox-group{display:contents}.es-flow-index .es-eidt-title{font-size:13px;color:#333;line-height:20px}.es-flow-index .es-flow-top{height:350px}.es-flow-index .es-flow-top .es-flow-title{height:40px;line-height:40px}.es-flow-index .es-flow-top .es-flow-title .es-icon{position:absolute;right:8px;top:4px}.es-flow-index .es-flow-top .es-opinion{display:-webkit-box;display:-ms-flexbox;display:flex;margin:8px 0;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.es-flow-index .es-flow-top .es-opinion .es-opinion-file{cursor:pointer;position:relative}.es-flow-index .es-flow-top .es-opinion .es-opinion-file .es-file-num{color:red}.es-flow-index .es-button-agree{width:calc(43% - 15px)}.es-flow-index .es-button-agree-save{margin-top:10px}.commonOpinion-set{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;height:100%}.commonOpinion-set .el-table__body-wrapper{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-flow-index-shrink{width:24px}.es-flow-index-shrink img{cursor:pointer;width:24px;height:24px}.es-flow-btn:hover{background-color:#f5f5f5;color:#1890ff}.es-flow-btn:hover ::v-deep .el-popover{padding:12px 0!important}.es-flow-form .el-checkbox-group{display:contents}.es-flow-index .el-input-group--prepend>.el-input__inner,.es-flow-index .select-process>.el-input__inner{display:none!important}.es-flow-form .el-textarea:first-child,.es-flow-index .el-textarea{width:100%;margin-bottom:10px!important}.es-flow-form .es-opinions .el-select,.es-flow-index .el-select{width:calc(100% + 40px)!important}.es-flow-index .el-select .el-input{width:100%;height:40px}.es-flow-index .process .el-select{width:calc(100% + 40px)!important}.es-flow-index .input-with-select .el-input-group__prepend{background-color:#fff;width:100%}.es-flow-index .select-process .el-input-group__append{height:40px}.es-flow-index button.el-button.sub.el-button--primary.el-button--medium{width:calc(100% - 85px)}.es-flow-index .el-input-group--prepend>.el-input-group__append{height:40px}.es-flow-index .demo-dynamic .el-select{width:100%!important}.es-flow-index .demo-dynamic .select-process .el-select,.es-flow-index .demo-dynamic .selectUser,.es-flow-index.task-union-examine .el-select{width:calc(100% + 40px)!important}.es-flow-index .el-input.el-input-group.el-input-group--append.el-input-group--prepend{margin:0!important}.es-flow-index .demo-dynamic,.es-flow-index .es-footer-btn{margin-top:10px}.es-flow-index .es-footer-btn .el-button+.el-button{margin:10px 10px 0 0}.es-flow-index .el-input.is-disabled .el-input__inner{color:#606266}.es-flow-index .es-flow-btn{margin-right:10px}.es-flow-index .es-info{padding:0 8px;-webkit-box-flex:1;-ms-flex:1;flex:1;overflow-y:auto;overflow-x:hidden}.es-flow-index .es-info::-webkit-scrollbar{width:5px}.es-flow-index .news{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;cursor:pointer;padding:10px 0}.es-flow-index .news .sj,.show{width:10px;height:10px;border-right:1px solid #000;border-bottom:1px solid #000;margin-right:10px;-webkit-transform:rotate(-135deg);transform:rotate(-135deg);-webkit-transition:.5s;transition:.5s}.es-flow-index .news .show{-webkit-transform:rotate(45deg);transform:rotate(45deg)}.es-flow-index .el-checkbox{margin:0 10px 10px 0}.es-flow-index .info::-webkit-scrollbar-track{-webkit-box-shadow:inset006pxrgba(0,0,0,.3);border-radius:10px}::-webkit-scrollbar-thumb{border-radius:10px;background:rgba(0,0,0,.1);-webkit-box-shadow:inset006pxrgba(0,0,0,.5)}.el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after{right:5px!important}.es-flow-form .input-with-select{width:100%;margin-top:0}.es-flow-form .el-select{width:100%}.es-flow-form .es-opinions .el-select{width:calc(100% + 40px)!important}.select-users .el-input-group__append .el-button span,.select-users .no-icon .el-input-group__append{display:none}.select-users .el-input-group__append{background-color:#1890ff}.select-users .el-input-group__append .el-button i{font-size:18px;color:#fff}.es-flow-form .input-with-select .el-input-group__prepend{background-color:#fff;width:100%}.es-flow-form .el-input-group--prepend>.el-input__inner{display:none!important}.es-flow-form button.el-button.sub.el-button--danger.el-button--medium{width:calc(100% - 85px)}.es-flow-form .el-input-group--prepend>.el-input-group__append{height:40px}.es-flow-form .el-form-item__label{font-weight:700}.es-flow-form .el-input.is-disabled .el-input__inner{color:#000}.select-user{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.select-user .left{width:30%}.select-user .right{padding:3px;width:69%}.select-user .el-checkbox{width:170px;margin-top:11px;margin-bottom:11px}.select-user .all{margin:0!important}