diff --git a/internal/pkg/consts/enum.go b/internal/pkg/consts/enum.go index 3ea7c6e37016ade5cc89c8e5332b94647a9f1fa1..c20fac6b5fddebdb425426a81386427b100131c6 100644 --- a/internal/pkg/consts/enum.go +++ b/internal/pkg/consts/enum.go @@ -29,6 +29,7 @@ var ( ErrZentaoConfig = ResponseCode{2000, "Zentao Config Error"} ErrZentaoRequest = ResponseCode{3000, "zentao request Error"} ErrRecordWithSameNameExist = ResponseCode{3010, "Record Exist"} + ErrRecordWithSamePathExist = ResponseCode{3011, "Record Exist"} ErrRecordNotExist = ResponseCode{4000, "Record Not Found"} NotAvailable = ResponseCode{5000, "Not Available"} diff --git a/internal/pkg/helper/zentao/bug.go b/internal/pkg/helper/zentao/bug.go index 8c7e7f356b0e3c5a31a881d0543951d543ee8293..965160dc938a06e9c7c4359e8dbc6463668ee692 100644 --- a/internal/pkg/helper/zentao/bug.go +++ b/internal/pkg/helper/zentao/bug.go @@ -195,7 +195,9 @@ func PrepareBug(workspacePath, seq string, caseIdStr string, productId int) (bug func GenBugStepText(step commDomain.StepLog) string { stepResults := make([]string, 0) - stepTxt := fmt.Sprintf("步骤%s: %s %s\n", step.Id, step.Name, step.Status) + stepId, _ := strconv.Atoi(step.Id) + stepId += 1 + stepTxt := fmt.Sprintf("步骤%d: %s %s\n", stepId, step.Name, step.Status) for _, checkpoint := range step.CheckPoints { text := fmt.Sprintf( diff --git a/internal/server/modules/v1/controller/workspace.go b/internal/server/modules/v1/controller/workspace.go index 639b5824bfdc2c1a8b942cb1917eb7996a0e9d7a..87c0ca8136be364bd9180670238e32801743d21d 100644 --- a/internal/server/modules/v1/controller/workspace.go +++ b/internal/server/modules/v1/controller/workspace.go @@ -67,7 +67,7 @@ func (c *WorkspaceCtrl) Create(ctx iris.Context) { req.ProductId = uint(currProductId) id, err := c.WorkspaceService.Create(req) if err != nil { - ctx.JSON(c.ErrResp(commConsts.CommErr, err.Error())) + ctx.JSON(c.ErrResp(commConsts.ErrRecordWithSamePathExist, err.Error())) return } diff --git a/ui/src/components/Table.vue b/ui/src/components/Table.vue index b63dfa9eff870af085cac99e018e44e397acd829..abfc2c1fe148cf0f3de1f200cbeec5213b88b8ee 100644 --- a/ui/src/components/Table.vue +++ b/ui/src/components/Table.vue @@ -898,6 +898,10 @@ tr { top: 0; } +.z-table td{ + position: inherit; +} + .z-table-hover tbody tr:hover { color: #212529; background-color: rgba(0, 0, 0, 0.075); diff --git a/ui/src/locales/en-US.ts b/ui/src/locales/en-US.ts index 02e8067892a021b083f24bb96bbd5dfe4558db16..b9b49a67884148108db8ed7278195b5fffbc08a3 100644 --- a/ui/src/locales/en-US.ts +++ b/ui/src/locales/en-US.ts @@ -288,6 +288,7 @@ export default { 'biz_1100': 'Can not delete dir that is not empty.', 'biz_2000': 'Zentao Config Failed', 'biz_3010': 'Record with same name already exist', + 'biz_3011': 'Record with same path already exist', 'biz_4000': 'Record Not Found', 'biz_5000': 'Not Available', 'biz_6000': 'File or dir already Exist', diff --git a/ui/src/locales/zh-CN.ts b/ui/src/locales/zh-CN.ts index c03c1ebe79178e172a214631ebca465f59127a1f..b908f1533e85da9b953a1ff5df5458a8035c3d53 100644 --- a/ui/src/locales/zh-CN.ts +++ b/ui/src/locales/zh-CN.ts @@ -300,6 +300,7 @@ export default { 'biz_2000': '禅道配置失败', 'biz_3000': '禅道请求错误', 'biz_3010': '已存在相同名称的记录', + 'biz_3011': '已存在相同路径的记录', 'biz_4000': '记录不存在', 'biz_5000': '无效的请求', 'biz_6000': '文件或目录已存在', diff --git a/ui/src/views/script/WorkDirPanel.vue b/ui/src/views/script/WorkDirPanel.vue index de4ab9e0ce551257c4173cd0599522c28ad04617..261ca4166d070ca683672a00ebf8bd8f74b69309 100644 --- a/ui/src/views/script/WorkDirPanel.vue +++ b/ui/src/views/script/WorkDirPanel.vue @@ -153,6 +153,9 @@ watch(bugMap, () => { genCheckedCaseIds() }, { deep: true }); +watch(treeDataMap, () => { + loadFilterItems() +}, { deep: true }); const genCheckedCaseIds = () => { checkedCaseIds.value = []; for(let key in selectedNodes.value){ diff --git a/ui/src/views/settings/SettingsModal.vue b/ui/src/views/settings/SettingsModal.vue index bcff397364d294c0ed9ea3ee583b525b840dc384..2e4bfd8da1d391a4e61b6e522b5d9743fce3d9f8 100644 --- a/ui/src/views/settings/SettingsModal.vue +++ b/ui/src/views/settings/SettingsModal.vue @@ -25,7 +25,7 @@ :sortable="{}" >