eoss-ui 0.6.47 → 0.6.48

package/package.json

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

package/packages/flow/src/main.vue

@@ -1132,6 +1132,13 @@ export default {
           this.getProcess();
         }
       }
+    },
+    flowTypeCode:{
+      handler(val) {
+        this.isFlow && this.businessId && this.getProcess(val);
+      },
+      deep:true,
+      immediate: true
     }
   },
   computed: {
@@ -2651,10 +2658,10 @@ export default {
      * @author liufan
      * @date 2022年5月25日
      **/
-    getProcess() {
+    getProcess(val) {
       let params = {
         businessId: this.businessId,
-        flowTypeCode: this.flowTypeCode,
+        flowTypeCode:val || this.flowTypeCode,
         // defaultProcessKey: this.defaultProcessKey,
         isOnly: true,
         hideTempSave: true,

package/packages/flow/src/reset.vue

@@ -5,15 +5,16 @@
     element-loading-text="加载中..."
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(255, 255,255, 0.8)"
+    style="height: 100%"
   >
     <el-form
       ref="nextNode"
       :model="nextNode"
-      class="demo-dynamic"
+      class="es-reset-flow demo-dynamic"
       label-width="100px"
       label-position="left"
     >
-      <div style="  margin-bottom: 10px">
+      <div  class="es-reset-flow-form-box">
         <el-form-item prop="nodeName" label="标题">
           <el-input v-model="pendtitle" disabled />
         </el-form-item>
@@ -810,11 +811,13 @@ export default {
           ...this.flowParams
         }
       };
+      this.loading = true;
       // 获取节点
       util
         .ajax(params)
         .then((res) => {
           //pc接口返回数据处理
+          this.loading = false;
           const { status, message, data } = res;
           if (status == 'success') {
             this.pendtitle = data.pendtitle || data.taskExamine.businessName;

package/packages/form/src/main.vue

@@ -516,7 +516,7 @@
                               handleChange(item, val);
                             }
                           "
-                          @getFilesAmount="$emit('getFilesAmount', $value)"
+                          @getFilesAmount="$emit('getFilesAmount', $event)"
                         ></es-upload>
                         <es-selector
                           v-bind="
@@ -1511,7 +1511,7 @@
                         handleChange(item, val);
                       }
                     "
-                    @getFilesAmount="$emit('getFilesAmount', $value)"
+                    @getFilesAmount="$emit('getFilesAmount', $event)"
                   ></es-upload>
                   <es-selector
                     v-bind="

package/packages/form/src/table.vue

@@ -392,7 +392,7 @@
                           handleChange(item, val);
                         }
                       "
-                      @getFilesAmount="$emit('getFilesAmount', $value)"
+                      @getFilesAmount="$emit('getFilesAmount', $event)"
                     ></es-upload>
                     <es-selector
                       v-bind="

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

@@ -1 +1 @@
-@charset "UTF-8";.commonOpinion-set,.es-fenyue-buttons,.es-flow-content{-webkit-box-direction:normal}.es-common-opinions,.es-fenyue-buttons,.es-flow-buttons,.es-flow-title,.es-opinion{padding:0 12px}.es-fenyue-buttons{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row}.es-fenyue-buttons-yj{-webkit-box-flex:1;-ms-flex:1;flex:1}.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-content{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-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{height:100%}.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 .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;-webkit-box-orient:vertical;-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 .hide-flow-char .el-input-group__append{padding:0}.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{-webkit-box-flex:1;-ms-flex:1;flex:1;overflow-y:auto;margin-top:10px}.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}.es-flow-index .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner,.flow-dialog .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner{background-color:#1890ff!important;border-color:#1890ff!important}.es-flow-index .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after,.flow-dialog .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after{border-color:#fff}.es-flow-index .el-checkbox__input.is-disabled+span.el-checkbox__label,.flow-dialog .el-checkbox__input.is-disabled+span.el-checkbox__label{color:rgba(0,0,0,.85)}
+@charset "UTF-8";.commonOpinion-set,.es-fenyue-buttons,.es-flow-content,.es-reset-flow{-webkit-box-direction:normal}.es-common-opinions,.es-fenyue-buttons,.es-flow-buttons,.es-flow-title,.es-opinion{padding:0 12px}.es-fenyue-buttons{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-ms-flex-direction:row;flex-direction:row}.es-fenyue-buttons-yj{-webkit-box-flex:1;-ms-flex:1;flex:1}.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-reset-flow{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-ms-flex-direction:column;flex-direction:column;height:100%}.es-reset-flow-form-box{-webkit-box-flex:1;-ms-flex:1;flex:1;overflow-y:auto;margin-bottom:10px}.es-flow-content{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-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{height:100%}.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 .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;-webkit-box-orient:vertical;-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 .hide-flow-char .el-input-group__append{padding:0}.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{-webkit-box-flex:1;-ms-flex:1;flex:1;overflow-y:auto;margin-top:10px}.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}.es-flow-index .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner,.flow-dialog .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner{background-color:#1890ff!important;border-color:#1890ff!important}.es-flow-index .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after,.flow-dialog .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after{border-color:#fff}.es-flow-index .el-checkbox__input.is-disabled+span.el-checkbox__label,.flow-dialog .el-checkbox__input.is-disabled+span.el-checkbox__label{color:rgba(0,0,0,.85)}