eoss-ui 0.8.26 → 0.8.28

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

@@ -1,110 +1,110 @@
-<template>
-  <div 
-  class="flow-sort-box"
-    style="height: 100%;overflow-y: auto;"
-    v-loading="loading"
-    element-loading-text="加载中..."
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(255, 255,255, 0.8)">
-    <Draggable
-      class="flow-sort-draggable"
-      :list="sortList"
-    >
-      <es-button style="margin-top: 10px;" v-for="item in sortList" :key="item.id" plain>{{
-        item.name
-      }}</es-button></Draggable
-    >
-    <div class="flow-sort-btn">
-        <es-button type="primary" @click="saveSort(true)">保存</es-button>
-        <es-button  @click="saveSort(false)">取消</es-button>
-    </div>
-  </div>
-</template>
-
-<script>
-import util from 'eoss-ui/src/utils/util';
-import Draggable from 'vuedraggable';
-import { toDefinitionChangeSort,setSort } from 'eoss-ui/src/config/api';
-export default {
-  name: 'SortFlow',
-  components: {
-    Draggable
-  },
-  props: {
-    flowTypeCode: {
-      type: String,
-      default: ''
-    },
-    defaultProcessKey: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      sortList: [],
-      loading:false
-    };
-  },
-  mounted() {
-    this.getSortInfo();
-  },
-  methods: {
-    saveSort(type){
-        if(type){
-            let arr = [];
-            this.sortList.map((item,index)=>{
-                arr.push({
-                    id:item.id,
-                    processDefId:item.processDefId,
-                    sort:this.sortList.length - index
-                })
-            });
-            const params = {
-        url: setSort,
-        method: 'post',
-        format: false,
-        headers: {
-                Accept: 'application/json,text/plain',
-                'Content-Type': 'application/json;charset=UTF-8'
-              },
-        data: arr
-      };
-      this.loading=true;
-      util.ajax(params).then((res) => {
-         this.loading=false;
-        if (res.rCode === 0 || res.status=== 'success') {
-          this.$message.success('保存成功');
-          this.$emit('success',this.sortList)
-        }
-      }).catch(() => {
-        this.loading=false;
-      });
-        }else{
-            this.$emit('close')
-        }
-    },
-    getSortInfo() {
-      const params = {
-        url: toDefinitionChangeSort,
-        method: 'get',
-        params: {
-          flowTypeCode: this.flowTypeCode,
-          defaultProcessKey: this.defaultProcessKey
-        }
-      };
-      this.loading=true;
-      util.ajax(params).then((res) => {
-         this.loading=false;
-        if (res.rCode === 0) {
-          this.sortList = res.results.definitionList || [];
-        }
-      }).catch(() => {
-        this.loading=false;
-      });
-    }
-  }
-};
-</script>
-
-<style></style>
+<template>
+  <div 
+  class="flow-sort-box"
+    style="height: 100%;overflow-y: auto;"
+    v-loading="loading"
+    element-loading-text="加载中..."
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(255, 255,255, 0.8)">
+    <Draggable
+      class="flow-sort-draggable"
+      :list="sortList"
+    >
+      <es-button style="margin-top: 10px;" v-for="item in sortList" :key="item.id" plain>{{
+        item.name
+      }}</es-button></Draggable
+    >
+    <div class="flow-sort-btn">
+        <es-button type="primary" @click="saveSort(true)">保存</es-button>
+        <es-button  @click="saveSort(false)">取消</es-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import util from 'eoss-ui/src/utils/util';
+import Draggable from 'vuedraggable';
+import { toDefinitionChangeSort,setSort } from 'eoss-ui/src/config/api';
+export default {
+  name: 'SortFlow',
+  components: {
+    Draggable
+  },
+  props: {
+    flowTypeCode: {
+      type: String,
+      default: ''
+    },
+    defaultProcessKey: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      sortList: [],
+      loading:false
+    };
+  },
+  mounted() {
+    this.getSortInfo();
+  },
+  methods: {
+    saveSort(type){
+        if(type){
+            let arr = [];
+            this.sortList.map((item,index)=>{
+                arr.push({
+                    id:item.id,
+                    processDefId:item.processDefId,
+                    sort:this.sortList.length - index
+                })
+            });
+            const params = {
+        url: setSort,
+        method: 'post',
+        format: false,
+        headers: {
+                Accept: 'application/json,text/plain',
+                'Content-Type': 'application/json;charset=UTF-8'
+              },
+        data: arr
+      };
+      this.loading=true;
+      util.ajax(params).then((res) => {
+         this.loading=false;
+        if (res.rCode === 0 || res.status=== 'success') {
+          this.$message.success('保存成功');
+          this.$emit('success',this.sortList)
+        }
+      }).catch(() => {
+        this.loading=false;
+      });
+        }else{
+            this.$emit('close')
+        }
+    },
+    getSortInfo() {
+      const params = {
+        url: toDefinitionChangeSort,
+        method: 'get',
+        params: {
+          flowTypeCode: this.flowTypeCode,
+          defaultProcessKey: this.defaultProcessKey
+        }
+      };
+      this.loading=true;
+      util.ajax(params).then((res) => {
+         this.loading=false;
+        if (res.rCode === 0) {
+          this.sortList = res.results.definitionList || [];
+        }
+      }).catch(() => {
+        this.loading=false;
+      });
+    }
+  }
+};
+</script>
+
+<style></style>

package/packages/flow/src/form.vue

@@ -1,123 +1,123 @@
-<template>
-  <div class="es-from" v-loading="loading">
-    <el-form
-      ref="dynamicValidateForm"
-      :label-position="labelPosition"
-      :model="newData"
-      :label-width="labelWidth"
-      class="demo-dynamic"
-    >
-      <el-form-item
-        prop="sort"
-        label="排序号"
-        :rules="[{ required: true, message: `请输入排序号`, trigger: 'blur' }]"
-      >
-        <el-input
-          v-model="newData.sort"
-          :placeholder="`请输入入排序号`"
-        ></el-input>
-      </el-form-item>
-      <el-form-item
-        prop="content"
-        label="内容"
-        :rules="[{ required: true, message: `请输入内容`, trigger: 'blur' }]"
-      >
-        <el-input
-          v-model="newData.content"
-          type="textarea"
-          :rows="3"
-          :placeholder="`请输入内容`"
-        ></el-input>
-      </el-form-item>
-      <!-- <el-form-item> -->
-      <!-- </el-form-item> -->
-    </el-form>
-    <div style="text-align: right">
-      <el-button
-        v-show="showSubBtn"
-        type="primary"
-        size="small"
-        @click="submitForm('dynamicValidateForm')"
-      >
-        保存
-      </el-button>
-    </div>
-  </div>
-</template>
-
-<script>
-import { addCommonOpion, editCommonOpion } from 'eoss-ui/src/config/api';
-import util from 'eoss-ui/src/utils/util';
-export default {
-  name: 'ideas',
-  componentName: 'ideas',
-  props: {
-    data: {
-      type: Object,
-      default: () => {}
-    },
-    formItemList: {
-      type: Array,
-      default: () => []
-    },
-    labelWidth: {
-      type: String,
-      default: '100px'
-    },
-    showSubBtn: {
-      type: Boolean,
-      default: true
-    },
-    labelPosition: {
-      type: String,
-      default: 'left'
-    }
-  },
-  data() {
-    return {
-      formList: [],
-      loading: false,
-      newData: {},
-      index: 0
-    };
-  },
-  mounted() {
-    this.data.id ? this.add(this.data.id) : this.add();
-  },
-  methods: {
-    add(id) {
-      this.loading = true;
-      util
-        .ajax({
-          url: id ? editCommonOpion : addCommonOpion,
-          params: { id }
-        })
-        .then((res) => {
-          const { status, message, data } = res;
-          if (status == 'success') {
-            this.newData = data.bean;
-          } else {
-            this.$message.error(message || '系统错误，请联系管理员！');
-          }
-          this.loading = false;
-        })
-        .catch((err) => {
-          this.loading = false;
-          if (err.message && err.message !== 'canceled') {
-            this.$message.error(err.message);
-          }
-        });
-    },
-    submitForm(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          this.$emit('subMit', { addVisible: false, data: this.newData });
-          this.$emit('sub-mit', { addVisible: false, data: this.newData });
-        } else {
-          return false;
-        }
-      });
-    }
-  }
-};
-</script>
+<template>
+  <div class="es-from" v-loading="loading">
+    <el-form
+      ref="dynamicValidateForm"
+      :label-position="labelPosition"
+      :model="newData"
+      :label-width="labelWidth"
+      class="demo-dynamic"
+    >
+      <el-form-item
+        prop="sort"
+        label="排序号"
+        :rules="[{ required: true, message: `请输入排序号`, trigger: 'blur' }]"
+      >
+        <el-input
+          v-model="newData.sort"
+          :placeholder="`请输入入排序号`"
+        ></el-input>
+      </el-form-item>
+      <el-form-item
+        prop="content"
+        label="内容"
+        :rules="[{ required: true, message: `请输入内容`, trigger: 'blur' }]"
+      >
+        <el-input
+          v-model="newData.content"
+          type="textarea"
+          :rows="3"
+          :placeholder="`请输入内容`"
+        ></el-input>
+      </el-form-item>
+      <!-- <el-form-item> -->
+      <!-- </el-form-item> -->
+    </el-form>
+    <div style="text-align: right">
+      <el-button
+        v-show="showSubBtn"
+        type="primary"
+        size="small"
+        @click="submitForm('dynamicValidateForm')"
+      >
+        保存
+      </el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { addCommonOpion, editCommonOpion } from 'eoss-ui/src/config/api';
+import util from 'eoss-ui/src/utils/util';
+export default {
+  name: 'ideas',
+  componentName: 'ideas',
+  props: {
+    data: {
+      type: Object,
+      default: () => {}
+    },
+    formItemList: {
+      type: Array,
+      default: () => []
+    },
+    labelWidth: {
+      type: String,
+      default: '100px'
+    },
+    showSubBtn: {
+      type: Boolean,
+      default: true
+    },
+    labelPosition: {
+      type: String,
+      default: 'left'
+    }
+  },
+  data() {
+    return {
+      formList: [],
+      loading: false,
+      newData: {},
+      index: 0
+    };
+  },
+  mounted() {
+    this.data.id ? this.add(this.data.id) : this.add();
+  },
+  methods: {
+    add(id) {
+      this.loading = true;
+      util
+        .ajax({
+          url: id ? editCommonOpion : addCommonOpion,
+          params: { id }
+        })
+        .then((res) => {
+          const { status, message, data } = res;
+          if (status == 'success') {
+            this.newData = data.bean;
+          } else {
+            this.$message.error(message || '系统错误，请联系管理员！');
+          }
+          this.loading = false;
+        })
+        .catch((err) => {
+          this.loading = false;
+          if (err.message && err.message !== 'canceled') {
+            this.$message.error(err.message);
+          }
+        });
+    },
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.$emit('subMit', { addVisible: false, data: this.newData });
+          this.$emit('sub-mit', { addVisible: false, data: this.newData });
+        } else {
+          return false;
+        }
+      });
+    }
+  }
+};
+</script>

package/packages/flow/src/processForm.vue

@@ -545,7 +545,7 @@ export default {
       radioList: [],
       nextCurrentOrgselectUserList: [],
       showCustomLimitTimeText: false,
-      activeNames: '',
+      activeNames: '1',
       selectUserList: [],
       defaultNextNode: '',
       presetUserJson: [],
@@ -1137,7 +1137,7 @@ export default {
               if (this.isHideOtherOrg) {
                 params.nextOtherOrgObj = nextOtherOrgObj;
               }
-              if (this.activeNames != '1') delete params.customPresetUserJson;
+              if (this.activeNames != '1' || !this.isCustomPreset) delete params.customPresetUserJson;
               if (this.isFreeStartFlow || this.formType === 'readTransfer') {
                 let newParm = {};
                 newParm.copyHistory =
@@ -1275,7 +1275,7 @@ export default {
           if (this.isHideOtherOrg) {
             params.nextOtherOrgObj = nextOtherOrgObj;
           }
-          if (this.activeNames != '1') delete params.customPresetUserJson;
+          if (this.activeNames != '1' || !this.isCustomPreset) delete params.customPresetUserJson;
           if (this.isFreeStartFlow || this.formType === 'readTransfer') {
             let newParm = {};
             newParm.copyHistory = this.copyHistory === 'needCopyPendedHistory';

package/packages/flow/src/table.vue

@@ -1,58 +1,58 @@
-<template>
-  <el-table
-    :data="dataList"
-    border
-    stripe
-    style="width: 100%; margin-top: 10px"
-  >
-    <el-table-column
-      v-for="item of tableHead"
-      :key="item.id"
-      align="center"
-      :prop="item.prop"
-      :label="item.lable"
-      :width="item.prop != 'content' && 180"
-      v-bind="$attrs"
-    ></el-table-column>
-    <el-table-column label="操作" width="100" align="center">
-      <template v-if="scope.row.userid" slot-scope="scope">
-        <el-button type="text" size="small" @click="handleClick(scope.row)"
-          >编辑</el-button
-        >
-        <el-button type="text" size="small" @click="delClick(scope.row)"
-          >删除</el-button
-        >
-      </template>
-    </el-table-column>
-  </el-table>
-</template>
-
-<script>
-export default {
-  name: 'Table',
-  componentName: 'Table',
-  props: {
-    dataList: {
-      type: Array,
-      default: () => []
-    },
-    tableHead: {
-      type: Array,
-      default: () => [
-        { id: 0, lable: '内容', prop: 'content' },
-        { id: 1, lable: '用户', prop: 'username' }
-      ]
-    }
-  },
-  methods: {
-    handleClick(val) {
-      this.$emit('upDateClick', val);
-      this.$emit('up-date-click', val);
-    },
-    delClick(val) {
-      this.$emit('delClick', val);
-      this.$emit('del-click', val);
-    }
-  }
-};
-</script>
+<template>
+  <el-table
+    :data="dataList"
+    border
+    stripe
+    style="width: 100%; margin-top: 10px"
+  >
+    <el-table-column
+      v-for="item of tableHead"
+      :key="item.id"
+      align="center"
+      :prop="item.prop"
+      :label="item.lable"
+      :width="item.prop != 'content' && 180"
+      v-bind="$attrs"
+    ></el-table-column>
+    <el-table-column label="操作" width="100" align="center">
+      <template v-if="scope.row.userid" slot-scope="scope">
+        <el-button type="text" size="small" @click="handleClick(scope.row)"
+          >编辑</el-button
+        >
+        <el-button type="text" size="small" @click="delClick(scope.row)"
+          >删除</el-button
+        >
+      </template>
+    </el-table-column>
+  </el-table>
+</template>
+
+<script>
+export default {
+  name: 'Table',
+  componentName: 'Table',
+  props: {
+    dataList: {
+      type: Array,
+      default: () => []
+    },
+    tableHead: {
+      type: Array,
+      default: () => [
+        { id: 0, lable: '内容', prop: 'content' },
+        { id: 1, lable: '用户', prop: 'username' }
+      ]
+    }
+  },
+  methods: {
+    handleClick(val) {
+      this.$emit('upDateClick', val);
+      this.$emit('up-date-click', val);
+    },
+    delClick(val) {
+      this.$emit('delClick', val);
+      this.$emit('del-click', val);
+    }
+  }
+};
+</script>