commit：修复工作流bug，修复builder报错

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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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<ANY_OBJECT>(API_CONTEXT + '/flow/flowCategory/view', params, httpOptions);
+    return super.get<ANY_OBJECT>(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);
   }
 }

OrangeFormsOpen-VUE3/src/api/flow/FlowDictionaryController.ts

@@ -10,7 +10,8 @@ export default class FlowDictionaryController extends BaseController {
     httpOptions?: RequestOption,
   ): Promise<DictionaryBase> {
     return new Promise((resolve, reject) => {
-      this.get<DictData[]>(API_CONTEXT + '/flow/flowCategory/listDict', params, httpOptions)
+      super
+        .get<DictData[]>(API_CONTEXT + '/flow/flowCategory/listDict', params, httpOptions)
         .then(res => {
           const dictData = new DictionaryBase('', res.data);
           resolve(dictData);

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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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<ANY_OBJECT>(API_CONTEXT + '/flow/flowEntry/view', params, httpOptions);
+    return super.get<ANY_OBJECT>(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<TableData<ANY_OBJECT>>(
+    return super.get<TableData<ANY_OBJECT>>(
       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<ANY_OBJECT>(API_CONTEXT + '/flow/flowEntry/viewDict', params, httpOptions);
+    return super.get<ANY_OBJECT>(API_CONTEXT + '/flow/flowEntry/viewDict', params, httpOptions);
   }
 
   static listDict(params: ANY_OBJECT, httpOptions?: RequestOption) {
-    return this.get<TableData<ANY_OBJECT>>(
+    return super.get<TableData<ANY_OBJECT>>(
       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<ANY_OBJECT>('/admin/flow/flowEntry/listAll', params, httpOptions);
+    return super.get<ANY_OBJECT>('/admin/flow/flowEntry/listAll', params, httpOptions);
   }
 }

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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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<ANY_OBJECT>(API_CONTEXT + '/flow/flowEntryVariable/view', params, httpOptions);
+    return super.get<ANY_OBJECT>(API_CONTEXT + '/flow/flowEntryVariable/view', params, httpOptions);
   }
 }

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<ANY_OBJECT>(url, params, httpOptions);
+    return super.post<ANY_OBJECT>(url, params, httpOptions);
   }
   // 获取在线表单工作流草稿数据
   static viewOnlineDraftData(params: ANY_OBJECT, httpOptions?: RequestOption) {
     const url = API_CONTEXT + '/flow/flowOnlineOperation/viewDraftData';
-    return this.get<ANY_OBJECT>(url, params, httpOptions);
+    return super.get<ANY_OBJECT>(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<TableData<ANY_OBJECT>>(url, params, httpOptions);
+    return super.post<TableData<ANY_OBJECT>>(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<ANY_OBJECT>(
+    return super.get<ANY_OBJECT>(
       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<ANY_OBJECT>(
+    return super.get<ANY_OBJECT>(
       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<ANY_OBJECT[]>(
+    return super.get<ANY_OBJECT[]>(
       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<ANY_OBJECT>(url, params, httpOptions);
+    return super.get<ANY_OBJECT>(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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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<ANY_OBJECT>(
+    return super.get<ANY_OBJECT>(
       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<ANY_OBJECT>(
+    return super.get<ANY_OBJECT>(
       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<ANY_OBJECT>(
+    return super.get<ANY_OBJECT>(
       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<ANY_OBJECT[]>(
+    return super.get<ANY_OBJECT[]>(
       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<ANY_OBJECT>(
+    return super.get<ANY_OBJECT>(
       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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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<ANY_OBJECT>(
+    return super.get<ANY_OBJECT>(
       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<string>(
+    return super.get<string>(
       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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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<ANY_OBJECT>(
+    return super.get<ANY_OBJECT>(
       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<ANY_OBJECT>(
+    return super.get<ANY_OBJECT>(
       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<ANY_OBJECT>(
+    return super.get<ANY_OBJECT>(
       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<ANY_OBJECT[]>(
+    return super.get<ANY_OBJECT[]>(
       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<TableData<ANY_OBJECT>>(
+    return super.get<TableData<ANY_OBJECT>>(
       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<TableData<ANY_OBJECT>>(
+    return super.get<TableData<ANY_OBJECT>>(
       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<ANY_OBJECT[]>(
+    return super.get<ANY_OBJECT[]>(
       API_CONTEXT + '/flow/flowOperation/listAllUserTask',
       params,
       httpOptions,

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<TableData<ColumnInfo>>(
+    return super.post<TableData<ColumnInfo>>(
       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<ColumnInfo>(API_CONTEXT + '/online/onlineColumn/view', params, httpOptions);
+    return super.get<ColumnInfo>(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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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<ANY_OBJECT>(
+    return super.post<ANY_OBJECT>(
       API_CONTEXT + '/online/onlineColumn/viewOnlineColumnRule',
       params,
       httpOptions,

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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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<ANY_OBJECT>(API_CONTEXT + '/online/onlineDatasource/view', params, httpOptions);
+    return super.get<ANY_OBJECT>(
+      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);
   }
 }

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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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<ANY_OBJECT>(
+    return super.get<ANY_OBJECT>(
       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);
   }
 }

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<TableData<DBLink>>(
+    return super.post<TableData<DBLink>>(
       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<TableInfo[]>(
+    return super.get<TableInfo[]>(
       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<ANY_OBJECT[]>(
+    return super.get<ANY_OBJECT[]>(
       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<DBLink>(API_CONTEXT + '/online/onlineDblink/view', params, httpOptions);
+    return super.get<DBLink>(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);
   }
 }

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<TableData<Dict>>(API_CONTEXT + '/online/onlineDict/list', params, httpOptions);
+    return super.post<TableData<Dict>>(
+      API_CONTEXT + '/online/onlineDict/list',
+      params,
+      httpOptions,
+    );
   }
 
   static view(params: ANY_OBJECT, httpOptions?: RequestOption) {
-    return this.get<Dict>(API_CONTEXT + '/online/onlineDict/view', params, httpOptions);
+    return super.get<Dict>(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<TableData<Dict>>(
+    return super.post<TableData<Dict>>(
       API_CONTEXT + '/online/onlineDict/listAllGlobalDict',
       params,
       httpOptions,

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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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<ANY_OBJECT>(API_CONTEXT + '/online/onlineForm/view', params, httpOptions);
+    return super.get<ANY_OBJECT>(API_CONTEXT + '/online/onlineForm/view', params, httpOptions);
   }
 
   static render(params: ANY_OBJECT, httpOptions?: RequestOption) {
-    return this.get<ANY_OBJECT>(API_CONTEXT + '/online/onlineForm/render', params, httpOptions);
+    return super.get<ANY_OBJECT>(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);
   }
 }

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<ANY_OBJECT[]>(
+    return super.post<ANY_OBJECT[]>(
       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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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<ANY_OBJECT>(
+    return super.get<ANY_OBJECT>(
       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<ANY_OBJECT>(
+    return super.get<ANY_OBJECT>(
       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<ANY_OBJECT>(API_CONTEXT + '/report/reportPrint/listAll', params, httpOptions);
+    return super.post<ANY_OBJECT>(API_CONTEXT + '/report/reportPrint/listAll', params, httpOptions);
   }
 }

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<TableData<FormPage>>(
+    return super.post<TableData<FormPage>>(
       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<ANY_OBJECT>(
+    return super.post<ANY_OBJECT>(
       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<FormPage>(API_CONTEXT + '/online/onlinePage/view', params, httpOptions);
+    return super.get<FormPage>(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<string>(API_CONTEXT + '/online/onlinePage/add', params, httpOptions);
+    return super.post<string>(API_CONTEXT + '/online/onlinePage/add', params, httpOptions);
   }
 
   static update(params: ANY_OBJECT, httpOptions?: RequestOption) {
-    return this.post<string>(API_CONTEXT + '/online/onlinePage/update', params, httpOptions);
+    return super.post<string>(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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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,

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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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);
   }
 }

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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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<ANY_OBJECT>(
+    return super.get<ANY_OBJECT>(
       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);
   }
 }

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<DictionaryBase>((resolve, reject) => {
-      this.get<DictData[]>(API_CONTEXT + '/upms/sysRole/listDict', params, httpOptions)
+      super.get<DictData[]>(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<DictionaryBase>((resolve, reject) => {
-      this.get<DictData[]>(API_CONTEXT + '/upms/globalDict/listDict', params, httpOptions)
+      super.get<DictData[]>(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<DictionaryBase>((resolve, reject) => {
-      this.get<DictData[]>(API_CONTEXT + '/upms/globalDict/listDictByIds', params, httpOptions)
+      super.get<DictData[]>(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<DictionaryBase>((resolve, reject) => {
-      this.get<DictData[]>(API_CONTEXT + '/upms/sysDept/listDict', params, httpOptions)
+      super.get<DictData[]>(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<DictionaryBase> {
     return new Promise<DictionaryBase>((resolve, reject) => {
-      this.get<DictData[]>(API_CONTEXT + '/upms/sysDept/listDictByParentId', params, httpOptions)
+      super.get<DictData[]>(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<DictionaryBase> {
     return new Promise<DictionaryBase>((resolve, reject) => {
-      this.get<DictData[]>(API_CONTEXT + '/upms/sysMenu/listMenuDict', params, httpOptions)
+      super.get<DictData[]>(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<ANY_OBJECT[]> {
     return new Promise((resolve, reject) => {
-      this.get<ANY_OBJECT[]>(
+      super.get<ANY_OBJECT[]>(
         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<DictionaryBase>((resolve, reject) => {
-      this.get<DictData[]>(API_CONTEXT + '/upms/sysPost/listDict', params, httpOptions)
+      super.get<DictData[]>(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<DictionaryBase>((resolve, reject) => {
-      this.get<DictData[]>(API_CONTEXT + '/report/reportDblink/listDict', params, httpOptions)
+      super.get<DictData[]>(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<DictionaryBase>((resolve, reject) => {
-      this.get<DictData[]>(API_CONTEXT + '/report/reportDict/listDict', params, httpOptions)
+      super.get<DictData[]>(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<DictionaryBase>((resolve, reject) => {
-      this.get<DictData[]>(API_CONTEXT + '/app/areaCode/listDict', params, httpOptions)
+      super.get<DictData[]>(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<DictionaryBase>((resolve, reject) => {
-      this.get<DictData[]>(API_CONTEXT + '/app/areaCode/listDictByParentId', params, httpOptions)
+      super.get<DictData[]>(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<DictionaryBase>((resolve, reject) => {
-      this.get<DictData[]>('/admin/app/knowledge/listDict', params, httpOptions)
+      super.get<DictData[]>('/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<DictionaryBase>((resolve, reject) => {
-      this.get<DictData[]>(API_CONTEXT + '/app/student/listDict', params, httpOptions)
+      super.get<DictData[]>(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<DictionaryBase>((resolve, reject) => {
-      this.get<DictData[]>('/admin/app/teacher/listDict', params, httpOptions)
+      super.get<DictData[]>('/admin/app/teacher/listDict', params, httpOptions)
         .then(res => {
           const dictData = new DictionaryBase('老师字典', res.data);
           resolve(dictData);

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<UserInfo>(API_CONTEXT + '/upms/login/doLogin', params);
+    return super.post<UserInfo>(API_CONTEXT + '/upms/login/doLogin', params);
   }
 
   static logout() {
-    return this.post(API_CONTEXT + '/upms/login/doLogout', {});
+    return super.post(API_CONTEXT + '/upms/login/doLogout', {});
   }
 }

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<TableData<OnlineUser>>(
+    return super.post<TableData<OnlineUser>>(
       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);
   }
 }

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<MenuItem[]>(API_CONTEXT + '/upms/sysMenu/list', params, httpOptions);
+    return super.post<MenuItem[]>(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<MenuItem>(API_CONTEXT + '/upms/sysMenu/view', params, httpOptions);
+    return super.get<MenuItem>(API_CONTEXT + '/upms/sysMenu/view', params, httpOptions);
   }
 
   static listMenuPermCode(params: ANY_OBJECT, httpOptions?: RequestOption) {
-    return this.get<ANY_OBJECT[]>(API_CONTEXT + '/upms/sysMenu/listMenuPerm', params, httpOptions);
+    return super.get<ANY_OBJECT[]>(API_CONTEXT + '/upms/sysMenu/listMenuPerm', params, httpOptions);
   }
 
   static listSysPermByMenuIdWithDetail(params: ANY_OBJECT, httpOptions?: RequestOption) {
-    return this.get<ANY_OBJECT[]>(
+    return super.get<ANY_OBJECT[]>(
       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<ANY_OBJECT[]>(
+    return super.get<ANY_OBJECT[]>(
       API_CONTEXT + '/upms/sysMenu/listSysUserWithDetail',
       params,
       httpOptions,

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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       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<ANY_OBJECT>(API_CONTEXT + '/mobile/mobileEntry/view', params, httpOptions);
+    return super.get<ANY_OBJECT>(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);
   }
 }

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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       API_CONTEXT + '/upms/sysOperationLog/list',
       params,
       httpOptions,

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<PermCode[]>(API_CONTEXT + '/upms/login/getAllPermCodes', params, httpOptions);
+    return super.get<PermCode[]>(API_CONTEXT + '/upms/login/getAllPermCodes', params, httpOptions);
   }
 }

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<TableData<Perm>>(API_CONTEXT + '/upms/sysPerm/list', params, httpOptions);
+    return super.post<TableData<Perm>>(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<ANY_OBJECT[]>(
+    return super.post<ANY_OBJECT[]>(
       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<PermModule[]>(API_CONTEXT + '/upms/sysPermModule/list', params, httpOptions);
+    return super.post<PermModule[]>(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<User[]>(
+    return super.get<User[]>(
       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<Role[]>(
+    return super.get<Role[]>(
       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<MenuItem[]>(
+    return super.get<MenuItem[]>(
       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<TableData<Perm>>(
+    return super.get<TableData<Perm>>(
       API_CONTEXT + '/upms/sysRole/listSysPermWithDetail',
       params,
       httpOptions,

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<TableData<ANY_OBJECT>>(
+    return super.post<TableData<ANY_OBJECT>>(
       API_CONTEXT + '/commonext/bizwidget/list',
       params,
       httpOptions,
     );
   }
   static viewByIds(params: ANY_OBJECT, httpOptions?: RequestOption) {
-    return this.post<ANY_OBJECT[]>(API_CONTEXT + '/commonext/bizwidget/view', params, httpOptions);
+    return super.post<ANY_OBJECT[]>(API_CONTEXT + '/commonext/bizwidget/view', params, httpOptions);
   }
 }

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<TableData<PermData>>(
+    return super.post<TableData<PermData>>(
       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<PermData>(API_CONTEXT + '/upms/sysDataPerm/view', params, httpOptions);
+    return super.get<PermData>(API_CONTEXT + '/upms/sysDataPerm/view', params, httpOptions);
   }
 
   /**
    * @param params    {dataPermId, searchString}
    */
   static listDataPermUser(params: ANY_OBJECT, httpOptions?: RequestOption) {
-    return this.post<TableData<User>>(
+    return super.post<TableData<User>>(
       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<TableData<User>>(
+    return super.post<TableData<User>>(
       API_CONTEXT + '/upms/sysDataPerm/listNotInDataPermUser',
       params,
       httpOptions,

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<TableData<SysDept>>(API_CONTEXT + '/upms/sysDept/list', params, httpOptions);
+    return super.post<TableData<SysDept>>(API_CONTEXT + '/upms/sysDept/list', params, httpOptions);
   }
 
   static view(params: ANY_OBJECT, httpOptions?: RequestOption) {
-    return this.get<SysDept>(API_CONTEXT + '/upms/sysDept/view', params, httpOptions);
+    return super.get<SysDept>(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<TableData<SysDeptPost>>(
+    return super.post<TableData<SysDeptPost>>(
       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<TableData<SysDeptPost>>(
+    return super.post<TableData<SysDeptPost>>(
       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);
   }
 }

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<listAllItemType>(API_CONTEXT + '/upms/globalDict/listAll', params, httpOptions);
   }
 

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<TableData<Post>>(API_CONTEXT + '/upms/sysPost/list', params, httpOptions);
+    return super.post<TableData<Post>>(API_CONTEXT + '/upms/sysPost/list', params, httpOptions);
   }
 
   static view(params: ANY_OBJECT, httpOptions?: RequestOption) {
-    return this.get<Post>(API_CONTEXT + '/upms/sysPost/view', params, httpOptions);
+    return super.get<Post>(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);
   }
 }

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<TableData<Role>>(API_CONTEXT + '/upms/sysRole/list', params, httpOptions);
+    return super.post<TableData<Role>>(API_CONTEXT + '/upms/sysRole/list', params, httpOptions);
   }
 
   static getRole(params: ANY_OBJECT, httpOptions?: RequestOption) {
-    return this.get<Role>(API_CONTEXT + '/upms/sysRole/view', params, httpOptions);
+    return super.get<Role>(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<TableData<User>>(
+    return super.post<TableData<User>>(
       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<TableData<User>>(
+    return super.post<TableData<User>>(
       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);
   }
 }

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<TableData<User>>(API_CONTEXT + '/upms/sysUser/list', params, httpOptions);
+    return super.post<TableData<User>>(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<UserInfo>(API_CONTEXT + '/upms/sysMenu/view', params, httpOptions);
+    return super.post<UserInfo>(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<TableData<Perm>>(
+    return super.get<TableData<Perm>>(
       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<TableData<PermCode>>(
+    return super.get<TableData<PermCode>>(
       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<TableData<MenuItem>>(
+    return super.get<TableData<MenuItem>>(
       API_CONTEXT + '/upms/sysUser/listSysMenuWithDetail',
       params,
       httpOptions,

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;
 }

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;

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<ANY_OBJECT> = [];
     if (jsonData != null) {
       try {

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<UploadFile[]>([]);
+  const fileList = ref<Array<UploadFile | ANY_OBJECT>>([]);
   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<UploadFile | ANY_OBJECT> | null,
+  ) => {
     if (uploadFiles && uploadFiles.length > 0) {
       if (maxFileCount == 1) {
         fileList.value = [uploadFiles[uploadFiles.length - 1]];

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,

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;

OrangeFormsOpen-VUE3/src/components/UserSelect/index.vue

@@ -71,7 +71,6 @@ const refreshData = (data: ANY_OBJECT) => {
   }
 };
 const handlerEditOperate = (items: Ref<ANY_OBJECT>) => {
-  console.log('handlerEditOperate', items);
   selectedItems.value = [];
   if (pps.multiple) {
     if (Array.isArray(items)) selectedItems.value = items;
@@ -79,7 +78,6 @@ const handlerEditOperate = (items: Ref<ANY_OBJECT>) => {
     if (items != null) selectedItems.value.push(items);
   }
   if (!checkSelectChange()) return;
-  console.log('1111', selectedItems.value);
   emitChange();
 };
 const onVisibleChange = (visible: boolean) => {

OrangeFormsOpen-VUE3/src/components/layout/components/SubMenu.vue

@@ -23,7 +23,7 @@
         }}</span>
       </template>
       <template v-for="child in menu.children" :key="child.menuId">
-        <sub-menu class="nest-menu" :index="child.menuId" :menu="child" :isChild="true" />
+        <sub-menu class="nest-menu" :menu="child" :isChild="true" />
       </template>
     </el-sub-menu>
   </div>
@@ -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;
 }
 </style>
-@/types/upms/menu

OrangeFormsOpen-VUE3/src/components/layout/components/TagPanel.vue

@@ -279,4 +279,3 @@ const rightClick = () => {
   background: #eee;
 }
 </style>
-@/types/upms/menu

OrangeFormsOpen-VUE3/src/components/layout/components/multi-column-menu.vue

@@ -150,4 +150,3 @@ const select = () => {
   }
 }
 </style>
-@/types/upms/menu

OrangeFormsOpen-VUE3/src/components/layout/components/multi-column.vue

@@ -140,4 +140,3 @@ watch(
   }
 }
 </style>
-@/types/upms/menu

OrangeFormsOpen-VUE3/src/components/layout/index.vue

@@ -28,7 +28,7 @@
               >
                 <i class="online-icon icon-message" style="font-size: 16px; color: #333" />
               </el-badge>
-              <template v-slot:dropdown>
+              <template #dropdown>
                 <el-dropdown-menu style="min-width: 130px">
                   <el-dropdown-item class="user-dropdown-item" command="remindingMessage">
                     催办消息
@@ -57,7 +57,7 @@
                 >{{ (userInfo || {}).showName
                 }}<el-icon class="el-icon--right"><el-icon-arrow-down /></el-icon>
               </span>
-              <template v-slot:dropdown>
+              <template #dropdown>
                 <el-dropdown-menu>
                   <el-dropdown-item class="user-dropdown-item" command="modifyPassword"
                     >修改密码</el-dropdown-item
@@ -354,9 +354,6 @@ onBeforeUnmount(() => {
 </script>
 
 <style lang="scss">
-//@import url('@/assets/style/element-variables.scss');
-//$--color-primary: #f70;
-
 .header {
   z-index: 1;
   .header-main {

OrangeFormsOpen-VUE3/src/online/components/OnlineCustomBlock.vue

@@ -226,7 +226,6 @@ const values = computed({
 });
 
 const onWidgetClick = (widget: ANY_OBJECT | null = null) => {
-  console.log('block block block onWidgetClick', widget);
   emit('widgetClick', widget);
 };
 const onDragAdd = (e: DragEvent) => {

OrangeFormsOpen-VUE3/src/online/components/OnlineCustomTable.vue

@@ -270,7 +270,6 @@ const buildFlowParam = computed(() => {
   return flowParam;
 });
 const tableColumnList = computed(() => {
-  console.log('>>> ===', props.widget.props.tableColumnList);
   let tempList =
     props.widget && props.widget.props && Array.isArray(props.widget.props.tableColumnList)
       ? props.widget.props.tableColumnList

OrangeFormsOpen-VUE3/src/online/components/OnlineCustomTree.vue

@@ -58,7 +58,6 @@ const treeDataList = computed(() => {
     );
   });
   let temp = treeDataTranslate(tempList, 'id', 'parentId');
-  console.log('temp', temp);
   if (props.multiple) {
     return temp;
   } else {
@@ -73,7 +72,6 @@ const treeDataList = computed(() => {
 });
 
 const onNodeClick = () => {
-  console.log('onNodeClick');
   if (!props.multiple) onSelectChange();
 };
 const emit = defineEmits<{
@@ -89,7 +87,6 @@ const onValueChange = () => {
       temp = tree.value.getCurrentKey();
     }
   }
-  console.log('onValueChange', temp);
   emit('update:value', temp);
   let dictData = props.multiple
     ? null
@@ -97,7 +94,6 @@ const onValueChange = () => {
   emit('change', temp, dictData);
 };
 const onSelectChange = () => {
-  console.log('onSelectChange');
   nextTick(() => {
     onValueChange();
   });

OrangeFormsOpen-VUE3/src/online/components/OnlineCustomWorkFlowTable.vue

@@ -472,25 +472,9 @@ watch(
   },
 );
 
-// watch(
-//   () => props.widget,
-//   newVal => {
-//     if (newVal) {
-//       newVal.widgetImpl = getCurrentInstance();
-//     }
-//   },
-//   {
-//     deep: true,
-//     immediate: true,
-//   },
-// );
-
 watch(
   () => props.widget,
   () => {
-    // if (newVal) {
-    //   newVal.widgetImpl = getCurrentInstance();
-    // }
     refreshColumn();
   },
   {

OrangeFormsOpen-VUE3/src/pages/online/editOnlinePage/dataModel/onlinePageVirtualColumn.vue

@@ -391,18 +391,11 @@ const onAggregationTableIdChange = () => {
     currentColumn.value.objectFieldType = undefined;
   }
 
-  if (aggregationRelation.value) {
+  if (aggregationRelation.value && currentColumn.value) {
-    if (
+    loadOnlineTableColumnList(currentColumn.value.aggregationTableId).catch(e => {
-      Array.isArray(aggregationRelation.value.columnList) &&
-      aggregationRelation.value.columnList.length > 0
-    ) {
-      aggregationColumnList.value = aggregationRelation.value.columnList;
-    } else {
-      loadOnlineTableColumnList(aggregationRelation.value.tableId).catch(e => {
       console.warn(e);
     });
   }
-  }
 };
 const onAggregationColumnIdChange = () => {
   if (currentColumn.value) {

OrangeFormsOpen-VUE3/src/pages/online/editOnlinePage/formDesign/components/CustomWidgetBindData.vue

@@ -220,7 +220,6 @@ const getValidColumnList = computed(() => {
             data.value.widgetType,
             formType.value,
           );
-          console.log(disabled, warningMsg, item);
           // 查询页面仅能选择支持过滤的字段
           if (
             !disabled &&

OrangeFormsOpen-VUE3/src/pages/online/editOnlinePage/formDesign/index.vue

@@ -1189,11 +1189,8 @@ defineExpose({
   .design-box {
     display: flex;
     justify-content: center;
-    // background: white;
     width: 100%;
     height: calc(100% - 48px);
-    // border: 1px solid #E8E8E8;
-    // padding: 25px;
   }
 }
 .attribute-panel {

OrangeFormsOpen-VUE3/src/pages/online/formOnlineDict/EditOnlineDict.vue

@@ -377,7 +377,7 @@
               header-cell-class-name="table-header-gray"
               height="300px"
             >
-              <vxe-column title="选择" header-align="center" align="center" width="50px">
+              <vxe-column title="选择" header-align="center" align="center" width="60px">
                 <template v-slot="scope">
                   <el-radio :value="scope.row.dictCode"> </el-radio>
                 </template>

OrangeFormsOpen-VUE3/src/pages/upms/formEditSysDept/index.vue

@@ -90,7 +90,6 @@ const layoutStore = useLayoutStore();
 
 const props = defineProps<{
   deptId?: string;
-  defaultFormItemSize: Ref<'' | 'default' | 'small' | 'large'>;
   // 当使用Dialog.show弹出组件时，须定义该prop属性，以便对dialog进行回调
   dialog?: DialogProp<ANY_OBJECT>;
 }>();

OrangeFormsOpen-VUE3/src/pages/upms/formEditSysMenu/editColumn.vue

@@ -54,7 +54,6 @@ const props = defineProps<{
   columnName?: string;
   showOrder?: number;
   icon?: string;
-  defaultFormItemSize: Ref<'' | 'default' | 'small' | 'large'>;
   // 当使用Dialog.show弹出组件时，须定义该prop属性，以便对dialog进行回调
   dialog?: DialogProp<T>;
 }>();

OrangeFormsOpen-VUE3/src/pages/upms/formEditSysMenu/index.vue

@@ -211,7 +211,6 @@ const props = defineProps<{
   parentId?: string;
   menuList: MenuItem[];
   rowData?: MenuItem;
-  defaultFormItemSize: Ref<'' | 'default' | 'small' | 'large'>;
   // 当使用Dialog.show弹出组件时，须定义该prop属性，以便对dialog进行回调
   dialog?: DialogProp<ANY_OBJECT>;
 }>();

OrangeFormsOpen-VUE3/src/pages/upms/formEditSysPost/index.vue

@@ -75,7 +75,6 @@ const layoutStore = useLayoutStore();
 
 const props = defineProps<{
   postId?: string;
-  defaultFormItemSize: Ref<'' | 'default' | 'small' | 'large'>;
   // 当使用Dialog.show弹出组件时，须定义该prop属性，以便对dialog进行回调
   dialog?: DialogProp<ANY_OBJECT>;
 }>();

OrangeFormsOpen-VUE3/src/pages/upms/formEditSysRole/index.vue

@@ -86,7 +86,6 @@ const layoutStore = useLayoutStore();
 
 const props = defineProps<{
   rowData?: Role;
-  defaultFormItemSize: Ref<'' | 'default' | 'small' | 'large'>;
   // 当使用Dialog.show弹出组件时，须定义该prop属性，以便对dialog进行回调
   dialog?: DialogProp<ANY_OBJECT>;
 }>();

OrangeFormsOpen-VUE3/src/pages/upms/formEditSysUser/index.vue

@@ -145,7 +145,6 @@ const layoutStore = useLayoutStore();
 
 const props = defineProps<{
   rowData?: User;
-  defaultFormItemSize: Ref<'' | 'default' | 'small' | 'large'>;
   // 当使用Dialog.show弹出组件时，须定义该prop属性，以便对dialog进行回调
   dialog?: DialogProp<ANY_OBJECT>;
 }>();

OrangeFormsOpen-VUE3/src/pages/upms/formSysDataPerm/formSetSysDataPermUser.vue

@@ -131,7 +131,6 @@ const layoutStore = useLayoutStore();
 
 const props = defineProps<{
   dataPermId: string | number;
-  defaultFormItemSize: Ref<'' | 'default' | 'small' | 'large'>;
 }>();
 const formItemSize = computed(() => {
   return layoutStore.defaultFormItemSize;

OrangeFormsOpen-VUE3/src/pages/upms/formSysDeptPost/formSetDeptPost.vue

@@ -114,7 +114,6 @@ const layoutStore = useLayoutStore();
 
 interface IProps extends ThirdProps {
   deptId: string;
-  defaultFormItemSize: Ref<'' | 'default' | 'small' | 'large'>;
   // 当使用Dialog.show弹出组件时，须定义该prop属性，以便对dialog进行回调
   dialog?: DialogProp<ANY_OBJECT>;
 }

OrangeFormsOpen-VUE3/src/pages/upms/formSysDict/index.vue

@@ -255,10 +255,10 @@ import { ANY_OBJECT } from '@/types/generic';
 import FormEditGlobalDict from '@/pages/upms/formEditGlobalDict/index.vue';
 import FormEditDictData from '@/pages/upms/formEditDictData/index.vue';
 import { treeDataTranslate } from '@/common/utils';
+import { useLayoutStore } from '@/store';
 import { useDialog } from '@/components/Dialog/useDialog';
 
 const Dialog = useDialog();
-import { useLayoutStore } from '@/store';
 const layoutStore = useLayoutStore();
 const mainContextHeight = inject('mainContextHeight', 200);
 const { checkPermCodeExist } = usePermissions();

OrangeFormsOpen-VUE3/src/pages/upms/formSysMenu/formSysColumnMenu.vue

@@ -84,7 +84,7 @@
             :size="layoutStore.defaultFormItemSize"
             :tree-config="{ rowField: 'menuId', parentField: 'parentId' }"
             @refresh="initFormData"
-            class="border-bottom-0"
+            class="border-bottom-0 page-table"
           >
             <template v-slot:operator>
               <el-button
@@ -173,7 +173,6 @@ import { MenuItem } from '@/types/upms/menu';
 import { SystemMenuController } from '@/api/system';
 import { useLayoutStore } from '@/store';
 import { useMenuTools } from './hooks';
-
 const { checkPermCodeExist } = usePermissions();
 const activeFragment = ref('fragmentSysColumn');
 const currentColumnId: Ref<string | undefined> = ref();

OrangeFormsOpen-VUE3/src/pages/upms/formSysOperationLog/SysOperationLogDetail.vue

@@ -133,11 +133,19 @@ const formData = reactive({
 onMounted(() => {
   const log = { ...props.rowData };
   if (props.rowData.requestArguments) {
+    try {
       log.requestArguments = JSON.parse(props.rowData.requestArguments.toString()) || {};
+    } catch (e) {
+      log.requestArguments = props.rowData.requestArguments;
+    }
   }
   log.requestArguments = log.requestArguments || {};
   if (props.rowData.responseResult) {
+    try {
       log.responseResult = JSON.parse(props.rowData.responseResult.toString()) || {};
+    } catch (e) {
+      log.responseResult = props.rowData.responseResult;
+    }
   }
   log.responseResult = log.responseResult || {};
   formData.formViewSysOperationLog = log;

OrangeFormsOpen-VUE3/src/pages/upms/formSysRole/formSetRoleUser.vue

@@ -128,7 +128,6 @@ const layoutStore = useLayoutStore();
 
 const props = defineProps<{
   roleId: string | number;
-  defaultFormItemSize: Ref<'' | 'default' | 'small' | 'large'>;
 }>();
 
 const formItemSize = computed(() => {

OrangeFormsOpen-VUE3/src/pages/upms/formSysUser/index.vue

@@ -173,7 +173,7 @@ const layoutStore = useLayoutStore();
 const Dialog = useDialog();
 const mainContextHeight = inject('mainContextHeight', 200);
 const form = ref();
-const deptIdPath = ref([]);
+const deptIdPath = ref<Array<string | number>>([]);
 
 const deptOptions = { value: 'id', label: 'name', checkStrictly: true };
 

OrangeFormsOpen-VUE3/src/pages/workflow/components/CopyForSelect/addCopyForItem.vue

@@ -125,7 +125,9 @@ import { Dialog } from '@/components/Dialog';
 import { SysFlowCopyForType } from '@/common/staticDict/flow';
 import { useThirdParty } from '@/components/thirdParty/hooks';
 import { ThirdProps } from '@/components/thirdParty/types';
+import { useLayoutStore } from '@/store';
 
+const layoutStore = useLayoutStore();
 interface IProps extends ThirdProps {
   deptList: ANY_OBJECT[];
   postList: ANY_OBJECT[];
@@ -136,8 +138,6 @@ interface IProps extends ThirdProps {
 }
 const props = defineProps<IProps>();
 const { thirdParams, onCloseThirdDialog } = useThirdParty(props);
-import { useLayoutStore } from '@/store';
-const layoutStore = useLayoutStore();
 const deptId = ref<string>();
 const selectDeptList = ref<ANY_OBJECT[]>([]);
 const formData = ref<ANY_OBJECT>({

OrangeFormsOpen-VUE3/src/pages/workflow/components/CopyForSelect/index.vue

@@ -400,7 +400,6 @@ onUnmounted(() => {
 }
 
 .copy-select :deep(.el-tag) {
-  //margin-right: 10px;
   margin-right: 8px;
 }
 

OrangeFormsOpen-VUE3/src/pages/workflow/components/HandlerFlowTask.vue

@@ -196,7 +196,7 @@ const props = withDefaults(
     // 当前任务节点名称
     taskName?: string;
     // 当前任务节点操作列表
-    operationList?: Array<ANY_OBJECT>;
+    operationList?: Array<ANY_OBJECT> | string;
   }>(),
   {
     isDraft: false,
@@ -219,8 +219,11 @@ const copyItemList = ref<ANY_OBJECT[]>([]);
 const assigneeList = ref<ANY_OBJECT[]>([]);
 
 const flowOperationList = computed<ANY_OBJECT[]>(() => {
-  if (Array.isArray(props.operationList)) {
+  const operationList = Array.isArray(props.operationList)
-    return props.operationList.map(item => {
+    ? props.operationList
+    : JSON.parse(props.operationList || '[]');
+  if (Array.isArray(operationList)) {
+    return operationList.map(item => {
       if (item.type === SysFlowTaskOperationType.MULTI_SIGN && item.multiSignAssignee != null) {
         let multiSignAssignee = {
           ...item.multiSignAssignee,
@@ -443,7 +446,6 @@ onMounted(() => {
 
 <style lang="scss">
 @import url('../package/theme/index.scss');
-// 边框被 token-simulation 样式覆盖了
 .djs-palette {
   background: var(--palette-background-color);
   border: solid 1px var(--palette-border-color) !important;
@@ -546,7 +548,6 @@ onMounted(() => {
   }
 }
 
-//侧边栏配置
 .djs-palette.open {
   .djs-palette-entries {
     div[class^='bpmn-icon-']:before,
@@ -598,9 +599,7 @@ pre {
   font-family: Consolas, Monaco, monospace;
 }
 
-// 流程图
 .djs-container {
-  // 框
   .djs-visual {
     rect,
     polygon,
@@ -617,17 +616,13 @@ pre {
       stroke: #333333 !important;
     }
   }
-  // 线
   .djs-visual path {
     stroke: #333333 !important;
   }
-
-  // 实心箭头
   [id^='sequenceflow-end-white-black'] path {
     fill: #333333 !important;
     stroke: #333333 !important;
   }
-  // 空心箭头
   [id^='conditional-flow-marker-white-black'] path {
     stroke: #333333 !important;
   }

OrangeFormsOpen-VUE3/src/pages/workflow/components/ProcessDesigner.vue

@@ -85,7 +85,6 @@ defineExpose({
 
 <style lang="scss">
 @import url('../package/theme/index.scss');
-// 边框被 token-simulation 样式覆盖了
 .djs-palette {
   background: var(--palette-background-color);
   border: solid 1px var(--palette-border-color) !important;
@@ -187,8 +186,6 @@ defineExpose({
     }
   }
 }
-
-//侧边栏配置
 .djs-palette.open {
   .djs-palette-entries {
     div[class^='bpmn-icon-']:before,
@@ -239,10 +236,7 @@ pre {
 .hljs * {
   font-family: Consolas, Monaco, monospace;
 }
-
-// 流程图
 .djs-container {
-  // 框
   .djs-visual {
     rect,
     polygon,
@@ -259,17 +253,13 @@ pre {
       stroke: #333333 !important;
     }
   }
-  // 线
   .djs-visual path {
     stroke: #333333 !important;
   }
-
-  // 实心箭头
   [id^='sequenceflow-end-white-black'] path {
     fill: #333333 !important;
     stroke: #333333 !important;
   }
-  // 空心箭头
   [id^='conditional-flow-marker-white-black'] path {
     stroke: #333333 !important;
   }

OrangeFormsOpen-VUE3/src/pages/workflow/components/ProcessViewer.vue

@@ -442,7 +442,6 @@ $current-color: #409eff;
 .process-viewer .djs-palette {
   display: none;
 }
-// 边框被 token-simulation 样式覆盖了
 .djs-palette {
   background: var(--palette-background-color);
   border: solid 1px var(--palette-border-color) !important;
@@ -544,8 +543,6 @@ $current-color: #409eff;
     }
   }
 }
-
-//侧边栏配置
 .djs-palette.open {
   .djs-palette-entries {
     div[class^='bpmn-icon-']:before,
@@ -596,10 +593,7 @@ pre {
 .hljs * {
   font-family: Consolas, Monaco, monospace;
 }
-
-// 流程图
 .djs-container {
-  // 框
   .djs-visual {
     rect,
     polygon,
@@ -616,17 +610,13 @@ pre {
       stroke: #333333 !important;
     }
   }
-  // 线
   .djs-visual path {
     stroke: #333333 !important;
   }
-
-  // 实心箭头
   [id^='sequenceflow-end-white-black'] path {
     fill: #333333 !important;
     stroke: #333333 !important;
   }
-  // 空心箭头
   [id^='conditional-flow-marker-white-black'] path {
     stroke: #333333 !important;
   }

OrangeFormsOpen-VUE3/src/pages/workflow/components/UserTaskSelect/userTaskSelectDlg.vue

@@ -266,7 +266,6 @@ watch(
 
 <style lang="scss">
 @import url('../../package/theme/index.scss');
-// 边框被 token-simulation 样式覆盖了
 .djs-palette {
   background: var(--palette-background-color);
   border: solid 1px var(--palette-border-color) !important;
@@ -368,8 +367,6 @@ watch(
     }
   }
 }
-
-//侧边栏配置
 .djs-palette.open {
   .djs-palette-entries {
     div[class^='bpmn-icon-']:before,
@@ -420,10 +417,7 @@ pre {
 .hljs * {
   font-family: Consolas, Monaco, monospace;
 }
-
-// 流程图
 .djs-container {
-  // 框
   .djs-visual {
     rect,
     polygon,
@@ -440,17 +434,13 @@ pre {
       stroke: #333333 !important;
     }
   }
-  // 线
   .djs-visual path {
     stroke: #333333 !important;
   }
-
-  // 实心箭头
   [id^='sequenceflow-end-white-black'] path {
     fill: #333333 !important;
     stroke: #333333 !important;
   }
-  // 空心箭头
   [id^='conditional-flow-marker-white-black'] path {
     stroke: #333333 !important;
   }

OrangeFormsOpen-VUE3/src/pages/workflow/flowEntry/formPublishedFlowEntry.vue

@@ -125,12 +125,14 @@ import { useLayoutStore } from '@/store';
 const layoutStore = useLayoutStore();
 
 interface IProps extends ThirdProps {
-  flowEntry?: ANY_OBJECT | undefined;
+  flowEntry: ANY_OBJECT;
   // 当使用Dialog.show弹出组件时，须定义该prop属性，以便对dialog进行回调
   dialog?: DialogProp<ANY_OBJECT>;
 }
 const props = withDefaults(defineProps<IProps>(), {
-  flowEntry: undefined,
+  flowEntry: () => {
+    return {};
+  },
 });
 const { thirdParams } = useThirdParty(props);
 const formItemSize = computed(() => {

OrangeFormsOpen-VUE3/src/pages/workflow/handlerFlowTask/index.vue

@@ -8,8 +8,8 @@
     :taskId="dialogParams.taskId"
     :taskName="dialogParams.taskName"
     :operationList="dialogParams.operationList"
-    :isRuntime="dialogParams.isRuntime"
+    :isRuntime="isRuntime"
-    :isDraft="dialogParams.isDraft"
+    :isDraft="isDraft"
     @close="handlerClose"
     @start="handlerStart"
     @submit="handlerOperation"
@@ -22,20 +22,24 @@
       style="width: 100%"
       :style="{ height: mainContextHeight - 188 + 'px' }"
       :formId="dialogParams.formId"
-      :readOnly="isReadOnly"
+      :readOnly="readOnly"
       :flowInfo="getFlowInfo"
     />
     <!-- 路由页面 -->
-    <router-view
+    <router-view v-slot:="{ Component, route }">
+      <component
+        :is="Component"
         ref="routerFlowForm"
+        :key="route.path"
         style="width: 100%"
-      :isRuntimeTask="dialogParams.isRuntime"
+        :isRuntimeTask="isRuntime"
-      :isDraft="dialogParams.isDraft"
+        :isDraft="isDraft"
-      :readOnly="dialogParams.readOnly"
+        :readOnly="readOnly"
         :processInstanceId="dialogParams.processInstanceId"
         :taskId="dialogParams.taskId"
-      :taskVariableList="dialogParams.variableList"
+        :taskVariableList="variableList"
       />
+    </router-view>
   </HandlerFlowTask>
 </template>
 
@@ -73,11 +77,28 @@ const { handlerFlowTaskRef, preHandlerOperation, submitConsign, handlerClose, di
 const isOnlineForm = computed(() => {
   return !!dialogParams.value.formId;
 });
-const isReadOnly = computed(() => {
+
-  return typeof dialogParams.value.readOnly === 'string'
+const isDraft = computed(() => {
-    ? dialogParams.value.readOnly === 'true'
+  return typeof dialogParams.isDraft === 'string'
-    : dialogParams.value.readOnly;
+    ? dialogParams.isDraft === 'true'
+    : dialogParams.isDraft;
 });
+const isPreview = computed(() => {
+  return typeof dialogParams.isPreview === 'string'
+    ? dialogParams.isPreview === 'true'
+    : dialogParams.isPreview;
+});
+const isRuntime = computed(() => {
+  return typeof dialogParams.isRuntime === 'string'
+    ? dialogParams.isRuntime === 'true'
+    : dialogParams.isRuntime;
+});
+const readOnly = computed(() => {
+  return typeof dialogParams.readOnly === 'string'
+    ? dialogParams.readOnly === 'true'
+    : dialogParams.readOnly;
+});
+
 const getFlowInfo = computed(() => {
   return {
     processInstanceId: dialogParams.value.processInstanceId,
@@ -85,10 +106,15 @@ const getFlowInfo = computed(() => {
     processDefinitionKey: dialogParams.value.processDefinitionKey,
     processInstanceInitiator: dialogParams.value.processInstanceInitiator,
     messageId: dialogParams.value.messageId,
-    isRuntime: dialogParams.value.isRuntime,
+    isRuntime: isRuntime.value,
-    isDraft: dialogParams.value.isDraft,
+    isDraft: isDraft.value,
   };
 });
+const variableList = computed(() => {
+  let temp = dialogParams.value.variableList;
+  const variableList = Array.isArray(temp) ? temp : JSON.parse(temp || '[]');
+  return variableList;
+});
 
 const messageStore = useMessage();
 
@@ -107,20 +133,21 @@ const getRouterCompomentFunction = (functionName: string) => {
  */
 const getMasterData = (
   operationType: string,
-  assignee: string | undefined,
+  assignee: string | Array<string> | undefined,
 ): Promise<ANY_OBJECT> => {
   return new Promise((resolve, reject) => {
     // TODO workflowFormRef.value.getFormData无须判断
     if (isOnlineForm.value && workflowFormRef.value.getFormData) {
       workflowFormRef.value
-        .getFormData(false, dialogParams.value.variableList)
+        .getFormData(false, variableList)
         .then((formData: ANY_OBJECT | null) => {
           console.log('handleerFlowTask.getMasterData 表单数据', formData);
           if (formData == null) {
             reject();
             return;
           }
-          const assigneeArr = assignee && assignee !== '' ? assignee.split(',') : undefined;
+          const assigneeArr =
+            assignee && assignee !== '' ? (assignee as string).split(',') : undefined;
           if (operationType === SysFlowTaskOperationType.MULTI_SIGN) {
             // 会签操作设置多实例处理人集合
             if (formData.taskVariableData == null) formData.taskVariableData = {};
@@ -140,7 +167,7 @@ const getMasterData = (
     } else {
       // 获得静态表单页面的getMasterData函数
       let funGetMasterData = getRouterCompomentFunction('getMasterData');
-      return funGetMasterData ? funGetMasterData(dialogParams.value.variableList) : reject();
+      return funGetMasterData ? funGetMasterData(variableList) : reject();
     }
   });
 };
@@ -271,10 +298,10 @@ const preHandlerOperationThen = (
 const handlerOperation = (
   operation: ANY_OBJECT,
   copyItemList: ANY_OBJECT[],
-  xml: string | undefined,
+  xml?: string | undefined,
 ) => {
   if (isOnlineForm.value) {
-    preHandlerOperation(operation, isStart.value || dialogParams.value.isDraft, xml, copyItemList)
+    preHandlerOperation(operation, isStart.value || isDraft.value, xml, copyItemList)
       .then(res => {
         preHandlerOperationThen(operation, copyItemList, res);
       })
@@ -302,7 +329,7 @@ const handlerOperation = (
 const handlerStart = (
   operation: ANY_OBJECT,
   copyItemList: ANY_OBJECT[],
-  xml: string | undefined,
+  xml?: string | undefined,
 ) => {
   // 启动并保存草稿后再次提交
   if (draftProcessInstanceId.value != null && draftTaskId.value != null) {
@@ -345,7 +372,7 @@ const handlerStart = (
             },
             {
               // 判断是否是从流程设计里启动
-              processDefinitionKey: dialogParams.value.isPreview
+              processDefinitionKey: isPreview.value
                 ? undefined
                 : dialogParams.value.processDefinitionKey,
             },
@@ -441,8 +468,8 @@ const initFormData = () => {
       taskId: dialogParams.value.taskId,
     };
     // 判断是展示历史流程的数据还是待办流程的数据
-    let httpCall = null;
+    let httpCall: ANY_OBJECT | null = null;
-    if (dialogParams.value.isDraft) {
+    if (isDraft.value) {
       // 草稿数据
       httpCall = FlowOperationController.viewOnlineDraftData({
         processDefinitionKey: dialogParams.value.processDefinitionKey,
@@ -455,7 +482,7 @@ const initFormData = () => {
       });
     } else {
       httpCall =
-        dialogParams.value.taskId != null && dialogParams.value.isRuntime
+        dialogParams.value.taskId != null && isRuntime.value
           ? FlowOperationController.viewUserTask(params)
           : FlowOperationController.viewHistoricProcessInstance(params);
     }
@@ -465,7 +492,7 @@ const initFormData = () => {
         // 一对多数据
         oneToManyRelationData.value = (res.data || {}).oneToMany;
         // 草稿一对多数据，添加唯一主键
-        if (dialogParams.value.isDraft || dialogParams.value.isDraft === 'true') {
+        if (isDraft.value) {
           if (oneToManyRelationData.value != null) {
             let tempTime = new Date().getTime();
             Object.keys(oneToManyRelationData.value).forEach(key => {

OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/PropertiesPanel.vue

@@ -146,6 +146,7 @@ import FormVariable from './form-variable/index.vue';
 import CopyForSelect from './copy-for/index.vue';
 import UserTaskListeners from './listeners/UserTaskListeners.vue';
 import AutoAgree from './autoAgree/index.vue';
+import RightAddBtn from '@/components/Btns/RightAddBtn.vue';
 
 const props = withDefaults(
   defineProps<{

OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/flowFormConfig.vue

@@ -260,8 +260,12 @@ const onEditOperation = (operation: ANY_OBJECT) => {
       height: '450px',
       pathName: '/thirdParty/thirdEditOperation',
     },
-  ).then(res => {
+  )
+    .then(res => {
       updateEditOperation(res);
+    })
+    .catch(e => {
+      console.warn(e);
     });
 };
 const updateEditOperation = (res: ANY_OBJECT) => {

OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/formEditOperation.vue

@@ -50,7 +50,7 @@
             >
               <el-option label="不更新" :value="undefined" />
               <el-option
-                v-for="item in dialogParams.validStatusList"
+                v-for="item in dialogParams.validStatusList.value"
                 :key="item.id"
                 :label="item.name"
                 :value="item.id"
@@ -173,7 +173,9 @@ import { Dialog } from '@/components/Dialog';
 import { DialogProp } from '@/components/Dialog/types';
 import { useThirdParty } from '@/components/thirdParty/hooks';
 import { ThirdProps } from '@/components/thirdParty/types';
+import { useLayoutStore } from '@/store';
 
+const layoutStore = useLayoutStore();
 interface IProps extends ThirdProps {
   rowData?: ANY_OBJECT;
   validStatusList?: Ref<ANY_OBJECT[]>;
@@ -185,9 +187,6 @@ const props = withDefaults(defineProps<IProps>(), {
 });
 const { thirdParams, onCloseThirdDialog } = useThirdParty(props);
 
-import { useLayoutStore } from '@/store';
-const layoutStore = useLayoutStore();
-
 const form = ref();
 const formData = ref<ANY_OBJECT>({
   id: undefined,

OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/signal-message/SignalAndMessage.vue

@@ -81,7 +81,7 @@
 <script setup lang="ts">
 import { ElMessage } from 'element-plus';
 import { VxeTable, VxeColumn } from 'vxe-table';
-
+import RightAddBtn from '@/components/Btns/RightAddBtn.vue';
 import { useLayoutStore } from '@/store';
 const layoutStore = useLayoutStore();
 

OrangeFormsOpen-VUE3/src/pages/workflow/package/theme/flow-element-variables.scss

@@ -1,6 +1,4 @@
 /* 改变主题色变量
-// $--color-primary: #1890ff;
-// $--color-danger: #ff4d4f;
 */
 
 /* 改变 icon 字体路径变量，必需 */

OrangeFormsOpen-VUE3/src/pages/workflow/package/theme/process-designer.scss

@@ -1,4 +1,3 @@
-// 边框被 token-simulation 样式覆盖了
 .djs-palette {
   background: var(--palette-background-color);
   border: solid 1px var(--palette-border-color) !important;
@@ -101,8 +100,6 @@
   }
 }
 
-//侧边栏配置
-
 .djs-palette.open .djs-palette-entries div[class^='bpmn-icon-']:before,
 .djs-palette.open .djs-palette-entries div[class*='bpmn-icon-']:before {
   line-height: unset;
@@ -187,8 +184,6 @@ pre {
   font-family: Consolas, Monaco, monospace;
 }
 
-// 流程图
-
 rect {
   stroke: #c1c2c4 !important;
   stroke-width: 1px !important;
@@ -218,7 +213,6 @@ rect {
 }
 
 .djs-container {
-  // 框
   .djs-visual {
     rect,
     polygon,
@@ -235,17 +229,13 @@ rect {
       stroke: #333333 !important;
     }
   }
-  // 线
   .djs-visual path {
     stroke: #333333 !important;
   }
-
-  // 实心箭头
   [id^='sequenceflow-end-white-black'] path {
     fill: #333333 !important;
     stroke: #333333 !important;
   }
-  // 空心箭头
   [id^='conditional-flow-marker-white-black'] path {
     stroke: #333333 !important;
   }