From 6a0d53cdc9d28c1f3241dec6a60328bb8a2f45db Mon Sep 17 00:00:00 2001 From: wanghao7717 <792974788@qq.com> Date: Sun, 7 Apr 2024 11:48:32 +0800 Subject: [PATCH 001/175] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taskman-ui/src/pages/workbench/index.vue | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/taskman-ui/src/pages/workbench/index.vue b/taskman-ui/src/pages/workbench/index.vue index 21580340..b8a3ab39 100644 --- a/taskman-ui/src/pages/workbench/index.vue +++ b/taskman-ui/src/pages/workbench/index.vue @@ -1,7 +1,7 @@ - diff --git a/taskman-ui/src/pages/temp-management/approval-form.vue b/taskman-ui/src/pages/temp-management/approval-form.vue index 4afa81c9..3d29ac2c 100644 --- a/taskman-ui/src/pages/temp-management/approval-form.vue +++ b/taskman-ui/src/pages/temp-management/approval-form.vue @@ -43,6 +43,7 @@ @reloadParentPage="loadPage" @nodeStatus="nodeStatus" @setFormConfigStatus="changeFormConfigStatus" + @dataFormFilterChange="dataFormFilterChange" > @@ -282,6 +292,7 @@ +
@@ -304,12 +315,16 @@ import { saveRequsetForm, getRequestFormTemplateData, getAllDataModels, cleanFil import draggable from 'vuedraggable' import CustomDraggable from './components/custom-draggable.vue' import DataSourceConfig from './data-source-config.vue' +import ComponentLibraryModal from './components/component-library-modal.vue' +import ComponentLibraryList from './components/component-library-list.vue' export default { name: 'form-select', components: { draggable, CustomDraggable, - DataSourceConfig + DataSourceConfig, + ComponentLibraryModal, + ComponentLibraryList }, data () { return { @@ -357,15 +372,24 @@ export default { controlSwitch: 'no' // 控制审批/任务(下拉类型才有) }, allEntityList: [], - formId: '' // 缓存表单id，供编辑使用 + formId: '', // 缓存表单id，供编辑使用 + componentVisible: false } }, props: ['isCheck'], computed: { + // 数据集回显 getDataOptionsDisplay () { const options = JSON.parse(this.editElement.dataOptions || '[]') const labelArr = options.map(item => item.label) return labelArr.join(',') + }, + // 新增组件库按钮禁用 + getAddComponentDisabled () { + return function (val) { + const checkedList = val.filter(item => item.checked) || [] + return checkedList.length === 0 + } } }, watch: { @@ -615,7 +639,7 @@ export default { word-wrap: break-word; } .custom-item { - width: calc(100% - 130px); + width: calc(100% - 145px); display: inline-block; } .btn-footer-margin { From f46c2d05af284121b9f7b022668b5b327b0d0f4a Mon Sep 17 00:00:00 2001 From: wanghao7717 <792974788@qq.com> Date: Thu, 9 May 2024 18:41:52 +0800 Subject: [PATCH 081/175] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0commit-messag?= =?UTF-8?q?e-validator?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taskman-ui/package.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/taskman-ui/package.json b/taskman-ui/package.json index 35aae417..935081f1 100644 --- a/taskman-ui/package.json +++ b/taskman-ui/package.json @@ -40,6 +40,7 @@ "bpmn-js-properties-panel": "^0.32.2", "camunda-bpmn-moddle": "^3.0.0", "chalk": "^2.0.1", + "commit-message-validator": "^1.0.2", "compression-webpack-plugin": "^3.0.0", "copy-webpack-plugin": "^4.0.1", "css-loader": "^0.28.11", @@ -85,7 +86,8 @@ ], "husky": { "hooks": { - "pre-commit": "lint-staged" + "pre-commit": "lint-staged", + "commit-msg": "commit-message-validator" } }, "lint-staged": { @@ -94,5 +96,13 @@ "eslint --fix", "git add" ] + }, + "config": { + "commit-message-validator": { + "pattern": [ + "^\\[.+\\](feat|fix|docs|style|refactor|test|perf|chore): .{3,}" + ], + "errorMessage": "Commit message cannot match pattern: ^\\[.+\\](feat|fix|docs|style|refactor|test|perf|chore): .{3,}" + } } } From e3d477a197b5a6520730fcdb4ec8b266aa1c9b3b Mon Sep 17 00:00:00 2001 From: tangjiawei Date: Fri, 10 May 2024 11:03:52 +0800 Subject: [PATCH 082/175] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=9D=A1=E4=BB=B6=E9=9C=80=E6=B1=82=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/form_template_library_dao.go | 2 +- taskman-server/models/form_item_template.go | 96 +++++++++++-------- .../models/form_template_library.go | 1 - .../service/form_template_library_service.go | 6 +- .../service/task_template_service.go | 4 - 5 files changed, 59 insertions(+), 50 deletions(-) diff --git a/taskman-server/dao/form_template_library_dao.go b/taskman-server/dao/form_template_library_dao.go index 4cc93d9b..d3bd72f4 100644 --- a/taskman-server/dao/form_template_library_dao.go +++ b/taskman-server/dao/form_template_library_dao.go @@ -84,7 +84,7 @@ func (d *FormTemplateLibraryDao) QueryListByCondition(condition models.QueryForm params = append(params, condition.CreatedBy) } if condition.Name != "" { - sql = sql + " and like '%" + condition.Name + "%'" + sql = sql + " and name like '%" + condition.Name + "%'" } pageInfo.StartIndex = condition.StartIndex pageInfo.PageSize = condition.PageSize diff --git a/taskman-server/models/form_item_template.go b/taskman-server/models/form_item_template.go index 524e8eb7..19b43f2c 100644 --- a/taskman-server/models/form_item_template.go +++ b/taskman-server/models/form_item_template.go @@ -1,5 +1,10 @@ package models +import ( + "encoding/json" + "strings" +) + type FormItemTemplateTable struct { Id string `json:"id" xorm:"'id' pk" primary-key:"id"` Name string `json:"name" xorm:"name"` @@ -33,50 +38,50 @@ type FormItemTemplateTable struct { RoutineExpression string `json:"routineExpression" xorm:"routine_expression"` // 计算表达式 ControlSwitch string `json:"controlSwitch" xorm:"control_switch"` // 控制审批/任务开关 FormItemLibrary *string `json:"formItemLibrary" xorm:"form_item_library"` // 表单项组件库 - hiddenCondition string `json:"hiddenCondition" xorm:"hidden_condition"` // 隐藏条件 + HiddenCondition string `json:"hiddenCondition" xorm:"hidden_condition"` // 隐藏条件 SelectList []*EntityDataObj `json:"selectList" xorm:"-"` Active bool `json:"active" xorm:"-"` // 是否选中状态 } type FormItemTemplateDto struct { - Id string `json:"id"` - Name string `json:"name"` - Description string `json:"description"` - FormTemplate string `json:"itemGroupId"` - ItemGroup string `json:"itemGroup"` - ItemGroupType string `json:"itemGroupType"` //表单组类型:workflow 编排数据,optional 自选,custom 自定义 - ItemGroupName string `json:"itemGroupName"` - ItemGroupSort int `json:"ItemGroupSort"` // item_group 排序 - ItemGroupRule string `json:"itemGroupRule"` // item_group_rule 新增一行规则,new 输入新数据,exist 选择已有数据 - DefaultValue string `json:"defaultValue"` - Sort int `json:"sort"` - PackageName string `json:"packageName"` - Entity string `json:"entity"` - AttrDefId string `json:"attrDefId"` - AttrDefName string `json:"attrDefName"` - AttrDefDataType string `json:"attrDefDataType"` - ElementType string `json:"elementType"` - Title string `json:"title"` - Width int `json:"width"` - RefPackageName string `json:"refPackageName"` - RefEntity string `json:"refEntity"` - DataOptions string `json:"dataOptions"` - Required string `json:"required"` - Regular string `json:"regular"` - IsEdit string `json:"isEdit"` - IsView string `json:"isView"` - IsOutput string `json:"isOutput"` - InDisplayName string `json:"inDisplayName"` - IsRefInside string `json:"isRefInside"` - Multiple string `json:"multiple"` - DefaultClear string `json:"defaultClear"` - RefId string `json:"copyId"` // 复制数据表单ID,数据表单删除该表单项时,需要删除审批表单,任务表单对应数据项 - RoutineExpression string `json:"routineExpression"` // 计算表达式 - ControlSwitch string `json:"controlSwitch"` // 控制审批/任务开关 - hiddenCondition string `json:"hiddenCondition"` // 隐藏条件 - FormItemLibrary *string `json:"formItemLibrary"` // 表单项组件库 - SelectList []*EntityDataObj `json:"selectList"` - Active bool `json:"active"` // 是否选中状态 + Id string `json:"id"` + Name string `json:"name"` + Description string `json:"description"` + FormTemplate string `json:"itemGroupId"` + ItemGroup string `json:"itemGroup"` + ItemGroupType string `json:"itemGroupType"` //表单组类型:workflow 编排数据,optional 自选,custom 自定义 + ItemGroupName string `json:"itemGroupName"` + ItemGroupSort int `json:"ItemGroupSort"` // item_group 排序 + ItemGroupRule string `json:"itemGroupRule"` // item_group_rule 新增一行规则,new 输入新数据,exist 选择已有数据 + DefaultValue string `json:"defaultValue"` + Sort int `json:"sort"` + PackageName string `json:"packageName"` + Entity string `json:"entity"` + AttrDefId string `json:"attrDefId"` + AttrDefName string `json:"attrDefName"` + AttrDefDataType string `json:"attrDefDataType"` + ElementType string `json:"elementType"` + Title string `json:"title"` + Width int `json:"width"` + RefPackageName string `json:"refPackageName"` + RefEntity string `json:"refEntity"` + DataOptions string `json:"dataOptions"` + Required string `json:"required"` + Regular string `json:"regular"` + IsEdit string `json:"isEdit"` + IsView string `json:"isView"` + IsOutput string `json:"isOutput"` + InDisplayName string `json:"inDisplayName"` + IsRefInside string `json:"isRefInside"` + Multiple string `json:"multiple"` + DefaultClear string `json:"defaultClear"` + RefId string `json:"copyId"` // 复制数据表单ID,数据表单删除该表单项时,需要删除审批表单,任务表单对应数据项 + RoutineExpression string `json:"routineExpression"` // 计算表达式 + ControlSwitch string `json:"controlSwitch"` // 控制审批/任务开关 + HiddenCondition []*QueryRequestFilterObj `json:"hiddenCondition"` // 隐藏条件 + FormItemLibrary *string `json:"formItemLibrary"` // 表单项组件库 + SelectList []*EntityDataObj `json:"selectList"` + Active bool `json:"active"` // 是否选中状态 } func (FormItemTemplateTable) TableName() string { @@ -114,6 +119,13 @@ func (s FormItemTemplateDtoSort) Less(i, j int) bool { } func ConvertFormItemTemplateDto2Model(dto *FormItemTemplateDto) *FormItemTemplateTable { + var hiddenCondition string + if len(dto.HiddenCondition) > 0 { + byteArr, _ := json.Marshal(dto.HiddenCondition) + if len(byteArr) > 0 { + hiddenCondition = string(byteArr) + } + } return &FormItemTemplateTable{ Id: dto.Id, Name: dto.Name, @@ -147,7 +159,7 @@ func ConvertFormItemTemplateDto2Model(dto *FormItemTemplateDto) *FormItemTemplat RoutineExpression: dto.RoutineExpression, ControlSwitch: dto.ControlSwitch, FormItemLibrary: dto.FormItemLibrary, - hiddenCondition: dto.hiddenCondition, + HiddenCondition: hiddenCondition, SelectList: dto.SelectList, Active: dto.Active, } @@ -187,7 +199,6 @@ func ConvertFormItemTemplateModel2Dto(model *FormItemTemplateTable, itemGroup Fo RefId: model.RefId, RoutineExpression: model.RoutineExpression, ControlSwitch: model.ControlSwitch, - hiddenCondition: model.hiddenCondition, FormItemLibrary: model.FormItemLibrary, SelectList: model.SelectList, Active: model.Active, @@ -195,6 +206,9 @@ func ConvertFormItemTemplateModel2Dto(model *FormItemTemplateTable, itemGroup Fo dto.ItemGroupType = itemGroup.ItemGroupType dto.ItemGroupRule = itemGroup.ItemGroupRule dto.ItemGroupSort = itemGroup.ItemGroupSort + if strings.TrimSpace(model.HiddenCondition) != "" { + json.Unmarshal([]byte(model.HiddenCondition), &dto.HiddenCondition) + } return dto } diff --git a/taskman-server/models/form_template_library.go b/taskman-server/models/form_template_library.go index 05784e95..a8988a85 100644 --- a/taskman-server/models/form_template_library.go +++ b/taskman-server/models/form_template_library.go @@ -7,7 +7,6 @@ type FormTemplateLibraryTable struct { CreatedTime string `json:"createdTime" xorm:"created_time"` UpdatedTime string `json:"updatedTime" xorm:"updated_time"` CreatedBy string `json:"createdBy" xorm:"created_by"` // 创建人 - UpdatedBy string `json:"updatedBy" xorm:"updated_by"` // 更新人 DelFlag int `json:"delFlag" xorm:"del_flag"` } diff --git a/taskman-server/service/form_template_library_service.go b/taskman-server/service/form_template_library_service.go index af8e155a..bb77aa23 100644 --- a/taskman-server/service/form_template_library_service.go +++ b/taskman-server/service/form_template_library_service.go @@ -55,7 +55,6 @@ func (s *FormTemplateLibraryService) AddFormTemplateLibrary(param models.FormTem CreatedTime: now, UpdatedTime: now, CreatedBy: user, - UpdatedBy: user, } // 添加表单组件库 if _, err = s.formTemplateLibraryDao.Add(session, formTemplateLibrary); err != nil { @@ -64,6 +63,7 @@ func (s *FormTemplateLibraryService) AddFormTemplateLibrary(param models.FormTem // 添加表单项组件库 if len(param.Items) > 0 { for _, item := range param.Items { + item.Id = guid.CreateGuid() item.FormTemplateLibrary = formTemplateLibraryId if _, err = s.formItemTemplateLibraryDao.Add(session, item); err != nil { return err @@ -119,7 +119,7 @@ func (s *FormTemplateLibraryService) QueryFormTemplateLibrary(param models.Query } if len(formItemTemplateLibraryList) > 0 { for _, item := range formItemTemplateLibraryList { - items = append(items, item.Name) + items = append(items, item.Title) } } list = append(list, &models.FormTemplateLibraryDto{ @@ -128,7 +128,7 @@ func (s *FormTemplateLibraryService) QueryFormTemplateLibrary(param models.Query FormType: formTemplateLibrary.FormType, CreatedTime: formTemplateLibrary.CreatedTime, CreatedBy: formTemplateLibrary.CreatedBy, - FormItems: strings.Join(items, ","), + FormItems: strings.Join(items, "、"), }) } } diff --git a/taskman-server/service/task_template_service.go b/taskman-server/service/task_template_service.go index 8a354b1c..91e0cb25 100644 --- a/taskman-server/service/task_template_service.go +++ b/taskman-server/service/task_template_service.go @@ -338,8 +338,6 @@ func (s *TaskTemplateService) UpdateTaskTemplate(param *models.TaskTemplateDto, return nil, err2 } taskHandleTemplate.AssignRule = string(byteArr) - } else { - taskHandleTemplate.AssignRule = "" } if len(param.HandleTemplates[i].FilterRule) > 0 { byteArr, err2 := json.Marshal(param.HandleTemplates[i].FilterRule) @@ -347,8 +345,6 @@ func (s *TaskTemplateService) UpdateTaskTemplate(param *models.TaskTemplateDto, return nil, err2 } taskHandleTemplate.FilterRule = string(byteArr) - } else { - taskHandleTemplate.FilterRule = "" } updateTaskTemplate := taskHandleTemplate updateTaskHandleTemplates = append(updateTaskHandleTemplates, updateTaskTemplate) From b1eda86a881eace8cb4a0f8e3ab61eea1174df7d Mon Sep 17 00:00:00 2001 From: tangjiawei Date: Fri, 10 May 2024 12:01:48 +0800 Subject: [PATCH 083/175] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=BA=93=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E6=96=87=E6=A1=88=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taskman-server/api/v1/form/form_template_library.go | 9 +++++++-- taskman-server/common/exterror/error.go | 4 ++++ taskman-server/conf/i18n/en.json | 8 ++++++++ taskman-server/conf/i18n/zh-cn.json | 8 ++++++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/taskman-server/api/v1/form/form_template_library.go b/taskman-server/api/v1/form/form_template_library.go index 27e68710..88eafe1d 100644 --- a/taskman-server/api/v1/form/form_template_library.go +++ b/taskman-server/api/v1/form/form_template_library.go @@ -2,6 +2,7 @@ package form import ( "fmt" + "github.com/WeBankPartners/wecube-plugins-taskman/taskman-server/common/exterror" "strings" "github.com/WeBankPartners/wecube-plugins-taskman/taskman-server/api/middleware" @@ -29,7 +30,7 @@ func AddFormTemplateLibrary(c *gin.Context) { return } if nameRepeat { - middleware.ReturnServerHandleError(c, fmt.Errorf("name %s repeat", param.Name)) + middleware.ReturnError(c, exterror.New().FormTemplateLibraryAddNameRepeatError) return } if err = service.GetFormTemplateLibraryService().AddFormTemplateLibrary(param, middleware.GetRequestUser(c)); err != nil { @@ -51,9 +52,13 @@ func DeleteFormTemplateLibrary(c *gin.Context) { middleware.ReturnServerHandleError(c, err) return } + if formTemplateLibraryTable == nil { + middleware.ReturnParamValidateError(c, fmt.Errorf("id is invalid")) + return + } // 只有表单库创建用户才有该条记录删除权限 if formTemplateLibraryTable.CreatedBy != middleware.GetRequestUser(c) { - middleware.ReturnServerHandleError(c, fmt.Errorf("no deletion permission")) + middleware.ReturnError(c, exterror.New().FormTemplateLibraryDeletePermissionError) return } diff --git a/taskman-server/common/exterror/error.go b/taskman-server/common/exterror/error.go index 5d50368d..391c4504 100644 --- a/taskman-server/common/exterror/error.go +++ b/taskman-server/common/exterror/error.go @@ -103,6 +103,10 @@ type ErrorTemplate struct { RequestHandleError CustomError `json:"request_handle_error"` // 模版组已经被使用,不允许删除 TemplateGroupHasUseDeleteError CustomError `json:"template_group_has_use_delete_error"` + // 表单模版组件库删除失败 + FormTemplateLibraryDeletePermissionError CustomError `json:"form_template_library_delete_permission_error"` + // 表单模版组件库添加失败 + FormTemplateLibraryAddNameRepeatError CustomError `json:"form_template_library_add_name_repeat_error"` } var ( diff --git a/taskman-server/conf/i18n/en.json b/taskman-server/conf/i18n/en.json index a218bb12..5c08cf64 100644 --- a/taskman-server/conf/i18n/en.json +++ b/taskman-server/conf/i18n/en.json @@ -151,5 +151,13 @@ "template_group_has_use_delete_error": { "code": 20100029, "message": "Delete failed: The current template group already has a template. Please migrate the template to another template group before deleting it" + }, + "form_template_library_delete_permission_error": { + "code": 20100030, + "message": "Delete failed: Only form components created by oneself are allowed to be deleted" + }, + "form_template_library_add_name_repeat_error": { + "code": 20100031, + "message": "Creation failed: The form component name already exists. Please modify it and try again" } } \ No newline at end of file diff --git a/taskman-server/conf/i18n/zh-cn.json b/taskman-server/conf/i18n/zh-cn.json index 2ceb8d09..55cb8778 100644 --- a/taskman-server/conf/i18n/zh-cn.json +++ b/taskman-server/conf/i18n/zh-cn.json @@ -151,5 +151,13 @@ "template_group_has_use_delete_error": { "code": 20100029, "message": "删除失败:当前模版组已有模版,请先把模版迁移到其他模版组再删除" + }, + "form_template_library_delete_permission_error": { + "code": 20100030, + "message": "删除失败:只允许删除本人创建的表单组件" + }, + "form_template_library_add_name_repeat_error": { + "code": 20100031, + "message": "创建失败:表单组件名已存在,请修改后重试" } } \ No newline at end of file From 951fae43552b8e8685630cd773cd32db1aad4d79 Mon Sep 17 00:00:00 2001 From: wanghao7717 <792974788@qq.com> Date: Fri, 10 May 2024 14:35:43 +0800 Subject: [PATCH 084/175] =?UTF-8?q?fix:=20=E8=A1=A8=E5=8D=95=E8=BF=87?= =?UTF-8?q?=E6=BB=A4isEdit=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taskman-ui/package.json | 4 +- .../temp-management/approval-form-node.vue | 8 ++-- .../pages/temp-management/approval-form.vue | 45 ++++++++++--------- .../temp-management/request-form-data.vue | 23 +++++----- .../temp-management/request-form-msg.vue | 23 +++++----- .../pages/temp-management/task-form-node.vue | 10 +++-- .../src/pages/temp-management/task-form.vue | 44 ++++++++++-------- 7 files changed, 87 insertions(+), 70 deletions(-) diff --git a/taskman-ui/package.json b/taskman-ui/package.json index 935081f1..54b7b9c8 100644 --- a/taskman-ui/package.json +++ b/taskman-ui/package.json @@ -100,9 +100,9 @@ "config": { "commit-message-validator": { "pattern": [ - "^\\[.+\\](feat|fix|docs|style|refactor|test|perf|chore): .{3,}" + "^(feat|fix|docs|style|refactor|test|perf|chore): .{3,}" ], - "errorMessage": "Commit message cannot match pattern: ^\\[.+\\](feat|fix|docs|style|refactor|test|perf|chore): .{3,}" + "errorMessage": "Commit message cannot match pattern: ^(feat|fix|docs|style|refactor|test|perf|chore): .{3,}" } } } diff --git a/taskman-ui/src/pages/temp-management/approval-form-node.vue b/taskman-ui/src/pages/temp-management/approval-form-node.vue index fc26aa14..625adfcd 100644 --- a/taskman-ui/src/pages/temp-management/approval-form-node.vue +++ b/taskman-ui/src/pages/temp-management/approval-form-node.vue @@ -448,12 +448,13 @@ export default { }) }) const index = this.tableColumns.findIndex(column => column.key === 'action') - if (infoFormColumn.children.length > 0) { - this.tableColumns.splice(index, 0, infoFormColumn) - } if (dataFormColumn.children.length > 0) { this.tableColumns.splice(index, 0, dataFormColumn) } + if (infoFormColumn.children.length > 0) { + this.tableColumns.splice(index, 0, infoFormColumn) + } + this.$emit('dataFormFilterChange') }) }, async getRefOptions (item) { @@ -464,6 +465,7 @@ export default { } // cmdb下发 if (item.elementType === 'select' && item.entity) { + if (!item.refPackageName || !item.refEntity) return const { status, data } = await getWeCmdbOptions(item.refPackageName, item.refEntity, {}) if (status === 'OK') { this.$set(this.filterOptions, item.name, data || []) diff --git a/taskman-ui/src/pages/temp-management/approval-form.vue b/taskman-ui/src/pages/temp-management/approval-form.vue index cb5398c9..9e92fb93 100644 --- a/taskman-ui/src/pages/temp-management/approval-form.vue +++ b/taskman-ui/src/pages/temp-management/approval-form.vue @@ -331,7 +331,7 @@ v-model="editElement.isEdit" true-value="yes" false-value="no" - :disabled="$parent.isCheck === 'Y' || isEditDisabled" + :disabled="$parent.isCheck === 'Y' || editElement.isEditDisabled" @on-change="paramsChanged" size="default" /> @@ -603,8 +603,7 @@ export default { itemGroup: '', // 选中的组信息 nextNodeInfo: {}, // 缓存待切换节点信息 displayLastGroup: false, // 控制group显示，在新增时显示最后一个，其余显示当前值 - nextGroupInfo: {}, - isEditDisabled: true + nextGroupInfo: {} } }, computed: { @@ -639,25 +638,31 @@ export default { this.loadPage() }, methods: { - // 数据表单过滤项有值，需要禁用审批表单"可编辑"属性 + // 数据表单过滤项有值，需要禁用审批表单对应表单项"可编辑"属性 setIsEditDisabled () { - this.isEditDisabled = false - const dataFormFilter = this.$refs.approvalFormNodeRef.filterFormList - const handleTemplates = this.$refs.approvalFormNodeRef.activeApprovalNode.handleTemplates - dataFormFilter.forEach(i => { - if (i.type === 2) { - i.items.forEach(j => { - const key = `${i.itemGroup}-${j.name}` - const hasValue = handleTemplates.some(val => { - return Array.isArray(val.filterRule[key]) ? val.filterRule[key].length > 0 : val.filterRule[key] + if (this.$refs.approvalFormNodeRef.filterFormList && this.$refs.approvalFormNodeRef.filterFormList.length > 0) { + const dataFormObj = this.$refs.approvalFormNodeRef.filterFormList.find(i => i.type === 2) + const handleTemplates = this.$refs.approvalFormNodeRef.activeApprovalNode.handleTemplates + dataFormObj.items.forEach(j => { + const key = `${dataFormObj.itemGroup}-${j.name}` + const hasValue = handleTemplates.some(val => { + return Array.isArray(val.filterRule[key]) ? val.filterRule[key].length > 0 : Boolean(val.filterRule[key]) + }) + // 遍历所有表单组，找到需要禁用的表单项 + this.dataFormInfo.groups.forEach(group => { + group.items.forEach(item => { + const key1 = `${group.itemGroup}-${item.name}` + if (key1 === key && hasValue) { + item.isEdit = 'no' + this.$set(item, 'isEditDisabled', true) + } + if (key1 === key && !hasValue) { + this.$set(item, 'isEditDisabled', false) + } }) - if (j.name === this.editElement.name && hasValue) { - this.editElement.isEdit = 'no' - this.isEditDisabled = true - } }) - } - }) + }) + } }, async removeEmptyDataForm () { await removeEmptyDataForm(this.requestTemplateId) @@ -758,6 +763,7 @@ export default { const { statusCode, data } = await getApprovalNodeGroups(this.requestTemplateId, node.id) if (statusCode === 'OK') { this.dataFormInfo = data + this.setIsEditDisabled() let groups = this.dataFormInfo.groups if (groups.length !== 0) { if (this.displayLastGroup) { @@ -1022,7 +1028,6 @@ export default { }) this.finalElement[itemIndex].attrs[eleIndex].isActive = true this.editElement = this.finalElement[itemIndex].attrs[eleIndex] - this.setIsEditDisabled() if (this.editElement.multiple === 'Y') { this.editElement.multiple = 'yes' } else if (this.editElement.multiple === 'N') { diff --git a/taskman-ui/src/pages/temp-management/request-form-data.vue b/taskman-ui/src/pages/temp-management/request-form-data.vue index fcd12abf..17c5ae2a 100644 --- a/taskman-ui/src/pages/temp-management/request-form-data.vue +++ b/taskman-ui/src/pages/temp-management/request-form-data.vue @@ -231,7 +231,10 @@ true-value="yes" false-value="no" :disabled="$parent.isCheck === 'Y'" - @on-change="paramsChanged" + @on-change=" + controlSwitchChange($event) + paramsChanged() + " size="default" /> @@ -526,16 +529,6 @@ export default { return labelArr.join(',') } }, - watch: { - 'editElement.controlSwitch' (val, oldVal) { - if (val === 'yes') { - this.editElement.required = 'yes' - } - if (val === 'no' && oldVal === 'yes') { - cleanFilterData(this.requestTemplateId, 'data') - } - } - }, mounted () { this.MODALHEIGHT = document.body.scrollHeight - 400 }, @@ -600,6 +593,14 @@ export default { paramsChanged () { this.isParmasChanged = true }, + controlSwitchChange (val) { + // 关闭【控制审批任务】开关，清除数据 + if (val === 'no') { + cleanFilterData(this.requestTemplateId, 'data') + } else if (val === 'yes') { + this.editElement.required = 'yes' + } + }, log (item) { this.finalElement.forEach(l => { l.attrs.forEach(attr => { diff --git a/taskman-ui/src/pages/temp-management/request-form-msg.vue b/taskman-ui/src/pages/temp-management/request-form-msg.vue index 160ac695..534ec24d 100644 --- a/taskman-ui/src/pages/temp-management/request-form-msg.vue +++ b/taskman-ui/src/pages/temp-management/request-form-msg.vue @@ -168,7 +168,10 @@ true-value="yes" false-value="no" :disabled="$parent.isCheck === 'Y'" - @on-change="paramsChanged" + @on-change=" + controlSwitchChange($event) + paramsChanged() + " size="default" /> @@ -368,16 +371,6 @@ export default { return labelArr.join(',') } }, - watch: { - 'editElement.controlSwitch' (val, oldVal) { - if (val === 'yes') { - this.editElement.required = 'yes' - } - if (val === 'no' && oldVal === 'yes') { - cleanFilterData(this.requestTemplateId, 'message') - } - } - }, mounted () { this.MODALHEIGHT = document.body.scrollHeight - 400 }, @@ -474,6 +467,14 @@ export default { paramsChanged () { this.isParmasChanged = true }, + controlSwitchChange (val) { + // 关闭【控制审批任务】开关，清除数据 + if (val === 'no') { + cleanFilterData(this.requestTemplateId, 'data') + } else if (val === 'yes') { + this.editElement.required = 'yes' + } + }, panalStatus () { return this.isParmasChanged }, diff --git a/taskman-ui/src/pages/temp-management/task-form-node.vue b/taskman-ui/src/pages/temp-management/task-form-node.vue index 1deaac31..2ef3183e 100644 --- a/taskman-ui/src/pages/temp-management/task-form-node.vue +++ b/taskman-ui/src/pages/temp-management/task-form-node.vue @@ -444,12 +444,13 @@ export default { }) }) const index = this.tableColumns.findIndex(column => column.key === 'action') - if (infoFormColumn.children.length > 0) { - this.tableColumns.splice(index, 0, infoFormColumn) - } if (dataFormColumn.children.length > 0) { this.tableColumns.splice(index, 0, dataFormColumn) } + if (infoFormColumn.children.length > 0) { + this.tableColumns.splice(index, 0, infoFormColumn) + } + this.$emit('dataFormFilterChange') }) }, async getRefOptions (item) { @@ -460,7 +461,8 @@ export default { } // cmdb下发 if (item.elementType === 'select' && item.entity) { - const { status, data } = await getWeCmdbOptions(item.packageName, item.entity, {}) + if (!item.refPackageName || !item.refEntity) return + const { status, data } = await getWeCmdbOptions(item.refPackageName, item.refEntity, {}) if (status === 'OK') { this.$set(this.filterOptions, item.name, data || []) } diff --git a/taskman-ui/src/pages/temp-management/task-form.vue b/taskman-ui/src/pages/temp-management/task-form.vue index 7d6fddfd..4b9e9ca1 100644 --- a/taskman-ui/src/pages/temp-management/task-form.vue +++ b/taskman-ui/src/pages/temp-management/task-form.vue @@ -342,7 +342,7 @@ v-model="editElement.isEdit" true-value="yes" false-value="no" - :disabled="$parent.isCheck === 'Y' || isEditDisabled" + :disabled="$parent.isCheck === 'Y' || editElement.isEditDisabled" @on-change="paramsChanged" size="default" /> @@ -620,8 +620,7 @@ export default { nextNodeInfo: {}, // 缓存待切换节点信息 displayLastGroup: false, // 控制group显示，在新增时显示最后一个，其余显示当前值 nextGroupInfo: {}, - forkOptions: [], // 判断分支列表 - isEditDisabled: true + forkOptions: [] // 判断分支列表 } }, computed: { @@ -656,25 +655,31 @@ export default { this.loadPage() }, methods: { - // 数据表单过滤项有值，需要禁用审批表单"可编辑"属性 + // 数据表单过滤项有值，需要禁用审批表单对应表单项"可编辑"属性 setIsEditDisabled () { - this.isEditDisabled = false - const dataFormFilter = this.$refs.approvalFormNodeRef.filterFormList - const handleTemplates = this.$refs.approvalFormNodeRef.activeApprovalNode.handleTemplates - dataFormFilter.forEach(i => { - if (i.type === 2) { - i.items.forEach(j => { - const key = `${i.itemGroup}-${j.name}` - const hasValue = handleTemplates.some(val => { - return Array.isArray(val.filterRule[key]) ? val.filterRule[key].length > 0 : val.filterRule[key] + if (this.$refs.approvalFormNodeRef.filterFormList && this.$refs.approvalFormNodeRef.filterFormList.length > 0) { + const dataFormObj = this.$refs.approvalFormNodeRef.filterFormList.find(i => i.type === 2) + const handleTemplates = this.$refs.approvalFormNodeRef.activeApprovalNode.handleTemplates + dataFormObj.items.forEach(j => { + const key = `${dataFormObj.itemGroup}-${j.name}` + const hasValue = handleTemplates.some(val => { + return Array.isArray(val.filterRule[key]) ? val.filterRule[key].length > 0 : Boolean(val.filterRule[key]) + }) + // 遍历所有表单组，找到需要禁用的表单项 + this.dataFormInfo.groups.forEach(group => { + group.items.forEach(item => { + const key1 = `${group.itemGroup}-${item.name}` + if (key1 === key && hasValue) { + item.isEdit = 'no' + this.$set(item, 'isEditDisabled', true) + } + if (key1 === key && !hasValue) { + this.$set(item, 'isEditDisabled', false) + } }) - if (j.name === this.editElement.name && hasValue) { - this.editElement.isEdit = 'no' - this.isEditDisabled = true - } }) - } - }) + }) + } }, async removeEmptyDataForm () { await removeEmptyDataForm(this.requestTemplateId) @@ -796,6 +801,7 @@ export default { const { statusCode, data } = await getApprovalNodeGroups(this.requestTemplateId, node.id) if (statusCode === 'OK') { this.dataFormInfo = data + this.setIsEditDisabled() let groups = this.dataFormInfo.groups if (groups.length !== 0) { if (this.displayLastGroup) { From 75a24d19611eaeff57f14a1fde8f5338dcd49be2 Mon Sep 17 00:00:00 2001 From: wanghao7717 <792974788@qq.com> Date: Fri, 10 May 2024 14:38:47 +0800 Subject: [PATCH 085/175] =?UTF-8?q?feat:=20DB=E6=96=87=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wiki/db/init.sql | 62 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/wiki/db/init.sql b/wiki/db/init.sql index 1cdb3619..4942ccfb 100644 --- a/wiki/db/init.sql +++ b/wiki/db/init.sql @@ -547,6 +547,66 @@ alter table request_template_group DROP FOREIGN KEY fore_template_group_role; #@v1.0.5-end@; #@v1.0.6-begin@; alter table request add column ref_id varchar(64) DEFAULT NULL COMMENT '引用ID'; +alter table request add column ref_type tinyint(2) DEFAULT NULL COMMENT '引用ID类型'; alter table request add index request_ref_id(ref_id); -alter table form_item_template add column filter_rule text DEFAULT NULL COMMENT '下拉框过滤规则'; +alter table form_item_template add column control_switch varchar(16) DEFAULT NULL COMMENT '控制审批/任务开关'; +alter table form_item_template add column form_item_library varchar(64) DEFAULT NULL COMMENT '表单项组件库id'; +alter table form_item_template add column hidden_condition text DEFAULT NULL COMMENT '隐藏条件'; +alter table task_handle add column proc_def_result varchar(255) DEFAULT NULL COMMENT '编排选项结果'; + + +DROP TABLE IF EXISTS `form_template_library`; +CREATE TABLE IF NOT EXISTS `form_template_library` ( + `id` varchar(64) NOT NULL, + `name` varchar(64) NOT NULL, + `form_type` varchar(255) DEFAULT NULL, + `created_by` varchar(255) DEFAULT NULL COMMENT '创建人', + `created_time` datetime DEFAULT NULL COMMENT '创建时间', + `updated_time` datetime DEFAULT NULL COMMENT '更新时间', + `del_flag` tinyint(2) NOT NULL DEFAULT '0', + PRIMARY KEY (`id`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='表单组件库'; + + +DROP TABLE IF EXISTS `form_item_template_library`; +CREATE TABLE IF NOT EXISTS `form_item_template_library` ( + `id` varchar(64) NOT NULL, + `name` varchar(64) NOT NULL, + `description` varchar(255) DEFAULT NULL, + `item_group` varchar(255) DEFAULT NULL, + `item_group_name` varchar(255) DEFAULT NULL, + `default_value` varchar(255) DEFAULT NULL, + `sort` int NOT NULL DEFAULT '0', + `package_name` varchar(255) DEFAULT NULL, + `entity` varchar(255) DEFAULT NULL, + `attr_def_id` varchar(255) DEFAULT NULL, + `attr_def_name` varchar(255) DEFAULT NULL, + `attr_def_data_type` varchar(255) DEFAULT NULL, + `element_type` varchar(64) NOT NULL DEFAULT 'text', + `title` varchar(64) DEFAULT NULL, + `width` int(11) DEFAULT 80, + `ref_package_name` varchar(255) DEFAULT NULL, + `ref_entity` varchar(255) DEFAULT NULL, + `data_options` text, + `required` varchar(16) NOT NULL DEFAULT 'no', + `regular` varchar(255) DEFAULT NULL, + `is_edit` varchar(16) NOT NULL DEFAULT 'yes', + `is_view` varchar(16) NOT NULL DEFAULT 'yes', + `is_output` varchar(16) NOT NULL DEFAULT 'no', + `in_display_name` varchar(16) NOT NULL DEFAULT 'no', + `is_ref_inside` varchar(16) NOT NULL DEFAULT 'no', + `multiple` varchar(16) NOT NULL DEFAULT 'N', + `default_clear` varchar(16) default 'no' not null COMMENT '是否清空', + `ref_id` varchar(64) default null COMMENT '引用ID', + `routine_expression` text default null COMMENT '表单项计算表达式', + `control_switch` varchar(16) DEFAULT NULL COMMENT '控制审批/任务开关', + `hidden_condition` text DEFAULT NULL COMMENT '隐藏条件', + `form_template_library` varchar(64) DEFAULT NULL COMMENT '表单组件库id', + PRIMARY KEY (`id`), + CONSTRAINT `fore_form_item_template_library` FOREIGN KEY (`form_template_library`) REFERENCES `form_template_library` (`id`) +)ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='表单项模版组件库'; + + +ALTER TABLE form_item_template ADD CONSTRAINT `fore_form_item_library` FOREIGN KEY (form_item_library) REFERENCES form_item_template_library(id); + #@v1.0.6-end@; From a9d562b70b4a9205c254dd729b255508e3d9bae8 Mon Sep 17 00:00:00 2001 From: tangjiawei Date: Fri, 10 May 2024 16:53:46 +0800 Subject: [PATCH 086/175] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=BA=93=E6=90=9C?= =?UTF-8?q?=E7=B4=A2formType=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taskman-server/service/form_template_library_service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taskman-server/service/form_template_library_service.go b/taskman-server/service/form_template_library_service.go index bb77aa23..fa89fc5a 100644 --- a/taskman-server/service/form_template_library_service.go +++ b/taskman-server/service/form_template_library_service.go @@ -35,7 +35,7 @@ func (s *FormTemplateLibraryService) QueryAllFormType() (formTypes []string, err } if len(list) > 0 { for _, formTemplateLibrary := range list { - formTypeMap[formTemplateLibrary.Name] = true + formTypeMap[formTemplateLibrary.FormType] = true } for key, _ := range formTypeMap { formTypes = append(formTypes, key) From 5e0f061ab97bb5024e50112b89cf7ffb080801b4 Mon Sep 17 00:00:00 2001 From: tangjiawei Date: Fri, 10 May 2024 19:49:01 +0800 Subject: [PATCH 087/175] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=BA=93=E6=90=9C?= =?UTF-8?q?=E7=B4=A2formType=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taskman-server/models/form_template_library.go | 13 +++++++------ .../service/form_template_library_service.go | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/taskman-server/models/form_template_library.go b/taskman-server/models/form_template_library.go index a8988a85..05d67c14 100644 --- a/taskman-server/models/form_template_library.go +++ b/taskman-server/models/form_template_library.go @@ -15,10 +15,11 @@ func (FormTemplateLibraryTable) TableName() string { } type FormTemplateLibraryDto struct { - Id string `json:"id"` - Name string `json:"name"` - FormType string `json:"formType"` - CreatedTime string `json:"createdTime"` - CreatedBy string `json:"createdBy"` // 创建人 - FormItems string `json:"formItems"` //表单项,逗号隔开 + Id string `json:"id"` + Name string `json:"name"` + FormType string `json:"formType"` + CreatedTime string `json:"createdTime"` + CreatedBy string `json:"createdBy"` // 创建人 + FormItems string `json:"formItems"` //表单项,逗号隔开 + Items []*FormItemTemplateLibraryTable `json:"items"` } diff --git a/taskman-server/service/form_template_library_service.go b/taskman-server/service/form_template_library_service.go index fa89fc5a..24608a60 100644 --- a/taskman-server/service/form_template_library_service.go +++ b/taskman-server/service/form_template_library_service.go @@ -129,6 +129,7 @@ func (s *FormTemplateLibraryService) QueryFormTemplateLibrary(param models.Query CreatedTime: formTemplateLibrary.CreatedTime, CreatedBy: formTemplateLibrary.CreatedBy, FormItems: strings.Join(items, "、"), + Items: formItemTemplateLibraryList, }) } } From 55e312a94ac9438f3cadb2654cfaf39198efb60b Mon Sep 17 00:00:00 2001 From: tangjiawei Date: Sat, 11 May 2024 16:34:46 +0800 Subject: [PATCH 088/175] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=BA=93=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=BF=A1=E6=81=AF=E8=A1=A8=E5=8D=95=E5=92=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A1=A8=E5=8D=95=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taskman-server/dao/form_template_library_dao.go | 7 +++++++ taskman-server/models/const.go | 4 ++++ taskman-server/models/param.go | 1 + 3 files changed, 12 insertions(+) diff --git a/taskman-server/dao/form_template_library_dao.go b/taskman-server/dao/form_template_library_dao.go index d3bd72f4..a863a668 100644 --- a/taskman-server/dao/form_template_library_dao.go +++ b/taskman-server/dao/form_template_library_dao.go @@ -79,6 +79,13 @@ func (d *FormTemplateLibraryDao) QueryListByCondition(condition models.QueryForm sql = sql + " and form_type = ?" params = append(params, condition.FormType) } + if condition.Type == "message" { + sql = sql + " and form_type = ?" + params = append(params, models.DefaultMessageFormItemGroup) + } else if condition.Type == "data" { + sql = sql + " and form_type <> ?" + params = append(params, models.DefaultMessageFormItemGroup) + } if condition.CreatedBy != "" { sql = sql + " and created_by = ?" params = append(params, condition.CreatedBy) diff --git a/taskman-server/models/const.go b/taskman-server/models/const.go index 6f456361..f1a1a9b6 100644 --- a/taskman-server/models/const.go +++ b/taskman-server/models/const.go @@ -199,3 +199,7 @@ const ( TaskExecStatusAutoExitStatus TaskExecStatus = 5 // 自动退出 TaskExecStatusInternallyTerminated TaskExecStatus = 6 // 手动终止 ) + +const ( + DefaultMessageFormItemGroup string = "requestInfo" //默认信息表单 +) diff --git a/taskman-server/models/param.go b/taskman-server/models/param.go index ecb987c7..7e215a0a 100644 --- a/taskman-server/models/param.go +++ b/taskman-server/models/param.go @@ -166,6 +166,7 @@ type FormTemplateLibraryParam struct { type QueryFormTemplateLibraryParam struct { Name string `json:"name"` // 组件库名称 FormType string `json:"formType"` // 表单类型 + Type string `json:"type"` // message 信息表单, data 数据表单全量查询 CreatedBy string `json:"createdBy"` // 创建人 StartIndex int `json:"startIndex"` PageSize int `json:"pageSize"` From a41b4e89e0630817c7c43d3da7d811926c76e720 Mon Sep 17 00:00:00 2001 From: tangjiawei Date: Sat, 11 May 2024 17:33:16 +0800 Subject: [PATCH 089/175] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=BA=93=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8C=89updated=5Ftime=E5=80=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taskman-server/dao/form_template_library_dao.go | 1 + 1 file changed, 1 insertion(+) diff --git a/taskman-server/dao/form_template_library_dao.go b/taskman-server/dao/form_template_library_dao.go index a863a668..f7678680 100644 --- a/taskman-server/dao/form_template_library_dao.go +++ b/taskman-server/dao/form_template_library_dao.go @@ -93,6 +93,7 @@ func (d *FormTemplateLibraryDao) QueryListByCondition(condition models.QueryForm if condition.Name != "" { sql = sql + " and name like '%" + condition.Name + "%'" } + sql = sql + " order by updated_time desc" pageInfo.StartIndex = condition.StartIndex pageInfo.PageSize = condition.PageSize pageInfo.TotalRows = QueryCount(sql, params...) From 98c8140169f6bd9f1635887c6fc2a7a471100d34 Mon Sep 17 00:00:00 2001 From: tangjiawei Date: Mon, 13 May 2024 11:36:39 +0800 Subject: [PATCH 090/175] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=BA=93=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taskman-server/dao/form_template_library_dao.go | 4 ++++ taskman-server/models/form_template_library.go | 1 + taskman-server/models/param.go | 16 +++++++++------- .../service/form_template_library_service.go | 2 ++ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/taskman-server/dao/form_template_library_dao.go b/taskman-server/dao/form_template_library_dao.go index f7678680..7c877197 100644 --- a/taskman-server/dao/form_template_library_dao.go +++ b/taskman-server/dao/form_template_library_dao.go @@ -86,6 +86,10 @@ func (d *FormTemplateLibraryDao) QueryListByCondition(condition models.QueryForm sql = sql + " and form_type <> ?" params = append(params, models.DefaultMessageFormItemGroup) } + if condition.CustomFlag != 0 { + sql = sql + " and custom_flag = ?" + params = append(params, condition.CustomFlag) + } if condition.CreatedBy != "" { sql = sql + " and created_by = ?" params = append(params, condition.CreatedBy) diff --git a/taskman-server/models/form_template_library.go b/taskman-server/models/form_template_library.go index 05d67c14..ffcb4c9a 100644 --- a/taskman-server/models/form_template_library.go +++ b/taskman-server/models/form_template_library.go @@ -4,6 +4,7 @@ type FormTemplateLibraryTable struct { Id string `json:"id" xorm:"'id' pk" primary-key:"id"` Name string `json:"name" xorm:"name"` FormType string `json:"formType" xorm:"form_type"` + CustomFlag int `json:"customFlag" xorm:"custom_flag"` CreatedTime string `json:"createdTime" xorm:"created_time"` UpdatedTime string `json:"updatedTime" xorm:"updated_time"` CreatedBy string `json:"createdBy" xorm:"created_by"` // 创建人 diff --git a/taskman-server/models/param.go b/taskman-server/models/param.go index 7e215a0a..555751cf 100644 --- a/taskman-server/models/param.go +++ b/taskman-server/models/param.go @@ -158,16 +158,18 @@ type CommonParam struct { } type FormTemplateLibraryParam struct { - Name string `json:"name"` - FormType string `json:"formType"` - Items []*FormItemTemplateLibraryTable `json:"items"` + Name string `json:"name"` + CustomFlag int `json:"customFlag"` // 是否是自定义表单类型 + FormType string `json:"formType"` + Items []*FormItemTemplateLibraryTable `json:"items"` } type QueryFormTemplateLibraryParam struct { - Name string `json:"name"` // 组件库名称 - FormType string `json:"formType"` // 表单类型 - Type string `json:"type"` // message 信息表单, data 数据表单全量查询 - CreatedBy string `json:"createdBy"` // 创建人 + Name string `json:"name"` // 组件库名称 + FormType string `json:"formType"` // 表单类型 + Type string `json:"type"` // message 信息表单, data 数据表单全量查询 + CustomFlag int `json:"customFlag"` // 是否是自定义表单类型 + CreatedBy string `json:"createdBy"` // 创建人 StartIndex int `json:"startIndex"` PageSize int `json:"pageSize"` } diff --git a/taskman-server/service/form_template_library_service.go b/taskman-server/service/form_template_library_service.go index 24608a60..9ccef28c 100644 --- a/taskman-server/service/form_template_library_service.go +++ b/taskman-server/service/form_template_library_service.go @@ -52,9 +52,11 @@ func (s *FormTemplateLibraryService) AddFormTemplateLibrary(param models.FormTem Id: formTemplateLibraryId, Name: param.Name, FormType: param.FormType, + CustomFlag: param.CustomFlag, CreatedTime: now, UpdatedTime: now, CreatedBy: user, + DelFlag: 0, } // 添加表单组件库 if _, err = s.formTemplateLibraryDao.Add(session, formTemplateLibrary); err != nil { From be70659491c68a3b9a941d4cc688d0d6d8fe2f91 Mon Sep 17 00:00:00 2001 From: tangjiawei Date: Mon, 13 May 2024 18:50:58 +0800 Subject: [PATCH 091/175] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=BA=93=E5=8E=BB?= =?UTF-8?q?=E6=8E=89custom=5Fflag=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taskman-server/dao/form_template_library_dao.go | 4 ---- taskman-server/models/form_template_library.go | 1 - taskman-server/models/param.go | 16 +++++++--------- .../service/form_template_library_service.go | 2 -- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/taskman-server/dao/form_template_library_dao.go b/taskman-server/dao/form_template_library_dao.go index 7c877197..f7678680 100644 --- a/taskman-server/dao/form_template_library_dao.go +++ b/taskman-server/dao/form_template_library_dao.go @@ -86,10 +86,6 @@ func (d *FormTemplateLibraryDao) QueryListByCondition(condition models.QueryForm sql = sql + " and form_type <> ?" params = append(params, models.DefaultMessageFormItemGroup) } - if condition.CustomFlag != 0 { - sql = sql + " and custom_flag = ?" - params = append(params, condition.CustomFlag) - } if condition.CreatedBy != "" { sql = sql + " and created_by = ?" params = append(params, condition.CreatedBy) diff --git a/taskman-server/models/form_template_library.go b/taskman-server/models/form_template_library.go index ffcb4c9a..05d67c14 100644 --- a/taskman-server/models/form_template_library.go +++ b/taskman-server/models/form_template_library.go @@ -4,7 +4,6 @@ type FormTemplateLibraryTable struct { Id string `json:"id" xorm:"'id' pk" primary-key:"id"` Name string `json:"name" xorm:"name"` FormType string `json:"formType" xorm:"form_type"` - CustomFlag int `json:"customFlag" xorm:"custom_flag"` CreatedTime string `json:"createdTime" xorm:"created_time"` UpdatedTime string `json:"updatedTime" xorm:"updated_time"` CreatedBy string `json:"createdBy" xorm:"created_by"` // 创建人 diff --git a/taskman-server/models/param.go b/taskman-server/models/param.go index 555751cf..7e215a0a 100644 --- a/taskman-server/models/param.go +++ b/taskman-server/models/param.go @@ -158,18 +158,16 @@ type CommonParam struct { } type FormTemplateLibraryParam struct { - Name string `json:"name"` - CustomFlag int `json:"customFlag"` // 是否是自定义表单类型 - FormType string `json:"formType"` - Items []*FormItemTemplateLibraryTable `json:"items"` + Name string `json:"name"` + FormType string `json:"formType"` + Items []*FormItemTemplateLibraryTable `json:"items"` } type QueryFormTemplateLibraryParam struct { - Name string `json:"name"` // 组件库名称 - FormType string `json:"formType"` // 表单类型 - Type string `json:"type"` // message 信息表单, data 数据表单全量查询 - CustomFlag int `json:"customFlag"` // 是否是自定义表单类型 - CreatedBy string `json:"createdBy"` // 创建人 + Name string `json:"name"` // 组件库名称 + FormType string `json:"formType"` // 表单类型 + Type string `json:"type"` // message 信息表单, data 数据表单全量查询 + CreatedBy string `json:"createdBy"` // 创建人 StartIndex int `json:"startIndex"` PageSize int `json:"pageSize"` } diff --git a/taskman-server/service/form_template_library_service.go b/taskman-server/service/form_template_library_service.go index 9ccef28c..24608a60 100644 --- a/taskman-server/service/form_template_library_service.go +++ b/taskman-server/service/form_template_library_service.go @@ -52,11 +52,9 @@ func (s *FormTemplateLibraryService) AddFormTemplateLibrary(param models.FormTem Id: formTemplateLibraryId, Name: param.Name, FormType: param.FormType, - CustomFlag: param.CustomFlag, CreatedTime: now, UpdatedTime: now, CreatedBy: user, - DelFlag: 0, } // 添加表单组件库 if _, err = s.formTemplateLibraryDao.Add(session, formTemplateLibrary); err != nil { From 049cf39bf4162db11d609a06e85bcdd21a635f37 Mon Sep 17 00:00:00 2001 From: wanghao7717 <792974788@qq.com> Date: Tue, 14 May 2024 17:51:38 +0800 Subject: [PATCH 092/175] =?UTF-8?q?feat:=20=E7=BB=84=E4=BB=B6=E5=BA=93?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83=EF=BC=8C=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taskman-ui/src/api/server.js | 8 + taskman-ui/src/locale/i18n/zh-CN.json | 3 +- .../src/pages/components/scroll-tag.vue | 10 +- .../pages/temp-management/approval-form.vue | 774 +++++++++-------- .../components/component-library-list.vue | 212 ++++- .../components/component-library-modal.vue | 243 +++++- .../src/pages/temp-management/index.vue | 47 +- .../temp-management/request-form-data.vue | 307 ++++--- .../temp-management/request-form-msg.vue | 128 ++- .../pages/temp-management/request-form.vue | 6 +- .../src/pages/temp-management/task-form.vue | 791 ++++++++++-------- taskman-ui/src/pages/util/index.js | 45 + 12 files changed, 1697 insertions(+), 877 deletions(-) diff --git a/taskman-ui/src/api/server.js b/taskman-ui/src/api/server.js index 925ad52e..7146819a 100755 --- a/taskman-ui/src/api/server.js +++ b/taskman-ui/src/api/server.js @@ -251,3 +251,11 @@ export const getWorkflowForkNode = taskTemplateId => // 表单过滤数据清除(all清除所有，message清除信息表单，data清除数据表单) export const cleanFilterData = (taskTemplateId, type) => req.post(`/taskman/api/v1/request-template/${taskTemplateId}/filter-clean/${type}`) +// 新建组件库 +export const saveTemplateLibrary = data => req.post(`/taskman/api/v1/form-template-library`, data) +// 组件库列表 +export const getTemplateLibraryList = data => req.post(`/taskman/api/v1/form-template-library/query`, data) +// 删除组件库 +export const deleteTemplateLibrary = params => req.delete(`/taskman/api/v1/form-template-library`, params) +// 组件库获取表单类型 +export const getLibraryFormTypeList = () => req.get(`/taskman/api/v1/form-template-library/form-type`) diff --git a/taskman-ui/src/locale/i18n/zh-CN.json b/taskman-ui/src/locale/i18n/zh-CN.json index 1595673f..09353fa9 100755 --- a/taskman-ui/src/locale/i18n/zh-CN.json +++ b/taskman-ui/src/locale/i18n/zh-CN.json @@ -465,5 +465,6 @@ "tw_expire": "到期", "tw_forever": "永久有效", "tw_empty_search": "空值搜索", - "tw_normal_search": "常规搜索" + "tw_normal_search": "常规搜索", + "tw_template_library": "表单项组件库" } diff --git a/taskman-ui/src/pages/components/scroll-tag.vue b/taskman-ui/src/pages/components/scroll-tag.vue index 64e5f7ef..923295e5 100644 --- a/taskman-ui/src/pages/components/scroll-tag.vue +++ b/taskman-ui/src/pages/components/scroll-tag.vue @@ -27,9 +27,12 @@ export default { diff --git a/taskman-ui/src/pages/temp-management/request-form-data.vue b/taskman-ui/src/pages/temp-management/request-form-data.vue index 17c5ae2a..237255cd 100644 --- a/taskman-ui/src/pages/temp-management/request-form-data.vue +++ b/taskman-ui/src/pages/temp-management/request-form-data.vue @@ -1,17 +1,25 @@
@@ -160,7 +171,13 @@ {{ $t('general_attributes') }}
-
+ - + + +
@@ -414,6 +440,9 @@ import RequestFormDataCustom from './request-form-data-custom.vue' import RequestFormDataWorkflow from './request-form-data-workflow.vue' import CustomDraggable from './components/custom-draggable.vue' import DataSourceConfig from './data-source-config.vue' +import ComponentLibraryModal from './components/component-library-modal.vue' +import ComponentLibraryList from './components/component-library-list.vue' +import { uniqueArr, deepClone, findFirstDuplicateIndex } from '@/pages/util' export default { name: 'form-select', components: { @@ -421,7 +450,9 @@ export default { RequestFormDataCustom, RequestFormDataWorkflow, CustomDraggable, - DataSourceConfig + DataSourceConfig, + ComponentLibraryModal, + ComponentLibraryList }, data () { return { @@ -500,7 +531,27 @@ export default { } }, displayLastGroup: false, // 控制group显示，在新增时显示最后一个，其余显示当前值\ - nextGroupInfo: {} + nextGroupInfo: {}, + componentVisible: false, // 组件库弹窗 + componentCheckedList: [], // 当前选中组件库数据 + // 校验编码不能重复 + ruleForm: { + name: [ + { + required: true, + validator: (rule, value, callback) => { + const arr = this.finalElement[0].attrs.map(i => i.name) + const index = findFirstDuplicateIndex(arr) + if (index > -1 && this.finalElement[0].attrs[index].name === this.editElement.name) { + return callback(new Error('编码不能重复')) + } else { + callback() + } + }, + trigger: 'change' + } + ] + } } }, props: ['isCheck'], @@ -523,14 +574,23 @@ export default { return { background: color } } }, + // 数据集回显 getDataOptionsDisplay () { const options = JSON.parse(this.editElement.dataOptions || '[]') const labelArr = options.map(item => item.label) return labelArr.join(',') + }, + // 新增组件库按钮禁用 + getAddComponentDisabled () { + return function (val) { + const checkedList = val.filter(item => item.checked) || [] + return checkedList.length === 0 + } } }, mounted () { - this.MODALHEIGHT = document.body.scrollHeight - 400 + const clientHeight = document.documentElement.clientHeight + this.MODALHEIGHT = clientHeight - this.$refs.maxheight.getBoundingClientRect().top - 90 }, methods: { async loadPage (requestTemplateId) { @@ -558,6 +618,7 @@ export default { } } } + // 获取模型数据项下拉值 this.getAllDataModels() }, // 放弃编辑，重新加载group @@ -576,7 +637,6 @@ export default { newItem.title = newItem.title + itemNo newItem.name = newItem.name + itemNo newItem.isActive = true - this.specialId = newItem.id this.paramsChanged() this.finalElement[0].attrs.forEach(item => { item.isActive = false @@ -601,12 +661,50 @@ export default { this.editElement.required = 'yes' } }, - log (item) { + log () { this.finalElement.forEach(l => { + // 从组件库拖拽进来的表单组，数据需要额外处理 + const cloneAttrs = deepClone(l.attrs || []) + var deleteIdx = '' + l.attrs.forEach((attr, idx) => { + for (let key of Object.keys(attr)) { + if (!isNaN(Number(key))) { + deleteIdx = idx + cloneAttrs.push(attr[key]) + } + } + }) + if (typeof deleteIdx === 'number') { + cloneAttrs.splice(deleteIdx, 1) + } + l.attrs = cloneAttrs + // 组件库拖拽有重复元素，给出提示，并过滤数据 + const { arr, sameArr } = uniqueArr(deepClone(l.attrs)) + l.attrs = arr + const titleArr = sameArr.map(i => i.title) || [] + const message = titleArr.join(',') + if (message) { + this.$Notice.warning({ + title: this.$t('warning'), + render: h => { + return ( + + 表单已有表单项{message},已过滤 + + ) + } + }) + } else { + this.$Notice.success({ + title: this.$t('successful'), + desc: this.$t('successful') + }) + } + // 处理拖拽进来的表单项 l.attrs.forEach(attr => { attr.itemGroup = l.itemGroup attr.itemGroupName = l.itemGroupName - if (attr.id === this.specialId) { + if (attr.isActive) { this.editElement = attr if (this.editElement.multiple === 'Y') { this.editElement.multiple = 'yes' @@ -817,7 +915,7 @@ export default { this.$refs.requestFormDataWorkflowRef.loadPage(params) } }, - // 获取wecmdb下拉类型entity值 + // 获取模型数据项下拉值 async getAllDataModels () { const { data, statusCode } = await getAllDataModels() if (statusCode === 'OK') { @@ -853,6 +951,7 @@ export default { this.editElement.multiple = 'no' } this.openPanel = '1' + this.$refs.attrForm.validateField('name') }, // 删除自定义表单项 removeForm (itemIndex, eleIndex, element) { @@ -990,6 +1089,12 @@ export default { } else if (element.elementType === 'wecmdbEntity') { } return res + }, + // 新增组件库 + createComponentLibrary () { + this.componentVisible = true + this.componentCheckedList = this.finalElement[0].attrs.filter(i => i.checked === true) + this.$refs.library.init() } } } @@ -1042,7 +1147,9 @@ fieldset[disabled] .ivu-input { margin-bottom: 16px; } .list-group-item- { - display: inline-block; + display: flex; + align-items: center; + justify-content: space-around; margin: 8px 0; } .title { @@ -1067,13 +1174,13 @@ fieldset[disabled] .ivu-input { } } .custom-title { - width: 80px; + width: 125px; display: inline-block; - text-align: right; + text-align: left; word-wrap: break-word; } .custom-item { - width: calc(100% - 130px); + width: calc(100% - 190px); display: inline-block; } diff --git a/taskman-ui/src/pages/temp-management/request-form-msg.vue b/taskman-ui/src/pages/temp-management/request-form-msg.vue index 16b33140..9dfb3250 100644 --- a/taskman-ui/src/pages/temp-management/request-form-msg.vue +++ b/taskman-ui/src/pages/temp-management/request-form-msg.vue @@ -1,19 +1,19 @@ @@ -113,7 +114,13 @@ {{ $t('general_attributes') }}
- + - + - + +
@@ -320,6 +334,7 @@ import CustomDraggable from './components/custom-draggable.vue' import DataSourceConfig from './data-source-config.vue' import ComponentLibraryModal from './components/component-library-modal.vue' import ComponentLibraryList from './components/component-library-list.vue' +import { uniqueArr, deepClone, findFirstDuplicateIndex } from '@/pages/util' export default { name: 'form-select', components: { @@ -376,7 +391,26 @@ export default { }, allEntityList: [], formId: '', // 缓存表单id，供编辑使用 - componentVisible: false + componentVisible: false, // 组件库弹窗 + componentCheckedList: [], // 当前选中组件库数据 + // 校验编码不能重复 + ruleForm: { + name: [ + { + required: true, + validator: (rule, value, callback) => { + const arr = this.finalElement[0].attrs.map(i => i.name) + const index = findFirstDuplicateIndex(arr) + if (index > -1 && this.finalElement[0].attrs[index].name === this.editElement.name) { + return callback(new Error('编码不能重复')) + } else { + callback() + } + }, + trigger: 'change' + } + ] + } } }, props: ['isCheck'], @@ -396,7 +430,8 @@ export default { } }, mounted () { - this.MODALHEIGHT = document.body.scrollHeight - 400 + const clientHeight = document.documentElement.clientHeight + this.MODALHEIGHT = clientHeight - this.$refs.maxheight.getBoundingClientRect().top - 90 }, methods: { async loadPage (requestTemplateId) { @@ -416,6 +451,7 @@ export default { ] } } + // 获取模型数据项下拉值 this.getAllDataModels() }, // 保存表单信息 @@ -477,6 +513,7 @@ export default { this.finalElement[itemIndex].attrs[eleIndex].isActive = true this.editElement = this.finalElement[itemIndex].attrs[eleIndex] this.openPanel = '1' + this.$refs.attrForm.validateField('name') }, removeForm (itemIndex, eleIndex, element) { this.finalElement[itemIndex].attrs.splice(eleIndex, 1) @@ -529,7 +566,6 @@ export default { newItem.title = newItem.title + itemNo newItem.name = newItem.name + itemNo newItem.isActive = true - this.specialId = newItem.id this.paramsChanged() this.finalElement[0].attrs.forEach(item => { item.isActive = false @@ -543,19 +579,57 @@ export default { } return result }, - log (item) { + log () { this.finalElement.forEach(l => { + // 从组件库拖拽进来的表单组，数据需要额外处理 + const cloneAttrs = deepClone(l.attrs || []) + var deleteIdx = '' + l.attrs.forEach((attr, idx) => { + for (let key of Object.keys(attr)) { + if (!isNaN(Number(key))) { + deleteIdx = idx + cloneAttrs.push(attr[key]) + } + } + }) + if (typeof deleteIdx === 'number') { + cloneAttrs.splice(deleteIdx, 1) + } + l.attrs = cloneAttrs + // 组件库拖拽有重复元素，给出提示，并过滤数据 + const { arr, sameArr } = uniqueArr(deepClone(l.attrs)) + l.attrs = arr + const titleArr = sameArr.map(i => i.title) || [] + const message = titleArr.join(',') + if (message) { + this.$Notice.warning({ + title: this.$t('warning'), + render: h => { + return ( + + 表单已有表单项{message},已过滤 + + ) + } + }) + } else { + this.$Notice.success({ + title: this.$t('successful'), + desc: this.$t('successful') + }) + } + // 处理拖拽进来的表单项 l.attrs.forEach(attr => { attr.itemGroup = l.itemGroup attr.itemGroupName = l.itemGroupName - if (attr.id === this.specialId) { + if (attr.isActive) { this.editElement = attr this.openPanel = '1' } }) }) }, - // 获取wecmdb下拉类型entity值 + // 获取模型数据项下拉值 async getAllDataModels () { const { data, statusCode } = await getAllDataModels() if (statusCode === 'OK') { @@ -597,6 +671,12 @@ export default { } else if (element.elementType === 'wecmdbEntity') { } return res + }, + // 新增组件库 + createComponentLibrary () { + this.componentVisible = true + this.componentCheckedList = this.finalElement[0].attrs.filter(i => i.checked === true) + this.$refs.library.init() } } } @@ -609,7 +689,9 @@ export default { margin-bottom: 16px; } .list-group-item- { - display: inline-block; + display: flex; + align-items: center; + justify-content: space-around; margin: 8px 0; } .title { @@ -634,13 +716,13 @@ export default { } } .custom-title { - width: 80px; + width: 125px; display: inline-block; - text-align: right; + text-align: left; word-wrap: break-word; } .custom-item { - width: calc(100% - 145px); + width: calc(100% - 190px); display: inline-block; } .btn-footer-margin { diff --git a/taskman-ui/src/pages/temp-management/request-form.vue b/taskman-ui/src/pages/temp-management/request-form.vue index 4b3de449..354418d2 100644 --- a/taskman-ui/src/pages/temp-management/request-form.vue +++ b/taskman-ui/src/pages/temp-management/request-form.vue @@ -1,7 +1,7 @@ @@ -457,6 +458,9 @@ export default { }) }, methods: { + clearHiddenValue (key) { + this.form.customForm.value[key] = '' + }, handleRefTypeChange () { this.form.refId = '' this.$refs.refSelect.query = '' @@ -783,6 +787,10 @@ export default { v.id = '' v.entityData._id = '' } + // 删除表单隐藏属性 + for (const key in v.entityData) { + delete v.entityData[key + 'Hidden'] + } }) } return item diff --git a/taskman-ui/src/pages/workbench/components/base-handle.vue b/taskman-ui/src/pages/workbench/components/base-handle.vue index 67481a27..2bd1f6cb 100644 --- a/taskman-ui/src/pages/workbench/components/base-handle.vue +++ b/taskman-ui/src/pages/workbench/components/base-handle.vue @@ -387,6 +387,10 @@ export default { refKeys.forEach(ref => { delete v.entityData[ref + 'Options'] }) + // 删除表单隐藏属性 + for (const key in v.entityData) { + delete v.entityData[key + 'Hidden'] + } }) } return item diff --git a/taskman-ui/src/pages/workbench/components/custom-form.vue b/taskman-ui/src/pages/workbench/components/custom-form.vue index fd2be349..09f1b449 100644 --- a/taskman-ui/src/pages/workbench/components/custom-form.vue +++ b/taskman-ui/src/pages/workbench/components/custom-form.vue @@ -1,9 +1,10 @@ + diff --git a/taskman-ui/src/router.js b/taskman-ui/src/router.js index c65eafe4..0b8bd4e8 100755 --- a/taskman-ui/src/router.js +++ b/taskman-ui/src/router.js @@ -37,7 +37,7 @@ export default new Router({ path: '/taskman/requestAudit', name: '/taskman/requestAudit', component: () => import('@/pages/workbench/request-audit.vue'), - meta: { en: 'Request Audit', zh: '请求审计' } + meta: { en: 'Request Report', zh: '请求报表' } }, // 工作台 { From 9aeb9f496db76fd70326ccbe51a7c7ca6d334212 Mon Sep 17 00:00:00 2001 From: zgyzgyhero <894526647@qq.com> Date: Thu, 6 Jun 2024 14:36:57 +0800 Subject: [PATCH 165/175] update task approve callback proc --- taskman-server/service/task_service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taskman-server/service/task_service.go b/taskman-server/service/task_service.go index f7812456..72b47dde 100644 --- a/taskman-server/service/task_service.go +++ b/taskman-server/service/task_service.go @@ -482,7 +482,7 @@ func callbackWorkflow(requestBytes []byte, callbackUrl, userToken string) (err e } func getApproveCallbackParamNew(taskId string) (result models.PluginTaskCreateResp, callbackUrl string, err error) { - result = models.PluginTaskCreateResp{ResultCode: "0"} + result = models.PluginTaskCreateResp{ResultCode: ""} taskObj, tmpErr := getSimpleTask(taskId) if tmpErr != nil { return result, callbackUrl, tmpErr From 323059775898a30fa8376c812290de24bfe3b807 Mon Sep 17 00:00:00 2001 From: wanghao7717 <792974788@qq.com> Date: Thu, 6 Jun 2024 15:45:14 +0800 Subject: [PATCH 166/175] =?UTF-8?q?feat:=20=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taskman-ui/src/locale/i18n/en-US.json | 38 +++++++++++- taskman-ui/src/locale/i18n/zh-CN.json | 36 ++++++++++- .../temp-management/approval-form-node.vue | 6 +- .../pages/temp-management/approval-form.vue | 43 +++++++++++-- .../components/component-library-list.vue | 14 ++++- .../components/component-library-modal.vue | 33 ++++++---- .../components/hidden-condition-modal.vue | 60 ++++++++++++------- .../components/hidden-condition.vue | 33 +++++----- .../temp-management/request-form-data.vue | 49 ++++++++++++--- .../temp-management/request-form-msg.vue | 46 +++++++++++--- .../pages/temp-management/task-form-node.vue | 6 +- .../src/pages/temp-management/task-form.vue | 44 ++++++++++++-- .../workbench/components/base-detail.vue | 2 +- .../workbench/components/base-handle.vue | 4 +- 14 files changed, 324 insertions(+), 90 deletions(-) diff --git a/taskman-ui/src/locale/i18n/en-US.json b/taskman-ui/src/locale/i18n/en-US.json index 600aa392..3dcfcb4b 100755 --- a/taskman-ui/src/locale/i18n/en-US.json +++ b/taskman-ui/src/locale/i18n/en-US.json @@ -313,7 +313,7 @@ "tw_approve": "Approve", "tw_reject": "Reject", "tw_send_back": "Send Back", - "tw_unrelated": "Unrelated", + "tw_unrelated": "No processing required", "tw_comments": "Comments", "tw_approval": "Approval", "tw_date_picker": "DatePicker Select", @@ -475,5 +475,39 @@ "tw_stop": "Stop", "tw_expireTime": "Validity", "tw_data_sourceTips": "Caution: If 【Approval/Task Control】 is enabled or this is a hidden condition, modifying options will affect existing settings.", - "tw_options": "Options" + "tw_options": "Options", + "tw_confirm_delete": "Confirm Delete？", + "tw_form_typeTips": "Please select a form type", + "tw_component_name": "Component name", + "tw_add_component": "Create a new component", + "tw_component_list": "Component list", + "tw_hidden_condition": "Hide condition", + "tw_symbol": "symbol", + "tw_formItem_placeholder": "Please select a form item", + "tw_symbol_placeholder": "Please select a symbol", + "tw_filterValue_placeholder": "Please enter the filtering value", + "tw_symbol_eq": "Equal to", + "tw_symbol_neq": "Not equal to", + "tw_symbol_lt": "Less than", + "tw_symbol_gt": "Greater than", + "tw_symbol_contains": "Contains", + "tw_symbol_startsWith": "Match start", + "tw_symbol_endsWith": "Match ended", + "tw_symbol_containsAll": "Includes all", + "tw_symbol_containsAny": "Contains any", + "tw_symbol_notContains": "Not included", + "tw_symbol_range": "In range", + "tw_symbol_empty": "Is empty", + "tw_symbol_notEmpty": "Not empty", + "tw_required_diableHidden": "Attribute is required and cannot set filtering conditions", + "tw_no_hiddenCondition": "No hidden conditions", + "tw_msgForm_assign": "Information Form (Allocation condition)", + "tw_dataForm_filter": "Data form (Filter condition)", + "tw_codeDuplicate_valid": "Encoding cannot be duplicated", + "tw_formExistItems_pre": "The form already has a form item", + "tw_formExistItems_suf": "Filtered", + "tw_control_approvalAndTask": "Control Approval/Task", + "tw_unRelated_tips": "The user chose not to process and did not submit the form.", + "tw_formDataNotSave_confirm": "Are you sure you want to discard form modifications?", + "tw_formDataNotSave_tips": "Select the [No processing required] type for the operation, and the form modification will not be submitted. Are you sure to discard the modification? (Choose another type for the operation to submit the form normally)" } diff --git a/taskman-ui/src/locale/i18n/zh-CN.json b/taskman-ui/src/locale/i18n/zh-CN.json index 516b42ad..6a1077ad 100755 --- a/taskman-ui/src/locale/i18n/zh-CN.json +++ b/taskman-ui/src/locale/i18n/zh-CN.json @@ -473,5 +473,39 @@ "tw_stop": "暂停中", "tw_expireTime": "有效期", "tw_data_sourceTips": "请谨慎修改可选项:如该表单项已打开“审批/任务控制”开关,或者被其他表单项设置为隐藏条件,修改可选项将影响已有配置.", - "tw_options": "可选项" + "tw_options": "可选项", + "tw_confirm_delete": "确认删除？", + "tw_form_typeTips": "请选择表单类型", + "tw_component_name": "组件名", + "tw_add_component": "新建组件", + "tw_component_list": "组件列表", + "tw_hidden_condition": "隐藏条件", + "tw_symbol": "符号", + "tw_formItem_placeholder": "请选择表单项", + "tw_symbol_placeholder": "请选择符号", + "tw_filterValue_placeholder": "请输入过滤值", + "tw_symbol_eq": "等于", + "tw_symbol_neq": "不等于", + "tw_symbol_lt": "小于", + "tw_symbol_gt": "大于", + "tw_symbol_contains": "包含", + "tw_symbol_startsWith": "匹配开始", + "tw_symbol_endsWith": "匹配结束", + "tw_symbol_containsAll": "包含全部", + "tw_symbol_containsAny": "包含任意", + "tw_symbol_notContains": "不包含", + "tw_symbol_range": "在范围内", + "tw_symbol_empty": "为空", + "tw_symbol_notEmpty": "不为空", + "tw_required_diableHidden": "属性必填，无法设置过滤条件", + "tw_no_hiddenCondition": "暂无隐藏条件", + "tw_msgForm_assign": "信息表单(分配条件)", + "tw_dataForm_filter": "数据表单(过滤条件)", + "tw_codeDuplicate_valid": "编码不能重复", + "tw_formExistItems_pre": "表单已有表单项", + "tw_formExistItems_suf": "已过滤", + "tw_control_approvalAndTask": "控制审批/任务", + "tw_unRelated_tips": "用户选择无需处理,未提交表单", + "tw_formDataNotSave_confirm": "确认放弃表单修改？", + "tw_formDataNotSave_tips": "操作选择[无需处理]类型,将不会提交表单修改,确认放弃修改吗?(操作选择其他类型可以正常提交表单)" } diff --git a/taskman-ui/src/pages/temp-management/approval-form-node.vue b/taskman-ui/src/pages/temp-management/approval-form-node.vue index 9be159ac..92d2e9fd 100644 --- a/taskman-ui/src/pages/temp-management/approval-form-node.vue +++ b/taskman-ui/src/pages/temp-management/approval-form-node.vue @@ -382,13 +382,15 @@ export default { const obj = Object.assign({}, item, { type: 2 }) this.filterFormList.push(obj) }) + // 信息表单列 let infoFormColumn = { - title: '信息表单(分配条件)', + title: this.$t('tw_msgForm_assign'), align: 'center', children: [] } + // 数据表单列 let dataFormColumn = { - title: '数据表单(过滤条件)', + title: this.$t('tw_dataForm_filter'), align: 'center', children: [] } diff --git a/taskman-ui/src/pages/temp-management/approval-form.vue b/taskman-ui/src/pages/temp-management/approval-form.vue index 647eb026..6b317beb 100644 --- a/taskman-ui/src/pages/temp-management/approval-form.vue +++ b/taskman-ui/src/pages/temp-management/approval-form.vue @@ -201,7 +201,7 @@ :disabled="getAddComponentDisabled(item.attrs)" @click="createComponentLibrary" size="small" - >新建组件{{ $t('tw_add_component') }}
+
+
- 组件列表 + {{ $t('tw_component_list') }}
@@ -40,7 +47,7 @@ v-model="query.formType" filterable clearable - placeholder="表单类型" + :placeholder="$t('tw_form_type')" style="width: 150px;" @on-change="handleSearch" > @@ -50,7 +57,7 @@ v-model="query.createdBy" filterable clearable - placeholder="创建人" + :placeholder="$t('createdBy')" style="width: 150px;" @on-change="handleSearch" > @@ -59,7 +66,7 @@ @@ -151,13 +158,13 @@ export default { loading: false, tableColumns: [ { - title: '组件名', + title: this.$t('tw_component_name'), key: 'name', align: 'left', minWidth: 200 }, { - title: '表单类型', + title: this.$t('tw_form_type'), key: 'formType', align: 'left', minWidth: 140, @@ -171,7 +178,7 @@ export default { } }, { - title: '表单项', + title: this.$t('form_item'), key: 'formItems', align: 'left', minWidth: 250, @@ -181,7 +188,7 @@ export default { } }, { - title: '创建人', + title: this.$t('createdBy'), key: 'createdBy', align: 'left', minWidth: 100 diff --git a/taskman-ui/src/pages/temp-management/components/hidden-condition-modal.vue b/taskman-ui/src/pages/temp-management/components/hidden-condition-modal.vue index 06f9ead5..dc233cd3 100644 --- a/taskman-ui/src/pages/temp-management/components/hidden-condition-modal.vue +++ b/taskman-ui/src/pages/temp-management/components/hidden-condition-modal.vue @@ -1,7 +1,7 @@