From bb01172492647774dcda410c29a494770624a8f8 Mon Sep 17 00:00:00 2001 From: Jerry <707344974@qq.com> Date: Wed, 24 Jul 2024 17:43:48 +0800 Subject: [PATCH] =?UTF-8?q?commit=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=B5=81bug=EF=BC=8C=E4=BF=AE=E5=A4=8Dbuilder?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/flow/FlowCategoryController.ts | 10 +-- .../src/api/flow/FlowDictionaryController.ts | 3 +- .../src/api/flow/FlowEntryController.ts | 30 ++++--- .../api/flow/FlowEntryVariableController.ts | 10 +-- .../src/api/flow/FlowOperationController.ts | 80 +++++++++-------- .../src/api/online/OnlineColumnController.ts | 28 +++--- .../api/online/OnlineDatasourceController.ts | 14 +-- .../OnlineDatasourceRelationController.ts | 10 +-- .../src/api/online/OnlineDblinkController.ts | 16 ++-- .../src/api/online/OnlineDictController.ts | 16 ++-- .../src/api/online/OnlineFormController.ts | 14 +-- .../api/online/OnlineOperationController.ts | 38 +++++--- .../src/api/online/OnlinePageController.ts | 28 +++--- .../src/api/online/OnlineRuleController.ts | 10 +-- .../online/OnlineVirtualColumnController.ts | 10 +-- .../src/api/system/DictionaryController.ts | 30 +++---- .../src/api/system/LoginController.ts | 4 +- .../src/api/system/LoginUserController.ts | 4 +- .../src/api/system/MenuController.ts | 16 ++-- .../src/api/system/MobileEntryController.ts | 14 +-- .../src/api/system/OperationLogController.ts | 2 +- .../src/api/system/PermCodeController.ts | 2 +- .../src/api/system/PermController.ts | 28 +++--- .../src/api/system/SysCommonBizController.ts | 4 +- .../src/api/system/SysDataPermController.ts | 18 ++-- .../src/api/system/SysDeptController.ts | 24 ++--- .../src/api/system/SysGlobalDictController.ts | 1 - .../src/api/system/SysPostController.ts | 10 +-- .../src/api/system/SystemRoleController.ts | 18 ++-- .../src/api/system/UserController.ts | 20 ++--- .../src/assets/skin/orange/index.scss | 3 - .../src/assets/style/base.scss | 8 -- .../src/common/hooks/useUpload.ts | 5 +- .../src/common/hooks/useUploadWidget.ts | 8 +- .../src/components/Dialog/index.ts | 4 +- .../src/components/SpreadSheet/index.scss | 39 +------- .../src/components/UserSelect/index.vue | 2 - .../components/layout/components/SubMenu.vue | 5 +- .../components/layout/components/TagPanel.vue | 1 - .../layout/components/multi-column-menu.vue | 1 - .../layout/components/multi-column.vue | 1 - .../src/components/layout/index.vue | 7 +- .../online/components/OnlineCustomBlock.vue | 1 - .../online/components/OnlineCustomTable.vue | 1 - .../online/components/OnlineCustomTree.vue | 4 - .../components/OnlineCustomWorkFlowTable.vue | 16 ---- .../dataModel/onlinePageVirtualColumn.vue | 15 +--- .../components/CustomWidgetBindData.vue | 1 - .../editOnlinePage/formDesign/index.vue | 3 - .../online/formOnlineDict/EditOnlineDict.vue | 2 +- .../src/pages/upms/formEditSysDept/index.vue | 1 - .../pages/upms/formEditSysMenu/editColumn.vue | 1 - .../src/pages/upms/formEditSysMenu/index.vue | 1 - .../src/pages/upms/formEditSysPost/index.vue | 1 - .../src/pages/upms/formEditSysRole/index.vue | 1 - .../src/pages/upms/formEditSysUser/index.vue | 1 - .../formSetSysDataPermUser.vue | 1 - .../upms/formSysDeptPost/formSetDeptPost.vue | 1 - .../src/pages/upms/formSysDict/index.vue | 2 +- .../upms/formSysMenu/formSysColumnMenu.vue | 3 +- .../SysOperationLogDetail.vue | 12 ++- .../upms/formSysRole/formSetRoleUser.vue | 1 - .../src/pages/upms/formSysUser/index.vue | 2 +- .../CopyForSelect/addCopyForItem.vue | 4 +- .../components/CopyForSelect/index.vue | 1 - .../workflow/components/HandlerFlowTask.vue | 17 ++-- .../workflow/components/ProcessDesigner.vue | 10 --- .../workflow/components/ProcessViewer.vue | 10 --- .../UserTaskSelect/userTaskSelectDlg.vue | 10 --- .../flowEntry/formPublishedFlowEntry.vue | 6 +- .../pages/workflow/handlerFlowTask/index.vue | 89 ++++++++++++------- .../package/refactor/PropertiesPanel.vue | 1 + .../package/refactor/form/flowFormConfig.vue | 10 ++- .../refactor/form/formEditOperation.vue | 7 +- .../signal-message/SignalAndMessage.vue | 2 +- .../package/theme/flow-element-variables.scss | 2 - .../package/theme/process-designer.scss | 10 --- 77 files changed, 391 insertions(+), 455 deletions(-) diff --git a/OrangeFormsOpen-VUE3/src/api/flow/FlowCategoryController.ts b/OrangeFormsOpen-VUE3/src/api/flow/FlowCategoryController.ts index 39556427..53ea2b7a 100644 --- a/OrangeFormsOpen-VUE3/src/api/flow/FlowCategoryController.ts +++ b/OrangeFormsOpen-VUE3/src/api/flow/FlowCategoryController.ts @@ -6,7 +6,7 @@ import { API_CONTEXT } from '../config'; export default class FlowCategoryController extends BaseController { static list(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/flow/flowCategory/list', params, httpOptions, @@ -14,18 +14,18 @@ export default class FlowCategoryController extends BaseController { } static view(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/flow/flowCategory/view', params, httpOptions); + return super.get(API_CONTEXT + '/flow/flowCategory/view', params, httpOptions); } static add(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowCategory/add', params, httpOptions); + return super.post(API_CONTEXT + '/flow/flowCategory/add', params, httpOptions); } static update(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowCategory/update', params, httpOptions); + return super.post(API_CONTEXT + '/flow/flowCategory/update', params, httpOptions); } static delete(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowCategory/delete', params, httpOptions); + return super.post(API_CONTEXT + '/flow/flowCategory/delete', params, httpOptions); } } diff --git a/OrangeFormsOpen-VUE3/src/api/flow/FlowDictionaryController.ts b/OrangeFormsOpen-VUE3/src/api/flow/FlowDictionaryController.ts index 6e9afd67..db1e7791 100644 --- a/OrangeFormsOpen-VUE3/src/api/flow/FlowDictionaryController.ts +++ b/OrangeFormsOpen-VUE3/src/api/flow/FlowDictionaryController.ts @@ -10,7 +10,8 @@ export default class FlowDictionaryController extends BaseController { httpOptions?: RequestOption, ): Promise { return new Promise((resolve, reject) => { - this.get(API_CONTEXT + '/flow/flowCategory/listDict', params, httpOptions) + super + .get(API_CONTEXT + '/flow/flowCategory/listDict', params, httpOptions) .then(res => { const dictData = new DictionaryBase('', res.data); resolve(dictData); diff --git a/OrangeFormsOpen-VUE3/src/api/flow/FlowEntryController.ts b/OrangeFormsOpen-VUE3/src/api/flow/FlowEntryController.ts index ba4b13f2..5c1cfa22 100644 --- a/OrangeFormsOpen-VUE3/src/api/flow/FlowEntryController.ts +++ b/OrangeFormsOpen-VUE3/src/api/flow/FlowEntryController.ts @@ -6,7 +6,7 @@ import { API_CONTEXT } from '../config'; export default class FlowEntryController extends BaseController { static list(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/flow/flowEntry/list', params, httpOptions, @@ -14,27 +14,27 @@ export default class FlowEntryController extends BaseController { } static view(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/flow/flowEntry/view', params, httpOptions); + return super.get(API_CONTEXT + '/flow/flowEntry/view', params, httpOptions); } static add(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowEntry/add', params, httpOptions); + return super.post(API_CONTEXT + '/flow/flowEntry/add', params, httpOptions); } static update(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowEntry/update', params, httpOptions); + return super.post(API_CONTEXT + '/flow/flowEntry/update', params, httpOptions); } static delete(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowEntry/delete', params, httpOptions); + return super.post(API_CONTEXT + '/flow/flowEntry/delete', params, httpOptions); } static publish(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowEntry/publish', params, httpOptions); + return super.post(API_CONTEXT + '/flow/flowEntry/publish', params, httpOptions); } static listFlowEntryPublish(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get>( + return super.get>( API_CONTEXT + '/flow/flowEntry/listFlowEntryPublish', params, httpOptions, @@ -42,23 +42,27 @@ export default class FlowEntryController extends BaseController { } static updateMainVersion(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowEntry/updateMainVersion', params, httpOptions); + return super.post(API_CONTEXT + '/flow/flowEntry/updateMainVersion', params, httpOptions); } static suspendFlowEntryPublish(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowEntry/suspendFlowEntryPublish', params, httpOptions); + return super.post(API_CONTEXT + '/flow/flowEntry/suspendFlowEntryPublish', params, httpOptions); } static activateFlowEntryPublish(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowEntry/activateFlowEntryPublish', params, httpOptions); + return super.post( + API_CONTEXT + '/flow/flowEntry/activateFlowEntryPublish', + params, + httpOptions, + ); } static viewDict(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/flow/flowEntry/viewDict', params, httpOptions); + return super.get(API_CONTEXT + '/flow/flowEntry/viewDict', params, httpOptions); } static listDict(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get>( + return super.get>( API_CONTEXT + '/flow/flowEntry/listDict', params, httpOptions, @@ -66,6 +70,6 @@ export default class FlowEntryController extends BaseController { } static listAll(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get('/admin/flow/flowEntry/listAll', params, httpOptions); + return super.get('/admin/flow/flowEntry/listAll', params, httpOptions); } } diff --git a/OrangeFormsOpen-VUE3/src/api/flow/FlowEntryVariableController.ts b/OrangeFormsOpen-VUE3/src/api/flow/FlowEntryVariableController.ts index 9214fd80..868ac0c5 100644 --- a/OrangeFormsOpen-VUE3/src/api/flow/FlowEntryVariableController.ts +++ b/OrangeFormsOpen-VUE3/src/api/flow/FlowEntryVariableController.ts @@ -6,7 +6,7 @@ import { API_CONTEXT } from '../config'; export default class FlowEntryVariableController extends BaseController { static list(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/flow/flowEntryVariable/list', params, httpOptions, @@ -14,18 +14,18 @@ export default class FlowEntryVariableController extends BaseController { } static add(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowEntryVariable/add', params, httpOptions); + return super.post(API_CONTEXT + '/flow/flowEntryVariable/add', params, httpOptions); } static update(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowEntryVariable/update', params, httpOptions); + return super.post(API_CONTEXT + '/flow/flowEntryVariable/update', params, httpOptions); } static delete(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowEntryVariable/delete', params, httpOptions); + return super.post(API_CONTEXT + '/flow/flowEntryVariable/delete', params, httpOptions); } static view(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/flow/flowEntryVariable/view', params, httpOptions); + return super.get(API_CONTEXT + '/flow/flowEntryVariable/view', params, httpOptions); } } diff --git a/OrangeFormsOpen-VUE3/src/api/flow/FlowOperationController.ts b/OrangeFormsOpen-VUE3/src/api/flow/FlowOperationController.ts index 9c512339..c1808b79 100644 --- a/OrangeFormsOpen-VUE3/src/api/flow/FlowOperationController.ts +++ b/OrangeFormsOpen-VUE3/src/api/flow/FlowOperationController.ts @@ -11,12 +11,12 @@ export default class FlowOperationController extends BaseController { if (httpOptions && httpOptions.processDefinitionKey) { url += '/' + httpOptions.processDefinitionKey; } - return this.post(url, params, httpOptions); + return super.post(url, params, httpOptions); } // 获取在线表单工作流草稿数据 static viewOnlineDraftData(params: ANY_OBJECT, httpOptions?: RequestOption) { const url = API_CONTEXT + '/flow/flowOnlineOperation/viewDraftData'; - return this.get(url, params, httpOptions); + return super.get(url, params, httpOptions); } // 启动流程实例并且提交表单信息 static startAndTakeUserTask(params: ANY_OBJECT, httpOptions?: RequestOption) { @@ -27,7 +27,7 @@ export default class FlowOperationController extends BaseController { // 从流程设计里启动 url = API_CONTEXT + '/flow/flowOnlineOperation/startPreview'; } - return this.post(url, params, httpOptions); + return super.post(url, params, httpOptions); } // 获得流程以及工单信息 static listWorkOrder(params: ANY_OBJECT, httpOptions?: RequestOption) { @@ -35,15 +35,19 @@ export default class FlowOperationController extends BaseController { if (httpOptions && httpOptions.processDefinitionKey) { url += '/' + httpOptions.processDefinitionKey; } - return this.post>(url, params, httpOptions); + return super.post>(url, params, httpOptions); } // 提交用户任务数据 static submitUserTask(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowOnlineOperation/submitUserTask', params, httpOptions); + return super.post( + API_CONTEXT + '/flow/flowOnlineOperation/submitUserTask', + params, + httpOptions, + ); } // 获取历史流程数据 static viewHistoricProcessInstance(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/flow/flowOnlineOperation/viewHistoricProcessInstance', params, httpOptions, @@ -51,7 +55,7 @@ export default class FlowOperationController extends BaseController { } // 获取用户任务数据 static viewUserTask(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/flow/flowOnlineOperation/viewUserTask', params, httpOptions, @@ -59,7 +63,7 @@ export default class FlowOperationController extends BaseController { } // 获取在线表单工作流以及工作流下表单列表 static listFlowEntryForm(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/flow/flowOnlineOperation/listFlowEntryForm', params, httpOptions, @@ -68,19 +72,19 @@ export default class FlowOperationController extends BaseController { // 获得草稿信息 static viewDraftData(params: ANY_OBJECT, httpOptions?: RequestOption) { const url = API_CONTEXT + '/flow/flowOperation/viewDraftData'; - return this.get(url, params, httpOptions); + return super.get(url, params, httpOptions); } // 撤销工单 static cancelWorkOrder(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowOperation/cancelWorkOrder', params, httpOptions); + return super.post(API_CONTEXT + '/flow/flowOperation/cancelWorkOrder', params, httpOptions); } // 多实例加签 static submitConsign(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowOperation/submitConsign', params, httpOptions); + return super.post(API_CONTEXT + '/flow/flowOperation/submitConsign', params, httpOptions); } // 已办任务列表 static listHistoricTask(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/flow/flowOperation/listHistoricTask', params, httpOptions, @@ -88,7 +92,7 @@ export default class FlowOperationController extends BaseController { } // 获取已办任务信息 static viewHistoricTaskInfo(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/flow/flowOperation/viewHistoricTaskInfo', params, httpOptions, @@ -96,11 +100,11 @@ export default class FlowOperationController extends BaseController { } // 仅启动流程实例 static startOnly(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowOperation/startOnly', params, httpOptions); + return super.post(API_CONTEXT + '/flow/flowOperation/startOnly', params, httpOptions); } // 获得流程定义初始化用户任务信息 static viewInitialTaskInfo(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/flow/flowOperation/viewInitialTaskInfo', params, httpOptions, @@ -108,7 +112,7 @@ export default class FlowOperationController extends BaseController { } // 获取待办任务信息 static viewRuntimeTaskInfo(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/flow/flowOperation/viewRuntimeTaskInfo', params, httpOptions, @@ -116,7 +120,7 @@ export default class FlowOperationController extends BaseController { } // 获取流程实例审批历史 static listFlowTaskComment(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/flow/flowOperation/listFlowTaskComment', params, httpOptions, @@ -124,7 +128,7 @@ export default class FlowOperationController extends BaseController { } // 获取历史任务信息 static viewInitialHistoricTaskInfo(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/flow/flowOperation/viewInitialHistoricTaskInfo', params, httpOptions, @@ -132,7 +136,7 @@ export default class FlowOperationController extends BaseController { } // 获取所有待办任务 static listRuntimeTask(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/flow/flowOperation/listRuntimeTask', params, httpOptions, @@ -140,7 +144,7 @@ export default class FlowOperationController extends BaseController { } // 获得流程实例审批路径 static viewHighlightFlowData(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/flow/flowOperation/viewHighlightFlowData', params, httpOptions, @@ -148,7 +152,7 @@ export default class FlowOperationController extends BaseController { } // 获得流程实例的配置XML static viewProcessBpmn(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/flow/flowOperation/viewProcessBpmn', params, httpOptions, @@ -156,7 +160,7 @@ export default class FlowOperationController extends BaseController { } // 获得所有历史流程实例 static listAllHistoricProcessInstance(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/flow/flowOperation/listAllHistoricProcessInstance', params, httpOptions, @@ -164,7 +168,7 @@ export default class FlowOperationController extends BaseController { } // 获得当前用户历史流程实例 static listHistoricProcessInstance(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/flow/flowOperation/listHistoricProcessInstance', params, httpOptions, @@ -172,11 +176,11 @@ export default class FlowOperationController extends BaseController { } // 终止流程 static stopProcessInstance(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowOperation/stopProcessInstance', params, httpOptions); + return super.post(API_CONTEXT + '/flow/flowOperation/stopProcessInstance', params, httpOptions); } // 删除流程实例 static deleteProcessInstance(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post( + return super.post( API_CONTEXT + '/flow/flowOperation/deleteProcessInstance', params, httpOptions, @@ -184,11 +188,11 @@ export default class FlowOperationController extends BaseController { } // 催办 static remindRuntimeTask(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowOperation/remindRuntimeTask', params, httpOptions); + return super.post(API_CONTEXT + '/flow/flowOperation/remindRuntimeTask', params, httpOptions); } // 催办消息列表 static listRemindingTask(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/flow/flowMessage/listRemindingTask', params, httpOptions, @@ -196,11 +200,11 @@ export default class FlowOperationController extends BaseController { } // 驳回 static rejectRuntimeTask(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowOperation/rejectRuntimeTask', params, httpOptions); + return super.post(API_CONTEXT + '/flow/flowOperation/rejectRuntimeTask', params, httpOptions); } // 驳回到起点 static rejectToStartUserTask(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post( + return super.post( API_CONTEXT + '/flow/flowOperation/rejectToStartUserTask', params, httpOptions, @@ -208,11 +212,11 @@ export default class FlowOperationController extends BaseController { } // 撤销 static revokeHistoricTask(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/flow/flowOperation/revokeHistoricTask', params, httpOptions); + return super.post(API_CONTEXT + '/flow/flowOperation/revokeHistoricTask', params, httpOptions); } // 抄送消息列表 static listCopyMessage(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/flow/flowMessage/listCopyMessage', params, httpOptions, @@ -220,7 +224,7 @@ export default class FlowOperationController extends BaseController { } // 消息个数 static getMessageCount(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/flow/flowMessage/getMessageCount', params, httpOptions, @@ -228,7 +232,7 @@ export default class FlowOperationController extends BaseController { } // 在线表单流程抄送消息数据 static viewOnlineCopyBusinessData(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/flow/flowOnlineOperation/viewCopyBusinessData', params, httpOptions, @@ -236,7 +240,7 @@ export default class FlowOperationController extends BaseController { } // 静态表单流程抄送消息数据 static viewCopyBusinessData(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/flow/flowOperation/viewCopyBusinessData', params, httpOptions, @@ -244,7 +248,7 @@ export default class FlowOperationController extends BaseController { } // 获取指定任务处理人列表 static viewTaskUserInfo(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/flow/flowOperation/viewTaskUserInfo', params, httpOptions, @@ -252,7 +256,7 @@ export default class FlowOperationController extends BaseController { } // 获取驳回历史任务列表 static listRejectCandidateUserTask(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get>( + return super.get>( API_CONTEXT + '/flow/flowOperation/listRejectCandidateUserTask', params, httpOptions, @@ -260,7 +264,7 @@ export default class FlowOperationController extends BaseController { } // 获取多实例任务中会签人员列表 static listMultiSignAssignees(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get>( + return super.get>( API_CONTEXT + '/flow/flowOperation/listMultiSignAssignees', params, httpOptions, @@ -268,7 +272,7 @@ export default class FlowOperationController extends BaseController { } // 获取所有任务列表 static listAllUserTask(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/flow/flowOperation/listAllUserTask', params, httpOptions, diff --git a/OrangeFormsOpen-VUE3/src/api/online/OnlineColumnController.ts b/OrangeFormsOpen-VUE3/src/api/online/OnlineColumnController.ts index 6117e809..ce7f78f6 100644 --- a/OrangeFormsOpen-VUE3/src/api/online/OnlineColumnController.ts +++ b/OrangeFormsOpen-VUE3/src/api/online/OnlineColumnController.ts @@ -7,7 +7,7 @@ import { API_CONTEXT } from '../config'; export default class OnlineColumnController extends BaseController { static list(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/online/onlineColumn/list', params, httpOptions, @@ -15,7 +15,7 @@ export default class OnlineColumnController extends BaseController { } static view(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/online/onlineColumn/view', params, httpOptions); + return super.get(API_CONTEXT + '/online/onlineColumn/view', params, httpOptions); } // static export(sender, params, fileName) { @@ -23,23 +23,23 @@ export default class OnlineColumnController extends BaseController { // } static add(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineColumn/add', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineColumn/add', params, httpOptions); } static update(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineColumn/update', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineColumn/update', params, httpOptions); } static refreshColumn(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineColumn/refresh', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineColumn/refresh', params, httpOptions); } static delete(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineColumn/delete', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineColumn/delete', params, httpOptions); } static listOnlineColumnRule(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/online/onlineColumn/listOnlineColumnRule', params, httpOptions, @@ -47,7 +47,7 @@ export default class OnlineColumnController extends BaseController { } static listNotInOnlineColumnRule(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/online/onlineColumn/listNotInOnlineColumnRule', params, httpOptions, @@ -55,11 +55,15 @@ export default class OnlineColumnController extends BaseController { } static addOnlineColumnRule(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineColumn/addOnlineColumnRule', params, httpOptions); + return super.post( + API_CONTEXT + '/online/onlineColumn/addOnlineColumnRule', + params, + httpOptions, + ); } static deleteOnlineColumnRule(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post( + return super.post( API_CONTEXT + '/online/onlineColumn/deleteOnlineColumnRule', params, httpOptions, @@ -67,7 +71,7 @@ export default class OnlineColumnController extends BaseController { } static updateOnlineColumnRule(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post( + return super.post( API_CONTEXT + '/online/onlineColumn/updateOnlineColumnRule', params, httpOptions, @@ -75,7 +79,7 @@ export default class OnlineColumnController extends BaseController { } static viewOnlineColumnRule(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post( + return super.post( API_CONTEXT + '/online/onlineColumn/viewOnlineColumnRule', params, httpOptions, diff --git a/OrangeFormsOpen-VUE3/src/api/online/OnlineDatasourceController.ts b/OrangeFormsOpen-VUE3/src/api/online/OnlineDatasourceController.ts index 82b8b66c..d93b7072 100644 --- a/OrangeFormsOpen-VUE3/src/api/online/OnlineDatasourceController.ts +++ b/OrangeFormsOpen-VUE3/src/api/online/OnlineDatasourceController.ts @@ -6,7 +6,7 @@ import { API_CONTEXT } from '../config'; export default class OnlineDatasourceController extends BaseController { static list(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/online/onlineDatasource/list', params, httpOptions, @@ -14,7 +14,11 @@ export default class OnlineDatasourceController extends BaseController { } static view(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/online/onlineDatasource/view', params, httpOptions); + return super.get( + API_CONTEXT + '/online/onlineDatasource/view', + params, + httpOptions, + ); } // static export(sender, params, fileName) { @@ -22,14 +26,14 @@ export default class OnlineDatasourceController extends BaseController { // } static add(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineDatasource/add', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineDatasource/add', params, httpOptions); } static update(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineDatasource/update', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineDatasource/update', params, httpOptions); } static delete(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineDatasource/delete', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineDatasource/delete', params, httpOptions); } } diff --git a/OrangeFormsOpen-VUE3/src/api/online/OnlineDatasourceRelationController.ts b/OrangeFormsOpen-VUE3/src/api/online/OnlineDatasourceRelationController.ts index 02ab3aa7..b8502d40 100644 --- a/OrangeFormsOpen-VUE3/src/api/online/OnlineDatasourceRelationController.ts +++ b/OrangeFormsOpen-VUE3/src/api/online/OnlineDatasourceRelationController.ts @@ -6,7 +6,7 @@ import { API_CONTEXT } from '../config'; export default class OnlineDatasourceRelationController extends BaseController { static list(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/online/onlineDatasourceRelation/list', params, httpOptions, @@ -14,7 +14,7 @@ export default class OnlineDatasourceRelationController extends BaseController { } static view(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/online/onlineDatasourceRelation/view', params, httpOptions, @@ -26,14 +26,14 @@ export default class OnlineDatasourceRelationController extends BaseController { // } static add(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineDatasourceRelation/add', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineDatasourceRelation/add', params, httpOptions); } static update(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineDatasourceRelation/update', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineDatasourceRelation/update', params, httpOptions); } static delete(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineDatasourceRelation/delete', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineDatasourceRelation/delete', params, httpOptions); } } diff --git a/OrangeFormsOpen-VUE3/src/api/online/OnlineDblinkController.ts b/OrangeFormsOpen-VUE3/src/api/online/OnlineDblinkController.ts index 3178fb72..210fe49c 100644 --- a/OrangeFormsOpen-VUE3/src/api/online/OnlineDblinkController.ts +++ b/OrangeFormsOpen-VUE3/src/api/online/OnlineDblinkController.ts @@ -8,7 +8,7 @@ import { API_CONTEXT } from '../config'; export default class OnlineDblinkController extends BaseController { static list(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/online/onlineDblink/list', params, httpOptions, @@ -16,7 +16,7 @@ export default class OnlineDblinkController extends BaseController { } static listDblinkTables(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/online/onlineDblink/listDblinkTables', params, httpOptions, @@ -24,7 +24,7 @@ export default class OnlineDblinkController extends BaseController { } static listDblinkTableColumns(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/online/onlineDblink/listDblinkTableColumns', params, httpOptions, @@ -32,22 +32,22 @@ export default class OnlineDblinkController extends BaseController { } static view(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/online/onlineDblink/view', params, httpOptions); + return super.get(API_CONTEXT + '/online/onlineDblink/view', params, httpOptions); } static add(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineDblink/add', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineDblink/add', params, httpOptions); } static update(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineDblink/update', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineDblink/update', params, httpOptions); } static delete(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineDblink/delete', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineDblink/delete', params, httpOptions); } static testConnection(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/online/onlineDblink/testConnection', params, httpOptions); + return super.get(API_CONTEXT + '/online/onlineDblink/testConnection', params, httpOptions); } } diff --git a/OrangeFormsOpen-VUE3/src/api/online/OnlineDictController.ts b/OrangeFormsOpen-VUE3/src/api/online/OnlineDictController.ts index 997d48e5..a4171508 100644 --- a/OrangeFormsOpen-VUE3/src/api/online/OnlineDictController.ts +++ b/OrangeFormsOpen-VUE3/src/api/online/OnlineDictController.ts @@ -7,11 +7,15 @@ import { API_CONTEXT } from '../config'; export default class OnlineDictController extends BaseController { static list(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>(API_CONTEXT + '/online/onlineDict/list', params, httpOptions); + return super.post>( + API_CONTEXT + '/online/onlineDict/list', + params, + httpOptions, + ); } static view(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/online/onlineDict/view', params, httpOptions); + return super.get(API_CONTEXT + '/online/onlineDict/view', params, httpOptions); } // static export(sender, params, fileName) { @@ -19,19 +23,19 @@ export default class OnlineDictController extends BaseController { // } static add(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineDict/add', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineDict/add', params, httpOptions); } static update(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineDict/update', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineDict/update', params, httpOptions); } static delete(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineDict/delete', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineDict/delete', params, httpOptions); } static listAllGlobalDict(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/online/onlineDict/listAllGlobalDict', params, httpOptions, diff --git a/OrangeFormsOpen-VUE3/src/api/online/OnlineFormController.ts b/OrangeFormsOpen-VUE3/src/api/online/OnlineFormController.ts index b4ac568d..c4a24d3e 100644 --- a/OrangeFormsOpen-VUE3/src/api/online/OnlineFormController.ts +++ b/OrangeFormsOpen-VUE3/src/api/online/OnlineFormController.ts @@ -6,7 +6,7 @@ import { API_CONTEXT } from '../config'; export default class OnlineFormController extends BaseController { static list(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/online/onlineForm/list', params, httpOptions, @@ -14,11 +14,11 @@ export default class OnlineFormController extends BaseController { } static view(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/online/onlineForm/view', params, httpOptions); + return super.get(API_CONTEXT + '/online/onlineForm/view', params, httpOptions); } static render(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/online/onlineForm/render', params, httpOptions); + return super.get(API_CONTEXT + '/online/onlineForm/render', params, httpOptions); } // static export(sender, params, fileName) { @@ -26,18 +26,18 @@ export default class OnlineFormController extends BaseController { // } static add(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineForm/add', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineForm/add', params, httpOptions); } static update(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineForm/update', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineForm/update', params, httpOptions); } static delete(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineForm/delete', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineForm/delete', params, httpOptions); } static clone(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineForm/clone', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineForm/clone', params, httpOptions); } } diff --git a/OrangeFormsOpen-VUE3/src/api/online/OnlineOperationController.ts b/OrangeFormsOpen-VUE3/src/api/online/OnlineOperationController.ts index d8937a5f..e7c89dbe 100644 --- a/OrangeFormsOpen-VUE3/src/api/online/OnlineOperationController.ts +++ b/OrangeFormsOpen-VUE3/src/api/online/OnlineOperationController.ts @@ -6,7 +6,7 @@ import { API_CONTEXT } from '../config'; export default class OnlineOperationController extends BaseController { static listDict(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post( + return super.post( API_CONTEXT + '/online/onlineOperation/listDict', params, httpOptions, @@ -14,7 +14,7 @@ export default class OnlineOperationController extends BaseController { } static listByDatasourceId(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/online/onlineOperation/listByDatasourceId', params, httpOptions, @@ -22,7 +22,7 @@ export default class OnlineOperationController extends BaseController { } static listByOneToManyRelationId(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/online/onlineOperation/listByOneToManyRelationId', params, httpOptions, @@ -30,11 +30,11 @@ export default class OnlineOperationController extends BaseController { } static addDatasource(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineOperation/addDatasource', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineOperation/addDatasource', params, httpOptions); } static addOneToManyRelation(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post( + return super.post( API_CONTEXT + '/online/onlineOperation/addOneToManyRelation', params, httpOptions, @@ -42,11 +42,15 @@ export default class OnlineOperationController extends BaseController { } static updateDatasource(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineOperation/updateDatasource', params, httpOptions); + return super.post( + API_CONTEXT + '/online/onlineOperation/updateDatasource', + params, + httpOptions, + ); } static updateOneToManyRelation(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post( + return super.post( API_CONTEXT + '/online/onlineOperation/updateOneToManyRelation', params, httpOptions, @@ -54,7 +58,7 @@ export default class OnlineOperationController extends BaseController { } static viewByDatasourceId(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/online/onlineOperation/viewByDatasourceId', params, httpOptions, @@ -62,7 +66,7 @@ export default class OnlineOperationController extends BaseController { } static viewByOneToManyRelationId(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/online/onlineOperation/viewByOneToManyRelationId', params, httpOptions, @@ -70,11 +74,15 @@ export default class OnlineOperationController extends BaseController { } static deleteDatasource(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineOperation/deleteDatasource', params, httpOptions); + return super.post( + API_CONTEXT + '/online/onlineOperation/deleteDatasource', + params, + httpOptions, + ); } static deleteOneToManyRelation(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post( + return super.post( API_CONTEXT + '/online/onlineOperation/deleteOneToManyRelation', params, httpOptions, @@ -82,10 +90,14 @@ export default class OnlineOperationController extends BaseController { } static getColumnRuleCode(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/online/onlineOperation/getColumnRuleCode', params, httpOptions); + return super.get( + API_CONTEXT + '/online/onlineOperation/getColumnRuleCode', + params, + httpOptions, + ); } static getPrintTemplate(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/report/reportPrint/listAll', params, httpOptions); + return super.post(API_CONTEXT + '/report/reportPrint/listAll', params, httpOptions); } } diff --git a/OrangeFormsOpen-VUE3/src/api/online/OnlinePageController.ts b/OrangeFormsOpen-VUE3/src/api/online/OnlinePageController.ts index 623c1ff6..7a419551 100644 --- a/OrangeFormsOpen-VUE3/src/api/online/OnlinePageController.ts +++ b/OrangeFormsOpen-VUE3/src/api/online/OnlinePageController.ts @@ -7,7 +7,7 @@ import { API_CONTEXT } from '../config'; export default class OnlinePageController extends BaseController { static list(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/online/onlinePage/list', params, httpOptions, @@ -15,7 +15,7 @@ export default class OnlinePageController extends BaseController { } static listAllPageAndForm(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post( + return super.post( API_CONTEXT + '/online/onlinePage/listAllPageAndForm', params, httpOptions, @@ -23,7 +23,7 @@ export default class OnlinePageController extends BaseController { } static view(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/online/onlinePage/view', params, httpOptions); + return super.get(API_CONTEXT + '/online/onlinePage/view', params, httpOptions); } // static export(sender, params, fileName) { @@ -31,27 +31,27 @@ export default class OnlinePageController extends BaseController { // } static add(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlinePage/add', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlinePage/add', params, httpOptions); } static update(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlinePage/update', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlinePage/update', params, httpOptions); } static updatePublished(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlinePage/updatePublished', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlinePage/updatePublished', params, httpOptions); } static delete(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlinePage/delete', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlinePage/delete', params, httpOptions); } static updateStatus(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlinePage/updateStatus', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlinePage/updateStatus', params, httpOptions); } static listOnlinePageDatasource(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/online/onlinePage/listOnlinePageDatasource', params, httpOptions, @@ -59,7 +59,7 @@ export default class OnlinePageController extends BaseController { } static listNotInOnlinePageDatasource(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post( + return super.post( API_CONTEXT + '/online/onlinePage/listNotInOnlinePageDatasource', params, httpOptions, @@ -67,7 +67,7 @@ export default class OnlinePageController extends BaseController { } static addOnlinePageDatasource(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post( + return super.post( API_CONTEXT + '/online/onlinePage/addOnlinePageDatasource', params, httpOptions, @@ -75,7 +75,7 @@ export default class OnlinePageController extends BaseController { } static deleteOnlinePageDatasource(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post( + return super.post( API_CONTEXT + '/online/onlinePage/deleteOnlinePageDatasource', params, httpOptions, @@ -83,7 +83,7 @@ export default class OnlinePageController extends BaseController { } static updateOnlinePageDatasource(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post( + return super.post( API_CONTEXT + '/online/onlinePage/updateOnlinePageDatasource', params, httpOptions, @@ -91,7 +91,7 @@ export default class OnlinePageController extends BaseController { } static viewOnlinePageDatasource(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/online/onlinePage/viewOnlinePageDatasource', params, httpOptions, diff --git a/OrangeFormsOpen-VUE3/src/api/online/OnlineRuleController.ts b/OrangeFormsOpen-VUE3/src/api/online/OnlineRuleController.ts index bd753b2e..a09f6335 100644 --- a/OrangeFormsOpen-VUE3/src/api/online/OnlineRuleController.ts +++ b/OrangeFormsOpen-VUE3/src/api/online/OnlineRuleController.ts @@ -6,7 +6,7 @@ import { API_CONTEXT } from '../config'; export default class OnlineRuleController extends BaseController { static list(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/online/onlineRule/list', params, httpOptions, @@ -14,7 +14,7 @@ export default class OnlineRuleController extends BaseController { } static view(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/online/onlineRule/view', params, httpOptions); + return super.get(API_CONTEXT + '/online/onlineRule/view', params, httpOptions); } // static export(sender, params, fileName) { @@ -22,14 +22,14 @@ export default class OnlineRuleController extends BaseController { // } static add(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineRule/add', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineRule/add', params, httpOptions); } static update(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineRule/update', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineRule/update', params, httpOptions); } static delete(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineRule/delete', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineRule/delete', params, httpOptions); } } diff --git a/OrangeFormsOpen-VUE3/src/api/online/OnlineVirtualColumnController.ts b/OrangeFormsOpen-VUE3/src/api/online/OnlineVirtualColumnController.ts index 74ae18fd..9d6df251 100644 --- a/OrangeFormsOpen-VUE3/src/api/online/OnlineVirtualColumnController.ts +++ b/OrangeFormsOpen-VUE3/src/api/online/OnlineVirtualColumnController.ts @@ -6,7 +6,7 @@ import { API_CONTEXT } from '../config'; export default class OnlineVirtualColumnController extends BaseController { static list(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/online/onlineVirtualColumn/list', params, httpOptions, @@ -14,7 +14,7 @@ export default class OnlineVirtualColumnController extends BaseController { } static view(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/online/onlineVirtualColumn/view', params, httpOptions, @@ -22,14 +22,14 @@ export default class OnlineVirtualColumnController extends BaseController { } static add(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineVirtualColumn/add', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineVirtualColumn/add', params, httpOptions); } static update(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineVirtualColumn/update', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineVirtualColumn/update', params, httpOptions); } static delete(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/online/onlineVirtualColumn/delete', params, httpOptions); + return super.post(API_CONTEXT + '/online/onlineVirtualColumn/delete', params, httpOptions); } } diff --git a/OrangeFormsOpen-VUE3/src/api/system/DictionaryController.ts b/OrangeFormsOpen-VUE3/src/api/system/DictionaryController.ts index 9477a3ce..ab8648ab 100644 --- a/OrangeFormsOpen-VUE3/src/api/system/DictionaryController.ts +++ b/OrangeFormsOpen-VUE3/src/api/system/DictionaryController.ts @@ -7,7 +7,7 @@ import { API_CONTEXT } from '../config'; export default class DictionaryController extends BaseController { static dictSysRole(params: ANY_OBJECT, httpOptions?: RequestOption) { return new Promise((resolve, reject) => { - this.get(API_CONTEXT + '/upms/sysRole/listDict', params, httpOptions) + super.get(API_CONTEXT + '/upms/sysRole/listDict', params, httpOptions) .then(res => { const dictData = new DictionaryBase('角色字典', res.data); resolve(dictData); @@ -20,7 +20,7 @@ export default class DictionaryController extends BaseController { // 全局编码字典 static dictGlobalDict(params: ANY_OBJECT, httpOptions?: RequestOption) { return new Promise((resolve, reject) => { - this.get(API_CONTEXT + '/upms/globalDict/listDict', params, httpOptions) + super.get(API_CONTEXT + '/upms/globalDict/listDict', params, httpOptions) .then(res => { const dictData = new DictionaryBase( '编码字典', @@ -42,7 +42,7 @@ export default class DictionaryController extends BaseController { static dictGlobalDictByIds(params: ANY_OBJECT, httpOptions?: RequestOption) { return new Promise((resolve, reject) => { - this.get(API_CONTEXT + '/upms/globalDict/listDictByIds', params, httpOptions) + super.get(API_CONTEXT + '/upms/globalDict/listDictByIds', params, httpOptions) .then(res => { const dictData = new DictionaryBase('编码字典', res.data); resolve(dictData); @@ -55,7 +55,7 @@ export default class DictionaryController extends BaseController { static dictSysDept(params: ANY_OBJECT, httpOptions?: RequestOption) { return new Promise((resolve, reject) => { - this.get(API_CONTEXT + '/upms/sysDept/listDict', params, httpOptions) + super.get(API_CONTEXT + '/upms/sysDept/listDict', params, httpOptions) .then(res => { const dictData = new DictionaryBase('部门字典', res.data); resolve(dictData); @@ -71,7 +71,7 @@ export default class DictionaryController extends BaseController { httpOptions?: RequestOption, ): Promise { return new Promise((resolve, reject) => { - this.get(API_CONTEXT + '/upms/sysDept/listDictByParentId', params, httpOptions) + super.get(API_CONTEXT + '/upms/sysDept/listDictByParentId', params, httpOptions) .then(res => { const dictData = new DictionaryBase('部门字典', res.data); resolve(dictData); @@ -84,7 +84,7 @@ export default class DictionaryController extends BaseController { static dictSysMenu(params: ANY_OBJECT, httpOptions?: RequestOption): Promise { return new Promise((resolve, reject) => { - this.get(API_CONTEXT + '/upms/sysMenu/listMenuDict', params, httpOptions) + super.get(API_CONTEXT + '/upms/sysMenu/listMenuDict', params, httpOptions) .then(res => { const dictData = new DictionaryBase('菜单字典', res.data); resolve(dictData); @@ -97,7 +97,7 @@ export default class DictionaryController extends BaseController { static dictDeptPost(params: ANY_OBJECT, httpOptions?: RequestOption): Promise { return new Promise((resolve, reject) => { - this.get( + super.get( API_CONTEXT + '/upms/sysDept/listSysDeptPostWithRelation', params, httpOptions, @@ -112,7 +112,7 @@ export default class DictionaryController extends BaseController { } static dictSysPost(params: ANY_OBJECT, httpOptions?: RequestOption) { return new Promise((resolve, reject) => { - this.get(API_CONTEXT + '/upms/sysPost/listDict', params, httpOptions) + super.get(API_CONTEXT + '/upms/sysPost/listDict', params, httpOptions) .then(res => { const dictData = new DictionaryBase('岗位字典', res.data); resolve(dictData); @@ -125,7 +125,7 @@ export default class DictionaryController extends BaseController { static dictReportDblink(params: ANY_OBJECT, httpOptions?: RequestOption) { return new Promise((resolve, reject) => { - this.get(API_CONTEXT + '/report/reportDblink/listDict', params, httpOptions) + super.get(API_CONTEXT + '/report/reportDblink/listDict', params, httpOptions) .then(res => { const dictData = new DictionaryBase('数据库链接', res.data); resolve(dictData); @@ -138,7 +138,7 @@ export default class DictionaryController extends BaseController { static dictReportDict(params: ANY_OBJECT, httpOptions?: RequestOption) { return new Promise((resolve, reject) => { - this.get(API_CONTEXT + '/report/reportDict/listDict', params, httpOptions) + super.get(API_CONTEXT + '/report/reportDict/listDict', params, httpOptions) .then(res => { const dictData = new DictionaryBase('报表字典', res.data); resolve(dictData); @@ -150,7 +150,7 @@ export default class DictionaryController extends BaseController { } static dictAreaCode(params: ANY_OBJECT, httpOptions?: RequestOption) { return new Promise((resolve, reject) => { - this.get(API_CONTEXT + '/app/areaCode/listDict', params, httpOptions) + super.get(API_CONTEXT + '/app/areaCode/listDict', params, httpOptions) .then(res => { const dictData = new DictionaryBase('行政区划', res.data); resolve(dictData); @@ -163,7 +163,7 @@ export default class DictionaryController extends BaseController { static dictAreaCodeByParentId(params: ANY_OBJECT, httpOptions?: RequestOption) { return new Promise((resolve, reject) => { - this.get(API_CONTEXT + '/app/areaCode/listDictByParentId', params, httpOptions) + super.get(API_CONTEXT + '/app/areaCode/listDictByParentId', params, httpOptions) .then(res => { const dictData = new DictionaryBase('行政区划', res.data); resolve(dictData); @@ -177,7 +177,7 @@ export default class DictionaryController extends BaseController { // 业务相关的接口 static dictKnowledge(params: ANY_OBJECT, httpOptions?: RequestOption) { return new Promise((resolve, reject) => { - this.get('/admin/app/knowledge/listDict', params, httpOptions) + super.get('/admin/app/knowledge/listDict', params, httpOptions) .then(res => { const dictData = new DictionaryBase('知识点字典', res.data); resolve(dictData); @@ -190,7 +190,7 @@ export default class DictionaryController extends BaseController { static dictStudent(params: ANY_OBJECT, httpOptions?: RequestOption) { return new Promise((resolve, reject) => { - this.get(API_CONTEXT + '/app/student/listDict', params, httpOptions) + super.get(API_CONTEXT + '/app/student/listDict', params, httpOptions) .then(res => { const dictData = new DictionaryBase('学生字典', res.data); dictData.setList(res.data); @@ -204,7 +204,7 @@ export default class DictionaryController extends BaseController { static dictTeacher(params: ANY_OBJECT, httpOptions?: RequestOption) { return new Promise((resolve, reject) => { - this.get('/admin/app/teacher/listDict', params, httpOptions) + super.get('/admin/app/teacher/listDict', params, httpOptions) .then(res => { const dictData = new DictionaryBase('老师字典', res.data); resolve(dictData); diff --git a/OrangeFormsOpen-VUE3/src/api/system/LoginController.ts b/OrangeFormsOpen-VUE3/src/api/system/LoginController.ts index 80c44ee3..6f4cacaf 100644 --- a/OrangeFormsOpen-VUE3/src/api/system/LoginController.ts +++ b/OrangeFormsOpen-VUE3/src/api/system/LoginController.ts @@ -5,10 +5,10 @@ import { API_CONTEXT } from '../config'; export default class LoginController extends BaseController { static login(params: loginParam) { - return this.post(API_CONTEXT + '/upms/login/doLogin', params); + return super.post(API_CONTEXT + '/upms/login/doLogin', params); } static logout() { - return this.post(API_CONTEXT + '/upms/login/doLogout', {}); + return super.post(API_CONTEXT + '/upms/login/doLogout', {}); } } diff --git a/OrangeFormsOpen-VUE3/src/api/system/LoginUserController.ts b/OrangeFormsOpen-VUE3/src/api/system/LoginUserController.ts index c6176108..8f3093e9 100644 --- a/OrangeFormsOpen-VUE3/src/api/system/LoginUserController.ts +++ b/OrangeFormsOpen-VUE3/src/api/system/LoginUserController.ts @@ -8,7 +8,7 @@ import { API_CONTEXT } from '../config'; export default class LoginUserController extends BaseController { // 在线用户查询 static listSysLoginUser(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/upms/loginUser/list', params, httpOptions, @@ -16,6 +16,6 @@ export default class LoginUserController extends BaseController { } // 强退 static deleteSysLoginUser(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/loginUser/delete', params, httpOptions); + return super.post(API_CONTEXT + '/upms/loginUser/delete', params, httpOptions); } } diff --git a/OrangeFormsOpen-VUE3/src/api/system/MenuController.ts b/OrangeFormsOpen-VUE3/src/api/system/MenuController.ts index cb9ddb2f..c963a32f 100644 --- a/OrangeFormsOpen-VUE3/src/api/system/MenuController.ts +++ b/OrangeFormsOpen-VUE3/src/api/system/MenuController.ts @@ -6,31 +6,31 @@ import { API_CONTEXT } from '../config'; export default class SystemMenuController extends BaseController { static getMenuPermList(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysMenu/list', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysMenu/list', params, httpOptions); } static addMenu(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysMenu/add', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysMenu/add', params, httpOptions); } static updateMenu(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysMenu/update', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysMenu/update', params, httpOptions); } static deleteMenu(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysMenu/delete', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysMenu/delete', params, httpOptions); } static viewMenu(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/upms/sysMenu/view', params, httpOptions); + return super.get(API_CONTEXT + '/upms/sysMenu/view', params, httpOptions); } static listMenuPermCode(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/upms/sysMenu/listMenuPerm', params, httpOptions); + return super.get(API_CONTEXT + '/upms/sysMenu/listMenuPerm', params, httpOptions); } static listSysPermByMenuIdWithDetail(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/upms/sysMenu/listSysPermWithDetail', params, httpOptions, @@ -38,7 +38,7 @@ export default class SystemMenuController extends BaseController { } static listSysUserByMenuIdWithDetail(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/upms/sysMenu/listSysUserWithDetail', params, httpOptions, diff --git a/OrangeFormsOpen-VUE3/src/api/system/MobileEntryController.ts b/OrangeFormsOpen-VUE3/src/api/system/MobileEntryController.ts index 5066bac2..6456a3a2 100644 --- a/OrangeFormsOpen-VUE3/src/api/system/MobileEntryController.ts +++ b/OrangeFormsOpen-VUE3/src/api/system/MobileEntryController.ts @@ -5,7 +5,7 @@ import { API_CONTEXT } from '../config'; export default class MobileEntryController extends BaseController { static list(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/mobile/mobileEntry/list', params, httpOptions, @@ -13,7 +13,7 @@ export default class MobileEntryController extends BaseController { } static view(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/mobile/mobileEntry/view', params, httpOptions); + return super.get(API_CONTEXT + '/mobile/mobileEntry/view', params, httpOptions); } // static export(sender, params, fileName) { @@ -21,22 +21,22 @@ export default class MobileEntryController extends BaseController { // } static add(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/mobile/mobileEntry/add', params, httpOptions); + return super.post(API_CONTEXT + '/mobile/mobileEntry/add', params, httpOptions); } static update(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/mobile/mobileEntry/update', params, httpOptions); + return super.post(API_CONTEXT + '/mobile/mobileEntry/update', params, httpOptions); } static delete(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/mobile/mobileEntry/delete', params, httpOptions); + return super.post(API_CONTEXT + '/mobile/mobileEntry/delete', params, httpOptions); } static uploadImage(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/mobile/mobileEntry/uploadImage', params, httpOptions); + return super.post(API_CONTEXT + '/mobile/mobileEntry/uploadImage', params, httpOptions); } static downloadImage(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/mobile/mobileEntry/downloadImage', params, httpOptions); + return super.post(API_CONTEXT + '/mobile/mobileEntry/downloadImage', params, httpOptions); } } diff --git a/OrangeFormsOpen-VUE3/src/api/system/OperationLogController.ts b/OrangeFormsOpen-VUE3/src/api/system/OperationLogController.ts index d63f12ed..2d504b11 100644 --- a/OrangeFormsOpen-VUE3/src/api/system/OperationLogController.ts +++ b/OrangeFormsOpen-VUE3/src/api/system/OperationLogController.ts @@ -6,7 +6,7 @@ import { API_CONTEXT } from '../config'; export default class OperationLogController extends BaseController { static listSysOperationLog(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/upms/sysOperationLog/list', params, httpOptions, diff --git a/OrangeFormsOpen-VUE3/src/api/system/PermCodeController.ts b/OrangeFormsOpen-VUE3/src/api/system/PermCodeController.ts index 50cbe25a..a2b40298 100644 --- a/OrangeFormsOpen-VUE3/src/api/system/PermCodeController.ts +++ b/OrangeFormsOpen-VUE3/src/api/system/PermCodeController.ts @@ -8,6 +8,6 @@ import { API_CONTEXT } from '../config'; export default class PermCodeController extends BaseController { static getPermCodeList(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/upms/login/getAllPermCodes', params, httpOptions); + return super.get(API_CONTEXT + '/upms/login/getAllPermCodes', params, httpOptions); } } diff --git a/OrangeFormsOpen-VUE3/src/api/system/PermController.ts b/OrangeFormsOpen-VUE3/src/api/system/PermController.ts index 54afc0fc..92fbc1e0 100644 --- a/OrangeFormsOpen-VUE3/src/api/system/PermController.ts +++ b/OrangeFormsOpen-VUE3/src/api/system/PermController.ts @@ -9,27 +9,27 @@ import { API_CONTEXT } from '../config'; export default class PermController extends BaseController { static getPermList(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>(API_CONTEXT + '/upms/sysPerm/list', params, httpOptions); + return super.post>(API_CONTEXT + '/upms/sysPerm/list', params, httpOptions); } static viewPerm(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/upms/sysPerm/view', params, httpOptions); + return super.get(API_CONTEXT + '/upms/sysPerm/view', params, httpOptions); } static addPerm(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysPerm/add', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysPerm/add', params, httpOptions); } static updatePerm(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysPerm/update', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysPerm/update', params, httpOptions); } static deletePerm(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysPerm/delete', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysPerm/delete', params, httpOptions); } static getAllPermList(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post( + return super.post( API_CONTEXT + '/upms/sysPermModule/listAll', params, httpOptions, @@ -37,23 +37,23 @@ export default class PermController extends BaseController { } static getPermGroupList(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysPermModule/list', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysPermModule/list', params, httpOptions); } static addPermGroup(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysPermModule/add', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysPermModule/add', params, httpOptions); } static updatePermGroup(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysPermModule/update', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysPermModule/update', params, httpOptions); } static deletePermGroup(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysPermModule/delete', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysPermModule/delete', params, httpOptions); } static listSysUserByPermIdWithDetail(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/upms/sysPerm/listSysUserWithDetail', params, httpOptions, @@ -61,7 +61,7 @@ export default class PermController extends BaseController { } static listSysRoleByPermIdWithDetail(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/upms/sysPerm/listSysRoleWithDetail', params, httpOptions, @@ -69,7 +69,7 @@ export default class PermController extends BaseController { } static listSysMenuByPermIdWithDetail(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get( + return super.get( API_CONTEXT + '/upms/sysPerm/listSysMenuWithDetail', params, httpOptions, @@ -77,7 +77,7 @@ export default class PermController extends BaseController { } static listSysPermByRoleIdWithDetail(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get>( + return super.get>( API_CONTEXT + '/upms/sysRole/listSysPermWithDetail', params, httpOptions, diff --git a/OrangeFormsOpen-VUE3/src/api/system/SysCommonBizController.ts b/OrangeFormsOpen-VUE3/src/api/system/SysCommonBizController.ts index 592ac936..a7659ca1 100644 --- a/OrangeFormsOpen-VUE3/src/api/system/SysCommonBizController.ts +++ b/OrangeFormsOpen-VUE3/src/api/system/SysCommonBizController.ts @@ -6,13 +6,13 @@ import { API_CONTEXT } from '../config'; export default class SysCommonBizController extends BaseController { static list(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/commonext/bizwidget/list', params, httpOptions, ); } static viewByIds(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/commonext/bizwidget/view', params, httpOptions); + return super.post(API_CONTEXT + '/commonext/bizwidget/view', params, httpOptions); } } diff --git a/OrangeFormsOpen-VUE3/src/api/system/SysDataPermController.ts b/OrangeFormsOpen-VUE3/src/api/system/SysDataPermController.ts index d0dc1d74..898a0973 100644 --- a/OrangeFormsOpen-VUE3/src/api/system/SysDataPermController.ts +++ b/OrangeFormsOpen-VUE3/src/api/system/SysDataPermController.ts @@ -10,28 +10,28 @@ export default class SysDataPermController extends BaseController { * @param params {dataPermId, dataPermName, deptIdListString} */ static add(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysDataPerm/add', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysDataPerm/add', params, httpOptions); } /** * @param params {dataPermId, dataPermName, deptIdListString} */ static update(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysDataPerm/update', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysDataPerm/update', params, httpOptions); } /** * @param params {dataPermId} */ static delete(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysDataPerm/delete', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysDataPerm/delete', params, httpOptions); } /** * @param params {dataPermName} */ static list(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/upms/sysDataPerm/list', params, httpOptions, @@ -42,14 +42,14 @@ export default class SysDataPermController extends BaseController { * @param params {dataPermId} */ static view(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/upms/sysDataPerm/view', params, httpOptions); + return super.get(API_CONTEXT + '/upms/sysDataPerm/view', params, httpOptions); } /** * @param params {dataPermId, searchString} */ static listDataPermUser(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/upms/sysDataPerm/listDataPermUser', params, httpOptions, @@ -60,18 +60,18 @@ export default class SysDataPermController extends BaseController { * @param params {dataPermId, userIdListString} */ static addDataPermUser(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysDataPerm/addDataPermUser', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysDataPerm/addDataPermUser', params, httpOptions); } /** * @param params {dataPermId, userId} */ static deleteDataPermUser(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysDataPerm/deleteDataPermUser', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysDataPerm/deleteDataPermUser', params, httpOptions); } static listNotInDataPermUser(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/upms/sysDataPerm/listNotInDataPermUser', params, httpOptions, diff --git a/OrangeFormsOpen-VUE3/src/api/system/SysDeptController.ts b/OrangeFormsOpen-VUE3/src/api/system/SysDeptController.ts index 5c303c40..3bd37d07 100644 --- a/OrangeFormsOpen-VUE3/src/api/system/SysDeptController.ts +++ b/OrangeFormsOpen-VUE3/src/api/system/SysDeptController.ts @@ -6,31 +6,31 @@ import { API_CONTEXT } from '../config'; export default class SysDeptController extends BaseController { static list(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>(API_CONTEXT + '/upms/sysDept/list', params, httpOptions); + return super.post>(API_CONTEXT + '/upms/sysDept/list', params, httpOptions); } static view(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/upms/sysDept/view', params, httpOptions); + return super.get(API_CONTEXT + '/upms/sysDept/view', params, httpOptions); } static export(params: ANY_OBJECT, fileName: string) { - return this.download(API_CONTEXT + '/upms/sysDept/export', params, fileName); + return super.download(API_CONTEXT + '/upms/sysDept/export', params, fileName); } static add(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysDept/add', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysDept/add', params, httpOptions); } static update(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysDept/update', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysDept/update', params, httpOptions); } static delete(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysDept/delete', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysDept/delete', params, httpOptions); } static listNotInSysDeptPost(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/upms/sysDept/listNotInSysDeptPost', params, httpOptions, @@ -38,7 +38,7 @@ export default class SysDeptController extends BaseController { } static listSysDeptPost(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/upms/sysDept/listSysDeptPost', params, httpOptions, @@ -46,18 +46,18 @@ export default class SysDeptController extends BaseController { } static addSysDeptPost(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysDept/addSysDeptPost', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysDept/addSysDeptPost', params, httpOptions); } static updateSysDeptPost(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysDept/updateSysDeptPost', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysDept/updateSysDeptPost', params, httpOptions); } static deleteSysDeptPost(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysDept/deleteSysDeptPost', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysDept/deleteSysDeptPost', params, httpOptions); } static viewSysDeptPost(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/upms/sysDept/viewSysDeptPost', params, httpOptions); + return super.get(API_CONTEXT + '/upms/sysDept/viewSysDeptPost', params, httpOptions); } } diff --git a/OrangeFormsOpen-VUE3/src/api/system/SysGlobalDictController.ts b/OrangeFormsOpen-VUE3/src/api/system/SysGlobalDictController.ts index 0b5800e9..bdb16c70 100644 --- a/OrangeFormsOpen-VUE3/src/api/system/SysGlobalDictController.ts +++ b/OrangeFormsOpen-VUE3/src/api/system/SysGlobalDictController.ts @@ -15,7 +15,6 @@ export default class SysGlobalDictController { } static listAll(params: ANY_OBJECT, httpOptions?: RequestOption) { - console.log(this); return get(API_CONTEXT + '/upms/globalDict/listAll', params, httpOptions); } diff --git a/OrangeFormsOpen-VUE3/src/api/system/SysPostController.ts b/OrangeFormsOpen-VUE3/src/api/system/SysPostController.ts index 1ccdb02a..ea31dc15 100644 --- a/OrangeFormsOpen-VUE3/src/api/system/SysPostController.ts +++ b/OrangeFormsOpen-VUE3/src/api/system/SysPostController.ts @@ -6,22 +6,22 @@ import { API_CONTEXT } from '../config'; export default class SysPostController extends BaseController { static list(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>(API_CONTEXT + '/upms/sysPost/list', params, httpOptions); + return super.post>(API_CONTEXT + '/upms/sysPost/list', params, httpOptions); } static view(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/upms/sysPost/view', params, httpOptions); + return super.get(API_CONTEXT + '/upms/sysPost/view', params, httpOptions); } static add(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysPost/add', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysPost/add', params, httpOptions); } static update(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysPost/update', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysPost/update', params, httpOptions); } static delete(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysPost/delete', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysPost/delete', params, httpOptions); } } diff --git a/OrangeFormsOpen-VUE3/src/api/system/SystemRoleController.ts b/OrangeFormsOpen-VUE3/src/api/system/SystemRoleController.ts index 1fe72ba3..2ebfdbf7 100644 --- a/OrangeFormsOpen-VUE3/src/api/system/SystemRoleController.ts +++ b/OrangeFormsOpen-VUE3/src/api/system/SystemRoleController.ts @@ -7,30 +7,30 @@ import { API_CONTEXT } from '../config'; export default class SystemRoleController extends BaseController { static getRoleList(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>(API_CONTEXT + '/upms/sysRole/list', params, httpOptions); + return super.post>(API_CONTEXT + '/upms/sysRole/list', params, httpOptions); } static getRole(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/upms/sysRole/view', params, httpOptions); + return super.get(API_CONTEXT + '/upms/sysRole/view', params, httpOptions); } static deleteRole(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysRole/delete', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysRole/delete', params, httpOptions); } static addRole(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysRole/add', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysRole/add', params, httpOptions); } static updateRole(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysRole/update', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysRole/update', params, httpOptions); } /** * @param params {roleId, searchString} */ static listRoleUser(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/upms/sysRole/listUserRole', params, httpOptions, @@ -38,7 +38,7 @@ export default class SystemRoleController extends BaseController { } static listNotInUserRole(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>( + return super.post>( API_CONTEXT + '/upms/sysRole/listNotInUserRole', params, httpOptions, @@ -49,13 +49,13 @@ export default class SystemRoleController extends BaseController { * @param params {roleId, userIdListString} */ static addRoleUser(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysRole/addUserRole', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysRole/addUserRole', params, httpOptions); } /** * @param params {roleId, userId} */ static deleteRoleUser(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysRole/deleteUserRole', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysRole/deleteUserRole', params, httpOptions); } } diff --git a/OrangeFormsOpen-VUE3/src/api/system/UserController.ts b/OrangeFormsOpen-VUE3/src/api/system/UserController.ts index 12f06ccd..091dfd54 100644 --- a/OrangeFormsOpen-VUE3/src/api/system/UserController.ts +++ b/OrangeFormsOpen-VUE3/src/api/system/UserController.ts @@ -9,35 +9,35 @@ import { API_CONTEXT } from '../config'; export default class SystemUserController extends BaseController { static getUserList(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post>(API_CONTEXT + '/upms/sysUser/list', params, httpOptions); + return super.post>(API_CONTEXT + '/upms/sysUser/list', params, httpOptions); } static addUser(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysUser/add', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysUser/add', params, httpOptions); } static updateUser(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysUser/update', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysUser/update', params, httpOptions); } static deleteUser(params: User, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysUser/delete', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysUser/delete', params, httpOptions); } static viewMenu(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysMenu/view', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysMenu/view', params, httpOptions); } static getUser(params: User, httpOptions?: RequestOption) { - return this.get(API_CONTEXT + '/upms/sysUser/view', params, httpOptions); + return super.get(API_CONTEXT + '/upms/sysUser/view', params, httpOptions); } static resetUserPassword(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.post(API_CONTEXT + '/upms/sysUser/resetPassword', params, httpOptions); + return super.post(API_CONTEXT + '/upms/sysUser/resetPassword', params, httpOptions); } static listSysPermWithDetail(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get>( + return super.get>( API_CONTEXT + '/upms/sysUser/listSysPermWithDetail', params, httpOptions, @@ -45,7 +45,7 @@ export default class SystemUserController extends BaseController { } static listSysPermCodeWithDetail(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get>( + return super.get>( API_CONTEXT + '/upms/sysUser/listSysPermCodeWithDetail', params, httpOptions, @@ -53,7 +53,7 @@ export default class SystemUserController extends BaseController { } static listSysMenuWithDetail(params: ANY_OBJECT, httpOptions?: RequestOption) { - return this.get>( + return super.get>( API_CONTEXT + '/upms/sysUser/listSysMenuWithDetail', params, httpOptions, diff --git a/OrangeFormsOpen-VUE3/src/assets/skin/orange/index.scss b/OrangeFormsOpen-VUE3/src/assets/skin/orange/index.scss index 39d462f4..033dfa84 100644 --- a/OrangeFormsOpen-VUE3/src/assets/skin/orange/index.scss +++ b/OrangeFormsOpen-VUE3/src/assets/skin/orange/index.scss @@ -5,7 +5,6 @@ $color-white: #fff; $color-primary-light-9: color-mix(in srgb, $color-white 90%, $color-primary 10%) !default; $color-text-secondary: #909399 !default; @forward 'element-plus/theme-chalk/src/common/var.scss' with ( - // do not use same name, it will override. $colors: ( 'primary': ( 'base': $color-primary, @@ -74,11 +73,9 @@ $radio-font-size: map.merge( ); @use '@/assets/style/base.scss'; -// 覆盖原样式，否则它会遮盖弹出对话框 :deep(.vxe-table--empty-placeholder) { z-index: 0; } -// messagebox会被layer遮盖，因为下面这个样式对应的元素没有设置z-index，尽管其父元素设置了 .el-overlay-message-box { z-index: 2000; } diff --git a/OrangeFormsOpen-VUE3/src/assets/style/base.scss b/OrangeFormsOpen-VUE3/src/assets/style/base.scss index 3600236f..7dc9eaf6 100644 --- a/OrangeFormsOpen-VUE3/src/assets/style/base.scss +++ b/OrangeFormsOpen-VUE3/src/assets/style/base.scss @@ -1,13 +1,9 @@ -// @import url('element-variables'); -// @import url('transition'); - html, body { padding: 0; margin: 0; font-size: 14px; font-family: Arial,'Helvetica Neue',Helvetica,'PingFang SC','Hiragino Sans GB','Microsoft YaHei','微软雅黑',sans-serif; background-color: rgb(228 240 255); - //background-color: white; } *, @@ -1030,8 +1026,6 @@ $--color-primary-light-9: color-mix(in srgb, $--color-white 90%, $--color-primar font-weight: bold !important; } -// element-plus尺寸去除了medium,small变的更小了 -//.container-small, [class^='el-'][class*='small']{ .container-default, [class^='el-'][class*='default']{ font-weight: normal; .el-tree,.el-input input,.el-radio__label,.el-checkbox__label,.el-switch__label *,.el-upload-list__item,.el-upload__tip,.vxe-cell--label,.vxe-cell--title,.el-tabs__item,.el-breadcrumb,.el-pager li,.el-pagination__total,label,.el-form-item__label,.el-table .cell,.user-dropdown,.el-select-dropdown__item,.el-cascader-node__label,.vxe-table--render-default.size--small,.el-tree-node__label,.el-dropdown-menu__item,.table-btn,.unified-font,.custom-label,.el-link span,.group-title,.el-radio-button__inner,.el-collapse-item__header{ @@ -1052,8 +1046,6 @@ $--color-primary-light-9: color-mix(in srgb, $--color-white 90%, $--color-primar } } -// element-plus尺寸去除了medium -//.container-medium, [class^='el-'][class*='medium']{ .container-large, [class^='el-'][class*='large']{ .vxe-cell--title{ font-weight: bold; diff --git a/OrangeFormsOpen-VUE3/src/common/hooks/useUpload.ts b/OrangeFormsOpen-VUE3/src/common/hooks/useUpload.ts index 58bc3409..bc8c9bb5 100644 --- a/OrangeFormsOpen-VUE3/src/common/hooks/useUpload.ts +++ b/OrangeFormsOpen-VUE3/src/common/hooks/useUpload.ts @@ -12,7 +12,10 @@ export const useUpload = () => { * @param {Object} params 上传文件的参数 * @returns {Array} 上传文件信息，[{name, downloadUri, filename, url}] */ - const parseUploadData = (jsonData: string, params: ANY_OBJECT) => { + const parseUploadData = ( + jsonData: string | null | undefined, + params: ANY_OBJECT, + ): ANY_OBJECT[] => { let pathList: Array = []; if (jsonData != null) { try { diff --git a/OrangeFormsOpen-VUE3/src/common/hooks/useUploadWidget.ts b/OrangeFormsOpen-VUE3/src/common/hooks/useUploadWidget.ts index 5ae27ec8..236a1a31 100644 --- a/OrangeFormsOpen-VUE3/src/common/hooks/useUploadWidget.ts +++ b/OrangeFormsOpen-VUE3/src/common/hooks/useUploadWidget.ts @@ -1,7 +1,8 @@ import { UploadFile } from 'element-plus'; +import { ANY_OBJECT } from '@/types/generic'; export const useUploadWidget = (maxFileCount = 1) => { - const fileList = ref([]); + const fileList = ref>([]); const maxCount = ref(maxFileCount); /** @@ -9,7 +10,10 @@ export const useUploadWidget = (maxFileCount = 1) => { * @param {Object} uploadFile 改变的文件 * @param {Array} uploadFiles 改变后的文件列表 */ - const onFileChange = (uploadFile: UploadFile | null, uploadFiles: UploadFile[] | null) => { + const onFileChange = ( + uploadFile: UploadFile | ANY_OBJECT | null, + uploadFiles: Array | null, + ) => { if (uploadFiles && uploadFiles.length > 0) { if (maxFileCount == 1) { fileList.value = [uploadFiles[uploadFiles.length - 1]]; diff --git a/OrangeFormsOpen-VUE3/src/components/Dialog/index.ts b/OrangeFormsOpen-VUE3/src/components/Dialog/index.ts index f9892cc3..6deb059e 100644 --- a/OrangeFormsOpen-VUE3/src/components/Dialog/index.ts +++ b/OrangeFormsOpen-VUE3/src/components/Dialog/index.ts @@ -73,7 +73,9 @@ export class Dialog { let layerOptions: ANY_OBJECT = { title: title, type: 1, - skin: 'layui-layer-page', + skin: + 'layui-layer-page ' + + (window.innerWidth <= 1900 ? 'container-default' : 'container-large'), resize: false, offset: 'auto', shadeClose: false, diff --git a/OrangeFormsOpen-VUE3/src/components/SpreadSheet/index.scss b/OrangeFormsOpen-VUE3/src/components/SpreadSheet/index.scss index 3af44c24..98883122 100644 --- a/OrangeFormsOpen-VUE3/src/components/SpreadSheet/index.scss +++ b/OrangeFormsOpen-VUE3/src/components/SpreadSheet/index.scss @@ -1,5 +1,5 @@ $css-prefix: x-spreadsheet; -// color + $red-color: #DB2828; $red-hover-color: #d01919; $orange-color: #F2711C; @@ -29,7 +29,6 @@ $dark-hover-color: color-mix($dark-color, 10%); $black-color: #1B1C1D; $black-hover-color: #27292a; -// base $border-style: 1px solid #e0e2e4; $icon-size: 18px; $line-height: 1.25em; @@ -43,9 +42,6 @@ $form-field-height: 30px; $primary-color: $blue-color; $primary-hover-color: $blue-hover-color; -// method - - .x-spreadsheet { font-size: 13px; font-family: Lato, 'Source Sans Pro', Roboto, Helvetica, Arial, sans-serif; @@ -69,13 +65,11 @@ $primary-hover-color: $blue-hover-color; } .x-spreadsheet-table { - // html5 bottom margin bug vertical-align: bottom; } .x-spreadsheet-tooltip { position: absolute; - // 这个组件在全屏dialog中用，全局中有z值会比这个默认值高 z-index: 9999; padding: 5px 10px; font-size: 12px; @@ -295,7 +289,6 @@ $primary-hover-color: $blue-hover-color; } } &:hover { - // opacity: .85; } } @@ -351,7 +344,7 @@ $primary-hover-color: $blue-hover-color; border: 2px dashed rgb(75 137 255); } .x-spreadsheet-selector-autofill { - border: 1px dashed rgb(0 0 0 / 45%); // #606060; // rgba(0, 0, 0, .2); + border: 1px dashed rgb(0 0 0 / 45%); } .x-spreadsheet-selector-corner { position: absolute; @@ -425,10 +418,6 @@ $primary-hover-color: $blue-hover-color; background: rgb(0 0 0 / 5%); } - // &.active { - //// background: #89aef53d; - // } - &.divider { height: 0; padding: 0; @@ -459,29 +448,12 @@ $primary-hover-color: $blue-hover-color; width: 10px; height: 10px; background: rgb(0 0 0 / 8%); - // border: 1px solid rgba(0, 0, 0, 0.1); border-radius: 2px; content: ''; } } &.state.checked::before { background: #4b89ff; - // content: ''; - // position: absolute; - // width: 5px; - // height: 12px; - // color: #4b89ff; // #353A41; - // border-left: none; - // border-top: none; - // border-bottom: 2px solid; - // border-right: 2px solid; - // left: 15px; - // top: 6px; - // background: none; - // border-radius: 0; - // transform-origin: center; - // transform: rotate(45deg); - // -webkit-transform: rotate(45deg); } } @@ -765,8 +737,6 @@ $primary-hover-color: $blue-hover-color; } td > .cell { - // border: 1px solid rgba(0,0,0,.05); - &:hover { background: #ecf6fd; } @@ -813,8 +783,6 @@ $primary-hover-color: $blue-hover-color; color: rgb(0 0 0 / 60%); background: #E0E1E2; border-radius: 3px; - //box-shadow: 0px 1px 2px -1px rgba(255,255,255,0.5) inset, 0px -2px 0px 0px rgba(0,0,0,0.1) inset; - //box-shadow: 0 0 0 0 rgba(0,0,0,.5) inset; outline: none; transition: all 0.1s linear; line-height: 1em; @@ -839,7 +807,6 @@ $primary-hover-color: $blue-hover-color; } } -// form begin .x-spreadsheet-form-input { position: relative; display: inline-flex; @@ -896,7 +863,6 @@ $primary-hover-color: $blue-hover-color; display: flex; flex-flow: wrap; flex-direction: row; - //flex-wrap: wrap; .x-spreadsheet-form-field { flex: 0 1 auto; @@ -927,7 +893,6 @@ $primary-hover-color: $blue-hover-color; color: #f04134; } } -// form end .x-spreadsheet-dimmer { position: absolute; top: 0 !important; diff --git a/OrangeFormsOpen-VUE3/src/components/UserSelect/index.vue b/OrangeFormsOpen-VUE3/src/components/UserSelect/index.vue index 3dd45b66..ffde829e 100644 --- a/OrangeFormsOpen-VUE3/src/components/UserSelect/index.vue +++ b/OrangeFormsOpen-VUE3/src/components/UserSelect/index.vue @@ -71,7 +71,6 @@ const refreshData = (data: ANY_OBJECT) => { } }; const handlerEditOperate = (items: Ref) => { - console.log('handlerEditOperate', items); selectedItems.value = []; if (pps.multiple) { if (Array.isArray(items)) selectedItems.value = items; @@ -79,7 +78,6 @@ const handlerEditOperate = (items: Ref) => { if (items != null) selectedItems.value.push(items); } if (!checkSelectChange()) return; - console.log('1111', selectedItems.value); emitChange(); }; const onVisibleChange = (visible: boolean) => { diff --git a/OrangeFormsOpen-VUE3/src/components/layout/components/SubMenu.vue b/OrangeFormsOpen-VUE3/src/components/layout/components/SubMenu.vue index a3d5c608..22b5090f 100644 --- a/OrangeFormsOpen-VUE3/src/components/layout/components/SubMenu.vue +++ b/OrangeFormsOpen-VUE3/src/components/layout/components/SubMenu.vue @@ -23,7 +23,7 @@ }} @@ -63,10 +63,9 @@ const getTextStyle = (isShow: boolean) => { .nest-menu :deep(.el-menu-item span:first-child), .nest-menu :deep(.el-menu-item .menu-icon:first-child), .nest-menu :deep(.el-submenu__title span:first-child) { - padding-left: 14px !important; + padding-left: 8px !important; } .nest-menu :deep(.el-submenu__title .menu-icon:first-child) { margin-left: 8px !important; } -@/types/upms/menu diff --git a/OrangeFormsOpen-VUE3/src/components/layout/components/TagPanel.vue b/OrangeFormsOpen-VUE3/src/components/layout/components/TagPanel.vue index 383c0a05..5e292dcf 100644 --- a/OrangeFormsOpen-VUE3/src/components/layout/components/TagPanel.vue +++ b/OrangeFormsOpen-VUE3/src/components/layout/components/TagPanel.vue @@ -279,4 +279,3 @@ const rightClick = () => { background: #eee; } -@/types/upms/menu diff --git a/OrangeFormsOpen-VUE3/src/components/layout/components/multi-column-menu.vue b/OrangeFormsOpen-VUE3/src/components/layout/components/multi-column-menu.vue index 4b6cc9db..fd4ad9b0 100644 --- a/OrangeFormsOpen-VUE3/src/components/layout/components/multi-column-menu.vue +++ b/OrangeFormsOpen-VUE3/src/components/layout/components/multi-column-menu.vue @@ -150,4 +150,3 @@ const select = () => { } } -@/types/upms/menu diff --git a/OrangeFormsOpen-VUE3/src/components/layout/components/multi-column.vue b/OrangeFormsOpen-VUE3/src/components/layout/components/multi-column.vue index 685b5313..2c2d3c66 100644 --- a/OrangeFormsOpen-VUE3/src/components/layout/components/multi-column.vue +++ b/OrangeFormsOpen-VUE3/src/components/layout/components/multi-column.vue @@ -140,4 +140,3 @@ watch( } } -@/types/upms/menu diff --git a/OrangeFormsOpen-VUE3/src/components/layout/index.vue b/OrangeFormsOpen-VUE3/src/components/layout/index.vue index 1d3cbbdc..a6f3989f 100644 --- a/OrangeFormsOpen-VUE3/src/components/layout/index.vue +++ b/OrangeFormsOpen-VUE3/src/components/layout/index.vue @@ -28,7 +28,7 @@ > -