eoss-ui 0.4.28 → 0.4.30

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

@@ -3,6 +3,7 @@
     <template v-for="(item, index) in btns">
       <es-button
         v-if="item && !item.hide && index < length"
+        :stop="stop"
         v-bind="item"
         :key="index"
         :size="size"
@@ -51,6 +52,7 @@ export default {
       default: 3
     },
     rules: Function,
+    stop: Boolean,
     trigger: {
       type: String,
       default: 'click'
@@ -78,7 +80,7 @@ export default {
   methods: {
     getBtns() {
       let useCaseCodes = util.getStorage('useCaseCodes');
-      let arry = this.contents.filter(item => {
+      let arry = this.contents.filter((item) => {
         if (Object.prototype.hasOwnProperty.call(item, 'rules')) {
           if (useCaseCodes && item.useCaseCode) {
             return (

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

@@ -81,7 +81,7 @@
                   : optionDatas[item.field || item.prop]
               "
               @blur="
-                event => {
+                (event) => {
                   handleBlur({
                     item: item,
                     event: event,
@@ -91,7 +91,7 @@
                 }
               "
               @focus="
-                event => {
+                (event) => {
                   handleFocus({
                     item: item,
                     event: event,
@@ -101,7 +101,7 @@
                 }
               "
               @change="
-                value => {
+                (value) => {
                   handleChange({
                     item: item,
                     name: item.field || item.prop,
@@ -124,7 +124,7 @@
                   : optionDatas[item.field || item.prop]
               "
               @blur="
-                event => {
+                (event) => {
                   handleBlur({
                     item: item,
                     event: event,
@@ -134,7 +134,7 @@
                 }
               "
               @focus="
-                event => {
+                (event) => {
                   handleFocus({
                     item: item,
                     event: event,
@@ -144,7 +144,7 @@
                 }
               "
               @change="
-                value => {
+                (value) => {
                   handleChange({
                     item: item,
                     name: item.field || item.prop,
@@ -177,7 +177,7 @@
                 )
               "
               @change="
-                value => {
+                (value) => {
                   handleChange({
                     name: item.field || item.prop,
                     value: value,
@@ -200,7 +200,7 @@
               "
               :ajax="false"
               @change="
-                value => {
+                (value) => {
                   handleChange({
                     item: item,
                     name: item.field || item.prop,
@@ -223,7 +223,7 @@
               "
               :ajax="false"
               @change="
-                value => {
+                (value) => {
                   handleChange({
                     item: item,
                     name: item.field || item.prop,
@@ -245,7 +245,7 @@
                   : optionDatas[item.field || item.prop]
               "
               @change="
-                value => {
+                (value) => {
                   handleChange({
                     item: item,
                     name: item.field || item.prop,
@@ -258,23 +258,23 @@
             <es-date-picker
               v-else-if="
                 item.date ||
-                  item.type == 'date' ||
-                  item.type == 'year' ||
-                  item.type == 'month' ||
-                  item.type == 'date' ||
-                  item.type == 'dates' ||
-                  item.type == 'week' ||
-                  item.type == 'datetime' ||
-                  item.type == 'datetimerange' ||
-                  item.type == 'daterange' ||
-                  item.type == 'monthrange' ||
-                  item.type == 'quarter' ||
-                  item.type == 'halfyear'
+                item.type == 'date' ||
+                item.type == 'year' ||
+                item.type == 'month' ||
+                item.type == 'date' ||
+                item.type == 'dates' ||
+                item.type == 'week' ||
+                item.type == 'datetime' ||
+                item.type == 'datetimerange' ||
+                item.type == 'daterange' ||
+                item.type == 'monthrange' ||
+                item.type == 'quarter' ||
+                item.type == 'halfyear'
               "
               v-bind="exclAttribute({ data: item, attrs: 'width' })"
               v-model="scope.row[item.field]"
               @blur="
-                event => {
+                (event) => {
                   handleBlur({
                     item: item,
                     event: event,
@@ -284,7 +284,7 @@
                 }
               "
               @focus="
-                event => {
+                (event) => {
                   handleFocus({
                     item: item,
                     event: event,
@@ -294,7 +294,7 @@
                 }
               "
               @change="
-                value => {
+                (value) => {
                   handleChange({
                     item: item,
                     name: item.field || item.prop,
@@ -310,7 +310,7 @@
               v-bind="exclAttribute({ data: item, attrs: 'width' })"
               v-model="scope.row[item.field]"
               @blur="
-                event => {
+                (event) => {
                   handleBlur({
                     item: item,
                     event: event,
@@ -320,7 +320,7 @@
                 }
               "
               @focus="
-                event => {
+                (event) => {
                   handleFocus({
                     item: item,
                     event: event,
@@ -330,7 +330,7 @@
                 }
               "
               @change="
-                value => {
+                (value) => {
                   handleChange({
                     item: item,
                     name: item.field || item.prop,
@@ -346,7 +346,7 @@
               v-bind="exclAttribute({ data: item, attrs: 'width' })"
               v-model="scope.row[item.field]"
               @change="
-                value => {
+                (value) => {
                   handleChange({
                     item: item,
                     name: item.field || item.prop,
@@ -366,7 +366,7 @@
                   v-bind="exclAttribute({ data: item, attrs: 'width' })"
                   v-model.lazy="scope.row[item.field]"
                   @blur="
-                    event => {
+                    (event) => {
                       handleBlur({
                         item: item,
                         event: event,
@@ -376,7 +376,7 @@
                     }
                   "
                   @focus="
-                    event => {
+                    (event) => {
                       handleFocus({
                         item: item,
                         event: event,
@@ -386,7 +386,7 @@
                     }
                   "
                   @change="
-                    value => {
+                    (value) => {
                       handleChange({
                         item: item,
                         name: item.field || item.prop,
@@ -403,7 +403,7 @@
                   v-bind="exclAttribute({ data: item, attrs: 'width' })"
                   v-model.lazy="scope.row[item.field]"
                   @blur="
-                    event => {
+                    (event) => {
                       handleBlur({
                         item: item,
                         event: event,
@@ -413,7 +413,7 @@
                     }
                   "
                   @focus="
-                    event => {
+                    (event) => {
                       handleFocus({
                         item: item,
                         event: event,
@@ -423,7 +423,7 @@
                     }
                   "
                   @change="
-                    value => {
+                    (value) => {
                       handleChange({
                         item: item,
                         name: item.field || item.prop,
@@ -440,7 +440,7 @@
                 v-bind="exclAttribute({ data: item, attrs: 'width' })"
                 v-model="scope.row[item.field]"
                 @blur="
-                  event => {
+                  (event) => {
                     handleBlur({
                       item: item,
                       event: event,
@@ -450,7 +450,7 @@
                   }
                 "
                 @focus="
-                  event => {
+                  (event) => {
                     handleFocus({
                       item: item,
                       event: event,
@@ -460,7 +460,7 @@
                   }
                 "
                 @change="
-                  value => {
+                  (value) => {
                     handleChange({
                       item: item,
                       name: item.field || item.prop,
@@ -478,6 +478,7 @@
       <!-- 按钮区域 -->
       <es-button-group
         v-if="item.type === 'handle' && !scope.row.hideHandle"
+        stop
         :contents="item.contents || item.events"
         :data="scope.row"
         @handleClick="handleClick"
@@ -652,7 +653,7 @@ export default {
                 let lists = [];
                 if (option) {
                   let v = val[item.valueKey] || val.value;
-                  lists = option.filter(list => {
+                  lists = option.filter((list) => {
                     return list[item.filtrateKey] == v;
                   });
                 }
@@ -677,7 +678,7 @@ export default {
                       params: params,
                       data: params
                     })
-                    .then(res => {
+                    .then((res) => {
                       if (res.rCode === 0) {
                         let options = JSON.parse(JSON.stringify(data));
                         if (options[index + 1]) {
@@ -700,7 +701,7 @@ export default {
                         this.$message.error(msg);
                       }
                     })
-                    .catch(err => {
+                    .catch((err) => {
                       if (err.message && err.message !== 'canceled') {
                         this.$message.error(err.message);
                       }
@@ -731,7 +732,7 @@ export default {
           rows[field]['shortName']
         );
       } else if (Array.isArray(rows[field])) {
-        const vals = rows[field].map(item => {
+        const vals = rows[field].map((item) => {
           if (util.isObject(item)) {
             return (
               item[col.labelKey] ||
@@ -749,7 +750,7 @@ export default {
         return vals.join(col.symbol ? col.symbol : '-');
       } else {
         if (col.valueToString || col['value-to-string']) {
-          const vals = rows[field].split(',').map(item => {
+          const vals = rows[field].split(',').map((item) => {
             if (data && data.length && util.isObject(data[0])) {
               return this.getLabel(data, item, col);
             }
@@ -812,7 +813,7 @@ export default {
           let datas = [];
           if (this.optionDatas[item.field || item.prop][index + 1]) {
             datas = this.optionDatas[item.field || item.prop][index + 1].filter(
-              items => {
+              (items) => {
                 return filte == items[item.filtrateKey];
               }
             );
@@ -838,7 +839,7 @@ export default {
                 params: params,
                 data: params
               })
-              .then(res => {
+              .then((res) => {
                 if (res.rCode === 0) {
                   let options = JSON.parse(
                     JSON.stringify(this.optionDatas[item.field || item.prop])
@@ -856,7 +857,7 @@ export default {
                   this.$message.error(msg);
                 }
               })
-              .catch(err => {
+              .catch((err) => {
                 if (err.message && err.message !== 'canceled') {
                   this.$message.error(err.message);
                 }

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

@@ -39,7 +39,7 @@
         v-bind="{
           ...$attrs,
           data: datas,
-          emptyText: text || emptyText,
+          emptyText: emptyText,
           showSummary: showTotal,
           sumText: sumText || totalText,
           totalRow: restotalRow || totalRow,
@@ -302,11 +302,6 @@ export default {
       default: true
     },
     // 无数据时显示的文本
-    text: {
-      type: String,
-      default: ''
-    },
-    // 无数据时显示的文本
     emptyText: {
       type: String,
       default: ''

package/packages/flow/src/component/CommonOpinions.vue

@@ -43,7 +43,7 @@
       :visible.sync="dialogVisible"
     >
       <div class="commonOpinion-set">
-        <div style="text-align:right">
+        <div style="text-align: right">
           <el-button
             type="primary"
             size="small"
@@ -60,8 +60,7 @@
           </el-button>
         </div>
         <Table
-          style="flex:1;display: flex;
-    flex-direction: column;"
+          style="flex: 1; display: flex; flex-direction: column"
           v-if="dialogVisible"
           :data-list="optionList"
           @upDateClick="upDate"
@@ -88,6 +87,7 @@ import {
   saveCommonOpinion,
   updateCommonOpinion,
   commonOpion,
+  findSysParam,
   deleteCommonOpion
 } from 'eoss-ui/src/config/api';
 import Table from '../table.vue';
@@ -156,7 +156,7 @@ export default {
           },
           method: 'post'
         })
-        .then(res => {
+        .then((res) => {
           const { status, data, msg } = res;
           if (status === 'success') {
             this.optionList = data.list;
@@ -165,7 +165,7 @@ export default {
             this.$message.error(msg || '系统错误，请联系管理员！');
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -190,8 +190,15 @@ export default {
      * @date 2022年5月25日
      **/
     selectChange(val) {
-      this.value = val;
-      this.$emit('change', this.value);
+      const that = this
+      util.ajax({ url: findSysParam,params:{cpName:'commonOpinionsSelectType'} }).then((res) => {
+        if (res.status == 'success') {
+          res.data == 2 ? (that.value = that.value + val) : (that.value = val);
+        }else{
+          that.value = val
+        }
+        this.$emit('change', that.value);
+      });
     },
     /**
      * del
@@ -215,7 +222,7 @@ export default {
                 id: val.id
               }
             })
-            .then(res => {
+            .then((res) => {
               const { status, message } = res;
               if (status == 'success') {
                 this.$message({
@@ -231,14 +238,14 @@ export default {
               }
               this.loading.close();
             })
-            .catch(err => {
+            .catch((err) => {
               if (err.message && err.message !== 'canceled') {
                 this.$message.error(err.message);
               }
               this.loading.close();
             });
         })
-        .catch(e => {});
+        .catch((e) => {});
     },
     /**
      * submit
@@ -261,7 +268,7 @@ export default {
           header: { 'Content-Type': 'multipart/form-data' },
           method: 'post'
         })
-        .then(res => {
+        .then((res) => {
           const { rCode, msg } = res;
           this.loading.close();
           if (!rCode) {
@@ -276,7 +283,7 @@ export default {
           }
           this.addVisible = addVisible;
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading.close();
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);

package/packages/flow/src/main.vue

@@ -1977,7 +1977,6 @@ export default {
     sendData() {
       this.$refs['nextNode'].validate(async (valid) => {
         if (valid) {
-          await this.saveInfo('subMit');
           if (this.isFlow) return (this.handleVisible = true);
           if (
             !this.endFlow &&
@@ -2054,6 +2053,7 @@ export default {
             this.nextNode.processDefinitionId =
               this.processObj.taskExamine.processDefinitionId;
           }
+          await this.saveInfo('subMit');
           this.loading = util.loading(this.$loading, '加载中...');
 
           let notificationType = '';

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

@@ -525,6 +525,7 @@ export default {
       }
     },
     handleSuccess() {
+      console.log(132)
       if (this.closeDialog && this.esDialog) {
         this.esDialog.handleClose();
       }
@@ -537,6 +538,8 @@ export default {
       this.$emit('success');
     },
     handleSave(id, event) {
+      console.log(13222)
+
       if (this.closeDialog && this.esDialog) {
         this.esDialog.handleClose();
       }