forked from github/dataease
Merge pull request #11418 from ulleo/dev-v2
fix(X-Pack): 修复新建数据填表单页面接口报错
This commit is contained in:
ulleo
GitHub
commit
18878e9a42
@ -263,6 +263,9 @@ export default {
|
||||
},
|
||||
data_fill: {
|
||||
data_fill: 'Data Filling',
|
||||
data_fill_name: 'Data Filling Name',
|
||||
p_data_fill_name: 'Data Filling Name',
|
||||
save_df_success: 'Save Success',
|
||||
permission: 'Data Filling Permission',
|
||||
enable: 'Enable',
|
||||
enable_hint: 'Cannot disable after enable',
|
||||
@ -370,6 +373,7 @@ export default {
|
||||
datetime: 'Datetime'
|
||||
},
|
||||
data: {
|
||||
commit_time: 'Commit Time',
|
||||
confirm_delete: 'Confirm delete?',
|
||||
add_data: 'Add Data',
|
||||
download_template: 'Download Template',
|
||||
@ -384,6 +388,12 @@ export default {
|
||||
data_not_found: '] Not Found'
|
||||
},
|
||||
task: {
|
||||
exec_logs: 'Execute Logs',
|
||||
assign_num: 'Assigned User Count',
|
||||
finished_user_num: 'Finished User Count',
|
||||
unfinished_user_num: 'Unfinished User Count',
|
||||
finished_rate: 'Finished Rate',
|
||||
confirm_batch_delete: 'Confirm to batch delete tasks',
|
||||
name: 'Name',
|
||||
creator: 'Creator',
|
||||
create_time: 'Create Time',
|
||||
@ -412,6 +422,8 @@ export default {
|
||||
todo: 'Todo',
|
||||
finished: 'Committed',
|
||||
expired: 'Expired',
|
||||
running: 'Running',
|
||||
assigned_task: 'Assigned Task',
|
||||
task_finish_in: 'Task Finished in ',
|
||||
task_finish_in_suffix: '',
|
||||
open_sub_task: 'Open Sub Tasks'
|
||||
|
||||
@ -10,110 +10,110 @@ export default {
|
||||
dateRange: '時間范圍',
|
||||
add_component_hint: '點擊或拖拽左側組件添加字段'
|
||||
},
|
||||
inputText: '请输入',
|
||||
inputText: '請輸入',
|
||||
add: '添加',
|
||||
account: '账号',
|
||||
email: '邮箱',
|
||||
phone: '手机号',
|
||||
pwd: '密码',
|
||||
account: '賬號',
|
||||
email: '郵箱',
|
||||
phone: '手機號',
|
||||
pwd: '密碼',
|
||||
require: '必填',
|
||||
personal_info: '个人信息',
|
||||
about: '关于',
|
||||
exit_system: '退出系统',
|
||||
letter_start: '必须以字母开头',
|
||||
personal_info: '個人信息',
|
||||
about: '關于',
|
||||
exit_system: '退出系統',
|
||||
letter_start: '必須以字母開頭',
|
||||
required: '必填',
|
||||
operate: '操作',
|
||||
create_time: '创建时间',
|
||||
edit: '编辑',
|
||||
delete: '删除',
|
||||
please_input: '请输入',
|
||||
please_select: '请选择',
|
||||
create_time: '創建時間',
|
||||
edit: '編輯',
|
||||
delete: '刪除',
|
||||
please_input: '請輸入',
|
||||
please_select: '請選擇',
|
||||
cancel: '取消',
|
||||
sure: '确定',
|
||||
input_limit: '长度在 {0} 到 {1} 个字符',
|
||||
sure: '確定',
|
||||
input_limit: '長度在 {0} 到 {1} 個字符',
|
||||
save_success: '保存成功',
|
||||
roger_that: '知道了',
|
||||
delete_success: '删除成功',
|
||||
copy: '复制',
|
||||
delete_success: '刪除成功',
|
||||
copy: '復制',
|
||||
no_auth_tips: '缺少菜單權限，請聯系管理員'
|
||||
},
|
||||
login: {
|
||||
welcome: '欢迎使用',
|
||||
btn: '登录',
|
||||
username_format: "1-25位字母数字或者._-{'@'}且以字母或数字开头",
|
||||
pwd_format: '密码长度在5-15'
|
||||
welcome: '歡迎使用',
|
||||
btn: '登錄',
|
||||
username_format: "1-25位字母數字或者._-{'@'}且以字母或數字開頭",
|
||||
pwd_format: '密碼長度在5-15'
|
||||
},
|
||||
component: {
|
||||
columnList: '列表项',
|
||||
selectInfo: '请选择列表中要展示的信息',
|
||||
allSelect: '全选'
|
||||
columnList: '列表項',
|
||||
selectInfo: '請選擇列表中要展示的信息',
|
||||
allSelect: '全選'
|
||||
},
|
||||
system: {
|
||||
user: '用户',
|
||||
user: '用戶',
|
||||
role: '角色',
|
||||
addUser: '@:common.add@:system.user'
|
||||
},
|
||||
user: {
|
||||
change_password: '修改密码',
|
||||
name: '名称',
|
||||
change_password: '修改密碼',
|
||||
name: '名稱',
|
||||
role: '角色',
|
||||
state: '用户状态',
|
||||
default_pwd: '默认密码',
|
||||
confirm_delete: '确认删除该用户吗？'
|
||||
state: '用戶狀態',
|
||||
default_pwd: '默認密碼',
|
||||
confirm_delete: '確認刪除該用戶嗎？'
|
||||
},
|
||||
role: {
|
||||
add_title: '添加角色',
|
||||
edit_title: '编辑角色',
|
||||
name: '角色名称',
|
||||
type: '角色类型',
|
||||
edit_title: '編輯角色',
|
||||
name: '角色名稱',
|
||||
type: '角色類型',
|
||||
desc: '角色描述',
|
||||
average_role: '普通用户',
|
||||
org_admin: '组织管理员',
|
||||
confirm_delete: '确认删除该角色吗？',
|
||||
average_role: '普通用戶',
|
||||
org_admin: '組織管理員',
|
||||
confirm_delete: '確認刪除該角色嗎？',
|
||||
delete_tips:
|
||||
'<div id="u7755_text" class="text" style="font-size: 12px;"><p><span style="color:#F59A23;">友情提示，角色被删除后，归属于角色的用户将做如下处理：</span></p><p><span style="color:#7F7F7F;">1、用户拥有当前组织的其他角色，那么角色被删除后，将用户从该角色中移除。</span></p><p><span style="color:#7F7F7F;">2、该角色是用户在当前组织下拥有的唯一角色，但用户拥有其他组织下的角色，那么角色被删除后，用户也将从当前组织中移除。</span></p><p><span style="color:#7F7F7F;">3、该角色是用户在当前组织下拥有的唯一角色，用户在系统的其他组织下也没有任何角色，那么角色被删除后，用户也将从当前系统中删除。</span></p><p><span style="color:#7F7F7F;"><br></span></p></div>',
|
||||
confirm_unbind_user: '确定移除改用户吗',
|
||||
'<div id="u7755_text" class="text" style="font-size: 12px;"><p><span style="color:#F59A23;">友情提示，角色被刪除后，歸屬于角色的用戶將做如下處理：</span></p><p><span style="color:#7F7F7F;">1、用戶擁有當前組織的其他角色，那么角色被刪除后，將用戶從該角色中移除。</span></p><p><span style="color:#7F7F7F;">2、該角色是用戶在當前組織下擁有的唯一角色，但用戶擁有其他組織下的角色，那么角色被刪除后，用戶也將從當前組織中移除。</span></p><p><span style="color:#7F7F7F;">3、該角色是用戶在當前組織下擁有的唯一角色，用戶在系統的其他組織下也沒有任何角色，那么角色被刪除后，用戶也將從當前系統中刪除。</span></p><p><span style="color:#7F7F7F;"><br></span></p></div>',
|
||||
confirm_unbind_user: '確定移除改用戶嗎',
|
||||
clear_in_system:
|
||||
'友情提示，从当前角色移除后，该用户已没有任何组织的任何角色，用户将从系统中删除。',
|
||||
'友情提示，從當前角色移除后，該用戶已沒有任何組織的任何角色，用戶將從系統中刪除。',
|
||||
clear_in_org:
|
||||
'友情提示，从当前角色移除后，该用户已没有当前组织的任何角色，将从当前组织中移除。',
|
||||
add_user: '为角色添加用户({0})',
|
||||
'友情提示，從當前角色移除后，該用戶已沒有當前組織的任何角色，將從當前組織中移除。',
|
||||
add_user: '為角色添加用戶({0})',
|
||||
unbind_success: '移除成功',
|
||||
bind_success: '绑定成功'
|
||||
bind_success: '綁定成功'
|
||||
},
|
||||
org: {
|
||||
org_title: '组织管理',
|
||||
org_move: '组织迁移',
|
||||
add: '添加组织',
|
||||
name: '组织名称',
|
||||
sub_count: '下属组织数',
|
||||
search_placeholder: '请输入名称搜索',
|
||||
add_sub: '添加子组织',
|
||||
edit: '编辑组织',
|
||||
parent: '上级组织',
|
||||
default_cannot_move: '默认组织不能删除',
|
||||
cannot_delete: '无法删除',
|
||||
confirm_delete: '确认删除该组织吗？',
|
||||
delete_children_first: '请先删除子组织后，再删除当前组织',
|
||||
confirm_content: '友情提示，组织被删除后，组织下的资源也将被删除',
|
||||
give_up_resource: '放弃资源，直接删除',
|
||||
move_resource_first: '先迁移资源',
|
||||
org_title: '組織管理',
|
||||
org_move: '組織遷移',
|
||||
add: '添加組織',
|
||||
name: '組織名稱',
|
||||
sub_count: '下屬組織數',
|
||||
search_placeholder: '請輸入名稱搜索',
|
||||
add_sub: '添加子組織',
|
||||
edit: '編輯組織',
|
||||
parent: '上級組織',
|
||||
default_cannot_move: '默認組織不能刪除',
|
||||
cannot_delete: '無法刪除',
|
||||
confirm_delete: '確認刪除該組織嗎？',
|
||||
delete_children_first: '請先刪除子組織后，再刪除當前組織',
|
||||
confirm_content: '友情提示，組織被刪除后，組織下的資源也將被刪除',
|
||||
give_up_resource: '放棄資源，直接刪除',
|
||||
move_resource_first: '先遷移資源',
|
||||
default_parent_tips: '(默認當前組織)',
|
||||
admin_parent_tips: '(默認根組織)'
|
||||
},
|
||||
auth: {
|
||||
user_dimension: '按用户配置',
|
||||
resource_dimension: '按资源配置',
|
||||
user: '用户',
|
||||
user_dimension: '按用戶配置',
|
||||
resource_dimension: '按資源配置',
|
||||
user: '用戶',
|
||||
role: '角色',
|
||||
resource: '资源权限',
|
||||
menu: '菜单权限',
|
||||
panel: '仪表板',
|
||||
screen: '数据大屏',
|
||||
dataset: '数据集',
|
||||
datasource: '数据源',
|
||||
empty_desc: '请选择用户/角色以及资源类型',
|
||||
uncommitted_tips: '有未提交的权限变更，是否提交？'
|
||||
resource: '資源權限',
|
||||
menu: '菜單權限',
|
||||
panel: '儀表板',
|
||||
screen: '數據大屏',
|
||||
dataset: '數據集',
|
||||
datasource: '數據源',
|
||||
empty_desc: '請選擇用戶/角色以及資源類型',
|
||||
uncommitted_tips: '有未提交的權限變更，是否提交？'
|
||||
},
|
||||
cron: {
|
||||
second: '秒',
|
||||
@ -160,11 +160,14 @@ export default {
|
||||
day_limit: '天不能小於1，大於31'
|
||||
},
|
||||
template_manage: {
|
||||
name_already_exists_type: '分类名称已存在',
|
||||
the_same_category: '同一分类下，该模板名称已存在'
|
||||
name_already_exists_type: '分類名稱已存在',
|
||||
the_same_category: '同一分類下，該模板名稱已存在'
|
||||
},
|
||||
data_fill: {
|
||||
data_fill: '數據填報',
|
||||
data_fill_name: '數據填報名稱',
|
||||
p_data_fill_name: '請輸入數據填報名稱',
|
||||
save_df_success: '保存數據填報成功',
|
||||
permission: '填報權限',
|
||||
enable: '開啟',
|
||||
enable_hint: '數據填報開啟后，可將表單數據存放至數據源中，一旦開啟后，后期不允許關閉。',
|
||||
@ -271,6 +274,7 @@ export default {
|
||||
datetime: '日期'
|
||||
},
|
||||
data: {
|
||||
commit_time: '提交時間',
|
||||
confirm_delete: '確認刪除?',
|
||||
add_data: '添加數據',
|
||||
download_template: '下載模板',
|
||||
@ -285,6 +289,12 @@ export default {
|
||||
data_not_found: ']的數據不存在'
|
||||
},
|
||||
task: {
|
||||
exec_logs: '執行日志',
|
||||
assign_num: '下發人數',
|
||||
finished_user_num: '已完成人數',
|
||||
unfinished_user_num: '未完成人數',
|
||||
finished_rate: '完成率',
|
||||
confirm_batch_delete: '確定批量刪除任務',
|
||||
name: '名稱',
|
||||
creator: '創建人',
|
||||
create_time: '創建時間',
|
||||
@ -313,6 +323,8 @@ export default {
|
||||
todo: '待辦項',
|
||||
finished: '已提交',
|
||||
expired: '已過期',
|
||||
running: '進行中',
|
||||
assigned_task: '已下發任務',
|
||||
task_finish_in: '在任務下發',
|
||||
task_finish_in_suffix: '內完成填報',
|
||||
open_sub_task: '查看子任務'
|
||||
|
||||
@ -2595,6 +2595,9 @@ export default {
|
||||
},
|
||||
data_fill: {
|
||||
data_fill: '数据填报',
|
||||
data_fill_name: '数据填报名称',
|
||||
p_data_fill_name: '请输入数据填报名称',
|
||||
save_df_success: '保存数据填报成功',
|
||||
permission: '填报权限',
|
||||
enable: '开启',
|
||||
enable_hint: '数据填报开启后，可将表单数据存放至数据源中，一旦开启后，后期不允许关闭。',
|
||||
@ -2701,6 +2704,7 @@ export default {
|
||||
datetime: '日期'
|
||||
},
|
||||
data: {
|
||||
commit_time: '提交时间',
|
||||
confirm_delete: '确认删除?',
|
||||
add_data: '添加数据',
|
||||
download_template: '下载模板',
|
||||
@ -2715,6 +2719,12 @@ export default {
|
||||
data_not_found: ']的数据不存在'
|
||||
},
|
||||
task: {
|
||||
exec_logs: '执行日志',
|
||||
assign_num: '下发人数',
|
||||
finished_user_num: '已完成人数',
|
||||
unfinished_user_num: '未完成人数',
|
||||
finished_rate: '完成率',
|
||||
confirm_batch_delete: '确定批量删除任务',
|
||||
name: '名称',
|
||||
creator: '创建人',
|
||||
create_time: '创建时间',
|
||||
@ -2743,6 +2753,8 @@ export default {
|
||||
todo: '待办项',
|
||||
finished: '已提交',
|
||||
expired: '已过期',
|
||||
running: '进行中',
|
||||
assigned_task: '已下发任务',
|
||||
task_finish_in: '在任务下发',
|
||||
task_finish_in_suffix: '内完成填报',
|
||||
open_sub_task: '查看子任务'
|
||||
|
||||
2
de-xpack
2
de-xpack
@ -1 +1 @@
|
||||
Subproject commit 4d92c0a241e569ff4060545584bd2d7d56c79016
|
||||
Subproject commit c4d4b7b6932c64cc8b935475ac1daa8404db8947
|
||||
@ -51,16 +51,16 @@ public interface DataFillingApi {
|
||||
List<ColumnOption> listColumnData(@PathVariable("optionDatasource") Long optionDatasource, @RequestBody DatasourceOptionsRequest request) throws Exception;
|
||||
|
||||
@PostMapping("/form/{id}/tableData")
|
||||
DataFillFormTableDataResponse tableData(@PathVariable Long id, @RequestBody DataFillFormTableDataRequest request) throws Exception;
|
||||
DataFillFormTableDataResponse tableData(@PathVariable("id") Long id, @RequestBody DataFillFormTableDataRequest request) throws Exception;
|
||||
|
||||
@GetMapping("/form/{formId}/delete/{id}")
|
||||
void deleteRowData(@PathVariable Long formId, @PathVariable Long id) throws Exception;
|
||||
void deleteRowData(@PathVariable("formId") Long formId, @PathVariable("id") Long id) throws Exception;
|
||||
|
||||
@PostMapping("/form/{formId}/batch-delete")
|
||||
void batchDeleteRowData(@PathVariable Long formId, @RequestBody List<Long> ids) throws Exception;
|
||||
void batchDeleteRowData(@PathVariable("formId") Long formId, @RequestBody List<Long> ids) throws Exception;
|
||||
|
||||
@PostMapping("/form/{formId}/rowData/save")
|
||||
DataFillFormTableDataResponse saveRowData(@PathVariable Long formId, @RequestBody Map<String, Object> data) throws Exception;
|
||||
DataFillFormTableDataResponse saveRowData(@PathVariable("formId") Long formId, @RequestBody Map<String, Object> data) throws Exception;
|
||||
|
||||
|
||||
@GetMapping("/task/info/{taskId}")
|
||||
@ -74,38 +74,38 @@ public interface DataFillingApi {
|
||||
String logMsg(@RequestBody ReportInstanceMsgRequest request);
|
||||
|
||||
@PostMapping("/task/page/{goPage}/{pageSize}")
|
||||
IPage<ReportGridVO> taskPager(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody DfTaskInfoRequest request);
|
||||
IPage<ReportGridVO> taskPager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody DfTaskInfoRequest request);
|
||||
|
||||
@PostMapping("/sub-task/page/{goPage}/{pageSize}")
|
||||
IPage<DfSubTaskVo> subTaskPager(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody DfSubTaskInfoRequest request);
|
||||
IPage<DfSubTaskVo> subTaskPager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody DfSubTaskInfoRequest request);
|
||||
|
||||
@PostMapping("/task/delete")
|
||||
void batchDeleteTask(@RequestBody List<Long> ids) throws Exception;
|
||||
|
||||
@GetMapping("/task/{id}/stop")
|
||||
void stopTask(@PathVariable Long id) throws Exception;
|
||||
void stopTask(@PathVariable("id") Long id) throws Exception;
|
||||
|
||||
@GetMapping("/task/{id}/start")
|
||||
void startTask(@PathVariable Long id) throws Exception;
|
||||
void startTask(@PathVariable("id") Long id) throws Exception;
|
||||
|
||||
@PostMapping("/sub-task/delete")
|
||||
void batchDeleteSubTask(@RequestBody List<Long> ids) throws Exception;
|
||||
|
||||
@GetMapping("/sub-task/{id}/users/list/{type}")
|
||||
List<Map<String, Object>> listSubTaskUser(@PathVariable Long id, @PathVariable String type) throws Exception;
|
||||
List<Map<String, Object>> listSubTaskUser(@PathVariable("id") Long id, @PathVariable("type") String type) throws Exception;
|
||||
|
||||
@PostMapping("/user-task")
|
||||
List<DfUserTaskVo> listUserTask(@RequestBody DfUserTaskRequest request) throws Exception;
|
||||
|
||||
@GetMapping("/user-task/list/{id}")
|
||||
DfUserTaskData listUserTaskData(@PathVariable Long id) throws Exception;
|
||||
DfUserTaskData listUserTaskData(@PathVariable("id") Long id) throws Exception;
|
||||
|
||||
@PostMapping("/user-task/saveData/{id}")
|
||||
DataFillFormTableDataResponse saveFormRowData(@PathVariable Long id, @RequestBody Map<String, Object> data) throws Exception;
|
||||
DataFillFormTableDataResponse saveFormRowData(@PathVariable("id") Long id, @RequestBody Map<String, Object> data) throws Exception;
|
||||
|
||||
|
||||
@PostMapping("/log/page/{goPage}/{pageSize}")
|
||||
IPage<DfCommitLog> taskPager(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody DfCommitLogRequest request);
|
||||
IPage<DfCommitLog> taskPager(@PathVariable("goPage") int goPage, @PathVariable("pageSize") int pageSize, @RequestBody DfCommitLogRequest request);
|
||||
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user