eoss-ui 0.4.17 → 0.4.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.17",
+  "version": "0.4.18",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -91,7 +91,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.40",
+    "eoss-element": "^0.2.42",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/dialog/src/main.vue

@@ -8,6 +8,7 @@
     :close-on-click-modal="shadeClose"
     :fullscreen="full"
     :drag="drag"
+    :modal-append-to-body="modalAppendToBody"
     v-bind="$attrs"
     v-on="$listeners"
     :class="{ 'is-middle': middle }"
@@ -307,6 +308,10 @@ export default {
       type: Boolean,
       default: true
     },
+    modalAppendToBody: {
+      type: Boolean,
+      default: true
+    },
     appendToBody: {
       type: [Boolean, String],
       default: true
@@ -376,7 +381,7 @@ export default {
       this.ht = this.height ? this.height : this.sizes[this.size]['height'];
     }
     if (this.busEvent) {
-      mbus.$on(this.busEvent, async res => {
+      mbus.$on(this.busEvent, async (res) => {
         this.titles = res.title;
         this.handler && (await this.handler(res, this));
         this.handleShow();

package/packages/flow/src/selectUser.vue

@@ -42,7 +42,7 @@
       </el-option>
     </el-select> -->
     <!-- class="select-user-icon el-button--primary" -->
-    <div style="position:relative">
+    <div style="position: relative">
       <!-- <es-selector
         v-if="isChange"
         v-model="newSelectUserList"
@@ -72,6 +72,7 @@
         @cancel="cancelSelectUser"
         @change="getSelectUser"
         :param="newParams"
+        ><i class="es-icon-user"></i
       ></es-selector>
       <!-- :action="url" -->
       <!-- :where="{type:'user',a:'1'}" -->
@@ -262,14 +263,14 @@ export default {
             url: handleInfo,
             params: { searchKey: query, query, type: 'user' }
           })
-          .then(res => {
+          .then((res) => {
             const { status, data } = res;
             this.searchLoading = false;
             if (status === 'success') {
               this.newOptions = data;
             }
           })
-          .catch(err => {
+          .catch((err) => {
             this.searchLoading = false;
             if (err.message && err.message !== 'canceled') {
               this.$message.error(err.message);
@@ -282,8 +283,8 @@ export default {
     changeSelectUser(val) {
       this.newSelectUserList = [];
       if (this.newMultiple) {
-        val.map(item => {
-          this.newOptions.map(items => {
+        val.map((item) => {
+          this.newOptions.map((items) => {
             if (item === items.id) {
               this.newSelectUserList.push({
                 showname: items.name,
@@ -293,7 +294,7 @@ export default {
           });
         });
       } else {
-        this.newOptions.map(item => {
+        this.newOptions.map((item) => {
           if (item.id === val) {
             this.newSelectUserList.push({
               showname: item.name,
@@ -329,7 +330,7 @@ export default {
       if (this.newMultiple) {
         this.newNextUser = [];
 
-        this.newSelectUserList.map(item => {
+        this.newSelectUserList.map((item) => {
           if (this.mix) {
             this.newOptions.push({
               ...item,
@@ -371,7 +372,7 @@ export default {
       let data = {};
       if (this.mix) data = this.getMixList();
       if (this.newMultiple) {
-        this.newNextUser.map(item => {
+        this.newNextUser.map((item) => {
           //  if (this.mix) {
           //   this.newOptions.push({
           //     id: item.showid,
@@ -381,8 +382,8 @@ export default {
           // } else {
           //   this.newOptions.push({...item, id: item.showid, name: item.showname });
           // }
-          this.newOptions.map(items => {
-            oldUserList.map(val => {
+          this.newOptions.map((items) => {
+            oldUserList.map((val) => {
               if (items.showid != val.showid && val.showid == item) {
                 this.newSelectUserList.push({
                   ...val
@@ -397,7 +398,7 @@ export default {
           });
         });
         var obj = {};
-        this.newSelectUserList = this.newSelectUserList.reduce(function(
+        this.newSelectUserList = this.newSelectUserList.reduce(function (
           item,
           next
         ) {
@@ -406,7 +407,7 @@ export default {
         },
         []);
       } else {
-        this.newOptions.map(item => {
+        this.newOptions.map((item) => {
           if (item.showid === this.newNextUser) {
             this.newSelectUserList.push({
               ...item

package/packages/main/src/main.vue

@@ -215,9 +215,7 @@ export default {
     //host
     host: {
       type: String,
-      default() {
-        return util.getStorage('host') ? util.getStorage('host') : '';
-      }
+      default: ''
     },
     header: {
       type: Boolean,
@@ -1232,7 +1230,7 @@ export default {
         if (urls[0].indexOf('.js') > 1) {
           this.method = 'wujie';
           this.wjName = 'singlespa';
-          this.page = page;
+          this.page = this.host + page;
           this.$nextTick(() => {
             this.refresh = true;
           });
@@ -1284,7 +1282,7 @@ export default {
                 } else {
                   this.method = 'wujie';
                   this.wjName = res.appCode ? res.appCode : 'application';
-                  this.page = page;
+                  this.page = this.host + page;
                   this.$nextTick(() => {
                     this.refresh = true;
                   });

package/packages/selector/src/main.vue

@@ -91,7 +91,7 @@
                 ref="openDialog"
                 v-if="filterable && showButton"
                 @click.stop="openDialog"
-                >选择</el-button
+                ><slot>选择</slot></el-button
               >
             </template>
           </el-input>
@@ -130,7 +130,7 @@
               ref="openDialog"
               v-if="filterable && showButton"
               @click.stop="openDialog"
-              >选择</el-button
+              ><slot>选择</slot></el-button
             >
           </template>
         </el-input>
@@ -249,7 +249,7 @@ export default {
     valueType: {
       type: String,
       default: 'object',
-      validator: function(value) {
+      validator: function (value) {
         return ['string', 'object'].includes(value);
       }
     },
@@ -350,7 +350,7 @@ export default {
             return this.selected[this.labelKey];
           } else if (Array.isArray(this.selected)) {
             return this.selected
-              .map(item => {
+              .map((item) => {
                 return typeof item === 'string' ? item : item[this.labelKey];
               })
               .join(',');
@@ -442,11 +442,11 @@ export default {
             url: this.action,
             params: params
           })
-          .then(res => {
+          .then((res) => {
             if (res.rCode === 0) {
               this.options = res.results;
               if (this.selected.length && this.multiple) {
-                this.selected.forEach(item => {
+                this.selected.forEach((item) => {
                   let i = util.indexOfObj(this.options, item, this.valueKey);
                   if (i > -1) {
                     this.options[i].selected = true;
@@ -456,7 +456,7 @@ export default {
               this.show = true;
             }
           })
-          .catch(err => {
+          .catch((err) => {
             if (err.message && err.message !== 'canceled') {
               this.$message.error(err.message);
             }
@@ -528,7 +528,7 @@ export default {
       let inputChildNodes = this.$refs.reference.$el.childNodes;
       let input = [].filter.call(
         inputChildNodes,
-        item => item.tagName === 'INPUT'
+        (item) => item.tagName === 'INPUT'
       )[0];
       if (input) {
         input.focus();
@@ -567,7 +567,7 @@ export default {
             let inputChildNodes = this.$refs.reference.$el.childNodes;
             let input = [].filter.call(
               inputChildNodes,
-              item => item.tagName === 'INPUT'
+              (item) => item.tagName === 'INPUT'
             )[0];
             input.style.height = height;
           }

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}.es-user-defined .el-button--primary{-webkit-box-flex:1;-ms-flex:1;flex:1}.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}.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{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;height:40px}.es-flow-index .es-flow-top .es-flow-title .es-icon{margin:0 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-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::after{content:'';display:inline-block;width:25px;height:25px;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAx5JREFUaEPtWO1RFUEQnI4AiUCJQIhAjECNQI1AiECNQIhAiUCIQIlAjECMQIigrX41Y21d+W4/D+pRb6v4wbvbven56OlZ2IYvbLj9tgVw3xHcRuDBRYDkazN7aWb7ZvbEAV6b2ZWZnQM4Gwl6WAqRlNGfEqPX2SkwxwDORwAZAoDkZzN74wZdmtkX9/aNfiP5yKOid575eycAjntBdANIjL8ViJxnSQrEiZntmNkpgKMeEF0APG2+mpmMPwSgPM8ukqqP7w7iVQ703IG9AH55zr8FoLQpXiTledXMNYC94o2TF5sBeCoo9y8BHLYYQFJRUE00R6EHgDwuyqz2foBNnHAGIEigyhc9AH441+8BEDVWL5LqE0rDKwAH1QeYtYs5ktQHATQ7wSm265zmj5MUx+8MAnALQL2ievUAiAIckULNRNADQFLghcsCNabqlVDpvRSxqPNbD4+TjD7yHIAiWr2aI+AFKPZ53BKFxPu/AYRqvXMAEQV9+KBCSqT7mr2/YsFqyJMNiSf15AjA6dyZJN+5mNNrktVN9RPf6AbgqfTBzN77oUorGaXmJGktOS25IAEn/RPp0m38kAiEJxJlWhLUZu0zPbw7AiSVz0oLTWQ1SzT8sbRu1h3cDMB1jNImFWEXmsRErZ5C6UQWM7KAqn/EkigUkCY91QTA00VSWu1fw4xyXiPiyuDc8hFT9aA/TWbap7Sq7gXVACYsIo9rjCwyfArMgSgCEZEsi3XVwIQyh7CIs1RMZ/q3ar4ojoAXq6RD9UdyKeUgVEtKS63i5lYEwAtWA4xyfpjn/5NSEQmlpDp7trBLAcT4eAGgli5LAvDvHZKhcosUahZAMvaJbfZLvFJl8eTl5Ht6kp01SgCER8TVkgyLL5IhTbJRKAHwx3N/t5UuaxEnUbgBsDu3fxZAom9+AlAnvbNFUrd8T3N3RjkA6rDSOYsxzzqPJD1n9v40ByAG92JeHhWipO/MDvwPHsCqgHvvflqj4pdns4Wci4AoVACaLm9bDY99fvkrAGubZ5ZGe41Yev8WwNIezp2/jUDOQ0s/3/gI/AUY12NA2FztQAAAAABJRU5ErkJggg==) no-repeat;background-size:100% 100%;position:absolute;top:50%;left:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%);z-index:10}.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}.es-user-defined .el-button--primary{-webkit-box-flex:1;-ms-flex:1;flex:1}.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}.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{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;height:40px}.es-flow-index .es-flow-top .es-flow-title .es-icon{margin:0 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-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}