🎉 1.0.6.RELEASE

main
ssc 5 years ago
parent 0bbfcf3409
commit 9d941dd805
  1. 6
      public/cdn/avue-form-design/index.umd.min.js
  2. 8
      public/cdn/wf-design/index.umd.min.js
  3. 61
      src/api/plugin/workflow/form-default-values.js
  4. 7
      src/api/plugin/workflow/form.js
  5. 297
      src/views/plugin/workflow/design/form-default-values.vue
  6. 12
      src/views/plugin/workflow/design/form.vue
  7. 42
      src/views/plugin/workflow/mixins/default-values.js
  8. 53
      src/views/plugin/workflow/process/components/detail.vue
  9. 21
      src/views/plugin/workflow/process/components/form.vue

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -0,0 +1,61 @@
import request from '@/router/axios';
const prefix = '/api/blade-workflow/design/form/default-values'
export const getList = (current, size, params) => {
return request({
url: `${prefix}/list`,
method: 'get',
params: {
...params,
current,
size,
}
})
}
export const listType = (params) => {
return request({
url: `${prefix}/listType`,
method: 'get',
params
})
}
export const getDetail = (id) => {
return request({
url: `${prefix}/detail`,
method: 'get',
params: {
id
}
})
}
export const remove = (ids) => {
return request({
url: `${prefix}/remove`,
method: 'post',
params: {
ids,
}
})
}
export const add = (row) => {
return request({
url: `${prefix}/submit`,
method: 'post',
data: row
})
}
export const update = (row) => {
return request({
url: `${prefix}/submit`,
method: 'post',
data: row
})
}

@ -46,3 +46,10 @@ export const update = (row) => {
})
}
export const listType = (params) => {
return request({
url: `${prefix}/listType`,
method: 'get',
params
})
}

@ -0,0 +1,297 @@
<template>
<basic-container>
<el-container>
<el-aside width="200px">
<avue-tree :option="treeOption"
:data="treeData"
@node-click="nodeClick"></avue-tree>
</el-aside>
<el-main style="margin-left: 10px;">
<avue-crud :option="option"
:table-loading="loading"
:data="data"
:page.sync="page"
:permission="permissionList"
v-model="form"
ref="crud"
@row-update="rowUpdate"
@row-save="rowSave"
@row-del="rowDel"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad">
<template slot="menuLeft">
<el-button type="danger"
size="mini"
icon="el-icon-delete"
plain
v-if="permission.wf_form_default_values_delete"
@click="handleDelete">
</el-button>
</template>
<template #menu="{row}">
<el-button v-if="permission.wf_form_default_values_copy"
type="text"
icon="el-icon-document-copy"
size="mini"
@click="handleCopy(row)">复制</el-button>
</template>
</avue-crud>
</el-main>
</el-container>
</basic-container>
</template>
<script>
import { getList, getDetail, add, update, remove, listType } from "@/api/plugin/workflow/form-default-values";
import { mapGetters } from "vuex";
export default {
data() {
return {
form: {},
query: {},
loading: true,
page: {
pageSize: 10,
currentPage: 1,
total: 0
},
selectionList: [],
option: {
size: 'mini',
height: 'auto',
calcHeight: 30,
tip: false,
border: true,
index: true,
selection: true,
dialogType: 'drawer',
align: 'center',
searchMenuSpan: 6,
column: [
{
label: "名称",
prop: "name",
rules: [{
required: true,
message: "请输入名称",
trigger: "blur"
}],
span: 24,
search: true
},
{
label: "内容",
prop: "content",
placeholder: '请输入 内容,以${}包裹则表示执行代码,请确保代码可执行',
rules: [{
required: true,
message: "请输入内容",
trigger: "blur"
}],
span: 24
},
{
label: "字段类型",
prop: "fieldType",
type: 'select',
filterable: true,
allowCreate: true,
dicData: [{
label: 'input',
value: 'input'
}, {
label: 'textarea',
value: 'textarea'
}, {
label: 'select',
value: 'select'
}, {
label: 'tree',
value: 'tree'
}],
rules: [{
required: true,
message: "请选择/输入类型",
trigger: "blur"
}],
span: 24
},
]
},
data: [],
treeData: [],
treeOption: {
size: 'mini',
addBtn: false,
props: {
label: 'fieldType',
value: 'fieldType'
}
}
};
},
computed: {
...mapGetters(["permission"]),
permissionList() {
return {
addBtn: this.vaildData(this.permission.wf_form_default_values_add, false),
viewBtn: this.vaildData(this.permission.wf_form_default_values_view, false),
delBtn: this.vaildData(this.permission.wf_form_default_values_delete, false),
editBtn: this.vaildData(this.permission.wf_form_default_values_edit, false)
};
},
ids() {
let ids = [];
this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
}
},
mounted() {
this.getListType()
},
methods: {
nodeClick({ fieldType }) {
this.fieldType = fieldType
this.searchChange(this.query)
},
getListType() {
listType().then(res => {
this.treeData = res.data.data
this.treeData.unshift({
fieldType: '全部'
})
})
},
handleCopy(row) {
delete row.id
this.form = this.deepClone(row)
this.$refs.crud.rowAdd()
},
rowSave(row, done, loading) {
add(row).then(() => {
this.getListType()
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
done();
}, () => {
loading();
});
},
rowUpdate(row, index, done, loading) {
update(row).then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
done();
}, error => {
loading();
console.log(error);
});
},
rowDel(row) {
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(row.id);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
});
},
handleDelete() {
if (this.selectionList.length === 0) {
this.$message.warning("请选择至少一条数据");
return;
}
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
return remove(this.ids);
})
.then(() => {
this.onLoad(this.page);
this.$message({
type: "success",
message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
done();
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params, done) {
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
if (done) done();
},
selectionChange(list) {
this.selectionList = list;
},
selectionClear() {
this.selectionList = [];
this.$refs.crud.toggleSelection();
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
refreshChange() {
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
this.loading = true;
if (this.fieldType) {
if (this.fieldType == '全部') delete params.fieldType
else params.fieldType = this.fieldType
}
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.selectionClear();
});
}
}
};
</script>
<style>
</style>

@ -47,6 +47,7 @@
:toolbar="['clear', 'preview', 'import']"
:includeFields="['group', 'dynamic', 'input', 'textarea', 'number', 'map', 'radio','checkbox','select','tree','cascader', 'upload', 'date','time','datetime','daterange','datetimerange','timerange','ueditor','switch','rate','color','icon','slider']"
:customFields="customFields"
:default-values="defaultValues"
:options="options">
<template #toolbar>
<el-button type="text"
@ -70,7 +71,7 @@
</template>
<script>
import { getList, add, update, remove } from "@/api/plugin/workflow/form";
import { getList, add, update, remove, listType } from "@/api/plugin/workflow/form";
import { mapGetters } from "vuex";
export default {
@ -159,6 +160,7 @@ export default {
span: 24,
display: true
}],
defaultValues: {},
copyOption: {
column: [{
label: "表单key",
@ -225,6 +227,9 @@ export default {
return ids.join(",");
}
},
mounted() {
this.getDefaultValues()
},
methods: {
handleSubmit() {
this.$refs.formDesign.getData('string').then(data => {
@ -305,6 +310,11 @@ export default {
handleHistory(row) {
this.$router.push('/workflow/design/form/history/' + row.id)
},
getDefaultValues() {
listType().then(res => {
this.defaultValues = res.data.data
})
},
rowSave(row, loading, done) {
add(row).then(() => {
loading();

@ -0,0 +1,42 @@
import { getUserInfo } from '@/api/system/user'
import { dateFormat } from '@/util/date'
export default {
created() {
this.extendUserInfo()
},
methods: {
dateFormat,
// 扩展用户信息
extendUserInfo() {
const { userInfo } = this.$store.getters
const { dept_name, post_name } = userInfo
if (!dept_name || !post_name) {
getUserInfo().then(res => {
const data = res.data.data
if (data) {
const { deptName, postName } = data
this.$store.commit('SET_USER_INFO', {
...userInfo,
dept_name: deptName,
post_name: postName
})
}
})
}
},
// 获取字段默认值
getDefaultValues(value) {
let defaultValue = ''
if (value.includes('${') && value.includes('}')) {
try {
defaultValue = eval('`' + value + '`')
} catch (err) {
defaultValue = value
}
} else defaultValue = value
return defaultValue
}
}
}

@ -131,7 +131,10 @@ import userSelect from './user-select'
import { mapGetters } from 'vuex'
import Print from '../../util/print'
import defaultValues from '../../mixins/default-values'
export default {
mixins: [defaultValues],
components: { userSelect },
computed: {
...mapGetters(['tag', 'userInfo', 'isCollapse']),
@ -234,7 +237,27 @@ export default {
if (allForm) {
const option = eval('(' + allForm + ')')
option.menuBtn = false
if (status != 'todo') option.detail = true
if (status != 'todo') {
option.detail = true
const { column, group } = option
if (column && column.length > 0) { // column
column.forEach(col => {
if (col.type == 'dynamic') col.children.column.forEach(cc => delete cc.value)
else delete col.value
})
}
if (group && group.length > 0) { // group
group.forEach(gro => {
if (gro.column && gro.column.length > 0) {
gro.column.forEach(col => {
if (col.type == 'dynamic') col.children.column.forEach(cc => delete cc.value)
else delete col.value
})
}
})
}
}
else {
const columnArr = []
const groupArr = []
@ -248,13 +271,16 @@ export default {
if (col.type == 'dynamic') {
col.children.addBtn = false
col.children.delBtn = false
}
else {
} else {
col.readonly = true
col.disabled = true
}
delete col.rules
} else vars.push(col.prop)
delete col.value
} else {
vars.push(col.prop)
if (col.value) col.value = this.getDefaultValues(col.value)
}
if (col.type == 'dynamic') { //
const childrenColumnArr = []
col.children.column.forEach(cc => {
@ -264,7 +290,8 @@ export default {
cc.readonly = true
cc.disabled = true
delete cc.rules
}
delete cc.value
} else if (cc.value) cc.value = this.getDefaultValues(cc.value)
childrenColumnArr.push(cc)
}
})
@ -291,7 +318,11 @@ export default {
col.disabled = true
}
delete col.rules
} else vars.push(col.prop)
delete col.value
} else {
vars.push(col.prop)
if (col.value) col.value = this.getDefaultValues(col.value)
}
if (col.type == 'dynamic') { //
const childrenColumnArr = []
col.children.column.forEach(cc => {
@ -301,7 +332,8 @@ export default {
cc.readonly = true
cc.disabled = true
delete cc.rules
}
delete cc.value
} if (cc.value) cc.value = this.getDefaultValues(cc.value)
childrenColumnArr.push(cc)
}
})
@ -328,6 +360,9 @@ export default {
option.group = groupArr
this.vars = vars
}
for (let key in variables) {
if (!variables[key]) delete variables[key]
}
this.option = option
this.form = variables
@ -371,9 +406,9 @@ export default {
if (v != 'comment' && this.form[v]) variables[v] = this.form[v]
})
const { taskId, processInstanceId, processDefinitionName } = this.process
const { taskId, processInstanceId, processDefinitionName, processDefinitionId } = this.process
const params = {
taskId, processInstanceId, processDefinitionName, pass,
taskId, processInstanceId, processDefinitionName, processDefinitionId, pass,
comment, copyUser, assignee, variables
}

@ -16,7 +16,10 @@
import { getFormByProcessId, startProcess } from '@/api/plugin/workflow/process'
import { mapGetters } from 'vuex'
import defaultValues from '../../mixins/default-values'
export default {
mixins: [defaultValues],
computed: {
...mapGetters(['tag']),
},
@ -60,13 +63,13 @@ export default {
if (col.type == 'dynamic') {
col.children.addBtn = false
col.children.delBtn = false
}
else {
} else {
col.readonly = true
col.disabled = true
}
delete col.rules
}
delete col.value
} else if (col.value) col.value = this.getDefaultValues(col.value)
if (col.type == 'dynamic') { //
const childrenColumnArr = []
col.children.column.forEach(cc => {
@ -76,7 +79,8 @@ export default {
cc.readonly = true
cc.disabled = true
delete cc.rules
}
delete cc.value
} else if (cc.value) cc.value = this.getDefaultValues(cc.value)
childrenColumnArr.push(cc)
}
})
@ -97,13 +101,13 @@ export default {
if (col.type == 'dynamic') {
col.children.addBtn = false
col.children.delBtn = false
}
else {
} else {
col.readonly = true
col.disabled = true
}
delete col.rules
}
delete col.value
} else if (col.value) col.value = this.getDefaultValues(col.value)
if (col.type == 'dynamic') { //
const childrenColumnArr = []
col.children.column.forEach(cc => {
@ -113,7 +117,8 @@ export default {
cc.readonly = true
cc.disabled = true
delete cc.rules
}
delete cc.value
} else if (cc.value) cc.value = this.getDefaultValues(cc.value)
childrenColumnArr.push(cc)
}
})

Loading…
Cancel
Save