@ibiz-template/runtime 0.7.41-alpha.116 → 0.7.41-alpha.118

package/out/service/service/control/md-control.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/md-control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,KAAK,CACT,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAQtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAOpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAOzB;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,EAAE,GAChB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAYtC;;;;;;;OAOG;IACG,UAAU,CACd,UAAU,EAAE,gBAAgB,EAC5B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,OAAO,CAAC;IAcnB;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;CA8BvD"}
+{"version":3,"file":"md-control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/md-control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEpE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;;OASG;IACG,KAAK,CACT,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,OAAY,GACjB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAYtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAOpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAOzB;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,EAAE,GAChB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAYtC;;;;;;;OAOG;IACG,UAAU,CACd,UAAU,EAAE,gBAAgB,EAC5B,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,OAAO,CAAC;IAoBnB;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;CA8BvD"}

package/out/service/service/control/md-control.service.js

@@ -8,11 +8,16 @@ export class MDControlService extends ControlService {
      * @date 2022-08-31 17:08:41
      * @param {IContext} context 上下文
      * @param {IParams} [params={}] 视图参数
+     * @param {IParams} [args={}] 额外参数
      * @returns {*}  {Promise<IHttpResponse>}
      */
-    async fetch(context, params = {}) {
+    async fetch(context, params = {}, args = {}) {
         var _a;
-        const fetchAction = ((_a = this.model.fetchControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'fetchdefault';
+        let fetchAction = ((_a = this.model.fetchControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'fetchdefault';
+        // 识别用户定义参数导出数据集合
+        if (args.srfexportdataset) {
+            fetchAction = args.srfexportdataset;
+        }
         let res = await this.exec(fetchAction, context, params);
         res = this.handleResponse(res);
         return res;
@@ -122,8 +127,13 @@ export class MDControlService extends ControlService {
      */
     async exportData(dataExport, context, params = {}) {
         const entityService = await this.app.deService.getService(context, this.model.appDataEntityId);
-        return entityService.file.export(dataExport, dataExport.appDEDataSetId ||
-            this.model.fetchControlAction.appDEMethodId, context, params);
+        let tempFetchAction = dataExport.appDEDataSetId ||
+            this.model.fetchControlAction.appDEMethodId;
+        // 识别用户定义的视图参数导出数据集合
+        if (params.srfexportdataset) {
+            tempFetchAction = params.srfexportdataset;
+        }
+        return entityService.file.export(dataExport, tempFetchAction, context, params);
     }
     /**
      * 处理响应

package/out/ui-action/provider/front-ui-action-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,WAAW,EAEX,aAAa,EACb,cAAc,EACf,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAIL,cAAc,EACd,eAAe,EAEhB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAKjE;;;;;;GAMG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAgG3B;;;;;;;;OAQG;cACa,OAAO,CACrB,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAkC3B;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAkEhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA6B3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IA4EhB;;;;;;;;OAQG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA+D3B;;;;;;;;OAQG;cACa,aAAa,CAC3B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAuD3B;;;;;;;;OAQG;IACH,SAAS,CAAC,kBAAkB,CAC1B,SAAS,EAAE,WAAW,GAAG,SAAS,EAClC,WAAW,CAAC,EAAE,aAAa,GAC1B,WAAW,GAAG,SAAS;IAc1B;;;;;;;;OAQG;cACa,UAAU,CACxB,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CA0B5B"}
+{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,WAAW,EAEX,aAAa,EACb,cAAc,EACf,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAIL,cAAc,EACd,eAAe,EAEhB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAKjE;;;;;;GAMG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAgG3B;;;;;;;;OAQG;cACa,OAAO,CACrB,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAkC3B;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAkEhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA6B3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAiHhB;;;;;;;;OAQG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA+D3B;;;;;;;;OAQG;cACa,aAAa,CAC3B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAuD3B;;;;;;;;OAQG;IACH,SAAS,CAAC,kBAAkB,CAC1B,SAAS,EAAE,WAAW,GAAG,SAAS,EAClC,WAAW,CAAC,EAAE,aAAa,GAC1B,WAAW,GAAG,SAAS;IAc1B;;;;;;;;OAQG;cACa,UAAU,CACxB,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CA0B5B"}

package/out/ui-action/provider/front-ui-action-provider.js

@@ -243,6 +243,40 @@ export class FrontUIActionProvider extends UIActionProviderBase {
             const params = Object.assign(Object.assign({ page: 0, size: appDEDataExport.maxRowCount
                     ? appDEDataExport.maxRowCount
                     : ibiz.config.common.maxExportRowsDefault }, args.params), resultParams);
+            // 多项数据和多项数据主键如果没有选择全部界面参数则认为导出选中行
+            const { actionTarget } = action;
+            if ((actionTarget === 'MULTIDATA' || actionTarget === 'MULTIKEY') &&
+                args.view) {
+                const srfexportdatakey = presetParams.srfexportdatakey || 'srfkey';
+                if (!args.params.srfallselected) {
+                    await args.view.call(SysUIActionTag.EXPORT_EXCEL, {
+                        params: {
+                            type: 'selectedRows',
+                            srfexportdatakey,
+                            srfexportdataset: exportDatasetCodeName,
+                            srfdataexport: appDEDataExport,
+                            srfdatatype: resultContext.srfdatatype,
+                        },
+                    });
+                }
+                else {
+                    await args.view.call(SysUIActionTag.EXPORT_EXCEL, {
+                        params: {
+                            type: 'maxRowCount',
+                            srfexportdatakey,
+                            srfexportdataset: exportDatasetCodeName,
+                            srfdataexport: appDEDataExport,
+                            srfdatatype: resultContext.srfdatatype,
+                        },
+                    });
+                }
+                return;
+            }
+            // 如果srfallselected存在需要删除，规范化参数
+            if (params &&
+                Object.prototype.hasOwnProperty.call(params, 'srfallselected')) {
+                delete params.srfallselected;
+            }
             // 异步导出时只发消息不下载
             if (isAsyncAction) {
                 const app = await ibiz.hub.getAppAsync(action.appId);

package/out/ui-action/provider/ui-action-provider-base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-action-provider-base.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/ui-action-provider-base.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAgC,MAAM,kBAAkB,CAAC;AAChF,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAMzB;;;;;;;GAOG;AACH,8BAAsB,oBAAqB,YAAW,iBAAiB;IACrE;;;;;;;OAOG;IACG,IAAI,CACR,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA+H3B;;;;;;;;OAQG;IACH,SAAS,CAAC,iBAAiB,CACzB,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,eAAe,GACtB,cAAc;IASjB;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CACnB,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,eAAe,GACpB,eAAe;IAUlB;;;;;;;OAOG;IACG,SAAS,CACb,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,OAAO,CAAC;IAWnB;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CACjB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;OAWG;IACG,YAAY,CAChB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAOvC;;;;;;;;;;;;;;;;OAgBG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,EACb,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;QACT,aAAa,EAAE,QAAQ,CAAC;QACxB,UAAU,EAAE,KAAK,EAAE,CAAC;QACpB,YAAY,EAAE,OAAO,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;IAkIF;;;;;;;;;OASG;IACH,SAAS,CAAC,WAAW,CACnB,IAAI,EAAE,SAAS,GAAG,SAAS,EAC3B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,MAAM,GAAG,SAAS;IA4CrB;;;;;;;;OAQG;IACH,sBAAsB,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;CAc5C"}
+{"version":3,"file":"ui-action-provider-base.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/ui-action-provider-base.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAgC,MAAM,kBAAkB,CAAC;AAChF,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,cAAc,EACd,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAMzB;;;;;;;GAOG;AACH,8BAAsB,oBAAqB,YAAW,iBAAiB;IACrE;;;;;;;OAOG;IACG,IAAI,CACR,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA+H3B;;;;;;;;OAQG;IACH,SAAS,CAAC,iBAAiB,CACzB,IAAI,EAAE,cAAc,EACpB,MAAM,EAAE,eAAe,GACtB,cAAc;IASjB;;;;;;;;OAQG;IACH,SAAS,CAAC,WAAW,CACnB,MAAM,EAAE,eAAe,EACvB,IAAI,EAAE,eAAe,GACpB,eAAe;IAUlB;;;;;;;OAOG;IACG,SAAS,CACb,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,OAAO,CAAC;IAWnB;;;;;;;;;;;;OAYG;IACH,QAAQ,CAAC,UAAU,CACjB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,GACrB,OAAO,CAAC,eAAe,CAAC;IAE3B;;;;;;;;;;;OAWG;IACG,YAAY,CAChB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;IAOvC;;;;;;;;;;;;;;;;OAgBG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,EAAE,EACb,MAAM,EAAE,OAAO,GACd,OAAO,CAAC;QACT,aAAa,EAAE,QAAQ,CAAC;QACxB,UAAU,EAAE,KAAK,EAAE,CAAC;QACpB,YAAY,EAAE,OAAO,CAAC;QACtB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC;IAwIF;;;;;;;;;OASG;IACH,SAAS,CAAC,WAAW,CACnB,IAAI,EAAE,SAAS,GAAG,SAAS,EAC3B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,MAAM,GAAG,SAAS;IA4CrB;;;;;;;;OAQG;IACH,sBAAsB,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK;CAc5C"}

package/out/ui-action/provider/ui-action-provider-base.js

@@ -276,6 +276,11 @@ export class UIActionProviderBase {
             presetParams.srfexportdataset = resultParams.srfexportdataset;
             delete resultParams.srfexportdataset;
         }
+        // srfexportdatakey（指定数据导出传入数据主键属性）
+        if (resultParams.hasOwnProperty('srfexportdatakey')) {
+            presetParams.srfexportdatakey = resultParams.srfexportdatakey;
+            delete resultParams.srfexportdatakey;
+        }
         // srfasyncaction（指定当前界面行为是否异步（目前仅数据导出使用））
         if (resultParams.hasOwnProperty('srfasyncaction')) {
             presetParams.srfasyncaction = resultParams.srfasyncaction;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.41-alpha.116",
+  "version": "0.7.41-alpha.118",
   "description": "运行时逻辑库",
   "type": "module",
   "main": "out/index.js",
@@ -39,8 +39,8 @@
     "jsencrypt": "^3.3.2"
   },
   "devDependencies": {
-    "@ibiz-template/core": "^0.7.41-alpha.113",
-    "@ibiz/model-core": "^0.1.88",
+    "@ibiz-template/core": "^0.7.41-alpha.117",
+    "@ibiz/model-core": "^0.1.89",
     "@types/animejs": "^3.1.12",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
@@ -58,7 +58,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.6.0",
-    "@ibiz/model-core": "^0.1.88",
+    "@ibiz/model-core": "^0.1.89",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -70,5 +70,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "884c135f203cf1a0ae3977442b559b757acd6b47"
+  "gitHead": "6e2a655f863bd0aa39183fd376020560aae9c479"
 }

package/src/controller/common/control/md-control.controller.ts

@@ -24,6 +24,7 @@ import {
   MDCtrlRemoveParams,
   IToolbarController,
   IMDControlController,
+  IApiExportParams,
 } from '../../../interface';
 import { calcDeCodeNameById } from '../../../model';
 import { MDControlService, Srfuf } from '../../../service';
@@ -187,6 +188,7 @@ export class MDControlController<
     this.state.groups = [];
     this.state.hideNoDataImage = false;
     this.state.enableGroup = !!(this.model as IData).enableGroup;
+    this.state.isSelectedAll = false;
   }
 
   /**
@@ -873,11 +875,14 @@ export class MDControlController<
   /**
    * 数据导出
    *
-   * @param {MouseEvent} event 原生js点击事件
+   * @param {{ event?: MouseEvent; params?: IApiExportParams }} _args 导出参数
    * @returns {*}  {Promise<void>}
    * @memberof MDControlController
    */
-  async exportData(_args: { event: MouseEvent }): Promise<void> {
+  async exportData(_args: {
+    event?: MouseEvent;
+    params?: IApiExportParams;
+  }): Promise<void> {
     // const { dataExport, appEntity } = this.model;
     // if (!dataExport) {
     //   throw new DefectModelError(this.model.source, '没有配置实体导出模型！');

package/src/controller/control/grid/grid/grid.controller.ts

@@ -1571,10 +1571,14 @@ export class GridController<
    * @author zk
    * @date 2023-07-20 04:07:49
    * @param {MDCtrlLoadParams} args
+   * @param {IParams} [fetchArgs={}] 透传给 service.fetch 的额外参数，如 srfexportdataset
    * @return {*}
    * @memberof GridController
    */
-  async loadData(args: MDCtrlLoadParams): Promise<ControlVO[]> {
+  async loadData(
+    args: MDCtrlLoadParams,
+    fetchArgs: IParams = {},
+  ): Promise<ControlVO[]> {
     // *查询参数处理
     const { context } = this.handlerAbilityParams(args);
     const params = await this.getFetchParams(args?.viewParam);
@@ -1582,7 +1586,7 @@ export class GridController<
     // *发起请求
     await this.startLoading();
     try {
-      res = await this.service.fetch(context, params);
+      res = await this.service.fetch(context, params, fetchArgs);
     } finally {
       await this.endLoading();
     }
@@ -1786,7 +1790,14 @@ export class GridController<
                 ibiz.config.common.maxExportRowsDefault,
               page: 0,
             };
-      data = await this.loadData({ viewParam });
+      // 识别用户定义的视图参数导出数据集合
+      data = await this.loadData(
+        { viewParam },
+        {
+          srfexportdataset:
+            params.srfexportdataset || this.params.srfexportdataset,
+        },
+      );
     } else if (type === 'selectedRows') {
       data = this.getData();
     }
@@ -1803,6 +1814,11 @@ export class GridController<
    * @param params 额外参数
    */
   async excuteBackendExport(params: IApiExportParams): Promise<void> {
+    // 构建导出模型
+    let tempDataExport = this.dataExport;
+    if (params.srfdataexport) {
+      tempDataExport = params.srfdataexport as IAppDEDataExport;
+    }
     // 准备参数
     const fetchParams = await this.getFetchParams({ ...this.params });
     let tempParams: IParams = {};
@@ -1820,9 +1836,12 @@ export class GridController<
           ibiz.i18n.t('runtime.controller.control.grid.exported'),
         );
       }
+      // 用户通过视图参数srfexportdatakey指定导出选中数据的数据主键属性
+      const srfexportdatakey =
+        params.srfexportdatakey || this.params.srfexportdatakey || 'srfkey';
       tempParams = {
         page: 0,
-        srfkeys: selectedData.map(data => data.srfkey).join(','),
+        srfkeys: selectedData.map(data => data[srfexportdatakey]).join(','),
       };
     } else if (type === 'maxRowCount' || type === 'customPage') {
       const { size } = this.state;
@@ -1836,14 +1855,26 @@ export class GridController<
             }
           : {
               size:
-                this.dataExport?.maxRowCount ||
+                tempDataExport?.maxRowCount ||
                 ibiz.config.common.maxExportRowsDefault,
               page: 0,
             };
     }
+    // 自定义导出数据集，优先使用外部传入，避免被上面分支的整体赋值覆盖
+    if (params.srfexportdataset) {
+      tempParams.srfexportdataset = params.srfexportdataset;
+    }
     Object.assign(fetchParams, tempParams);
+
+    // 构建上下文
+    const tempContext = clone(this.context);
+    if (params.srfdatatype) {
+      Object.assign(tempContext, {
+        srfdatatype: params.srfdatatype,
+      });
+    }
     // 执行导出
-    await this.service.exportData(this.dataExport!, this.context, fetchParams);
+    await this.service.exportData(tempDataExport!, tempContext, fetchParams);
   }
 
   /**
@@ -1854,7 +1885,7 @@ export class GridController<
    */
   async exportData(args: {
     params: IApiExportParams;
-    event: MouseEvent;
+    event?: MouseEvent;
   }): Promise<void> {
     if (this.dataExport?.enableBackend) {
       await this.excuteBackendExport(args.params);

package/src/controller/control/md-ctrl/md-ctrl.controller.ts

@@ -645,10 +645,14 @@ export class MDCtrlController
   /**
    * @description 加载数据(只加载数据 不做其他操作)
    * @param {MDCtrlLoadParams} args
+   * @param {IParams} [fetchArgs={}] 透传给 service.fetch 的额外参数，如 srfexportdataset
    * @returns {*}  {Promise<IData[]>}
    * @memberof MDCtrlController
    */
-  async loadData(args: MDCtrlLoadParams): Promise<IData[]> {
+  async loadData(
+    args: MDCtrlLoadParams,
+    fetchArgs: IParams = {},
+  ): Promise<IData[]> {
     // *查询参数处理
     const { context } = this.handlerAbilityParams(args);
     const params = await this.getFetchParams(args?.viewParam);
@@ -656,7 +660,7 @@ export class MDCtrlController
     // *发起请求
     await this.startLoading();
     try {
-      res = await this.service.fetch(context, params);
+      res = await this.service.fetch(context, params, fetchArgs);
     } finally {
       await this.endLoading();
     }
@@ -691,7 +695,14 @@ export class MDCtrlController
                 ibiz.config.common.maxExportRowsDefault,
               page: 0,
             };
-      data = await this.loadData({ viewParam });
+      // 识别用户定义的视图参数导出数据集合
+      data = await this.loadData(
+        { viewParam },
+        {
+          srfexportdataset:
+            params.srfexportdataset || this.params.srfexportdataset,
+        },
+      );
     } else if (type === 'selectedRows') {
       data = this.getData();
     }
@@ -760,6 +771,11 @@ export class MDCtrlController
    * @memberof MDCtrlController
    */
   async excuteBackendExport(params: IApiExportParams): Promise<void> {
+    // 构建导出模型
+    let tempDataExport = this.dataExport;
+    if (params.srfdataexport) {
+      tempDataExport = params.srfdataexport as IAppDEDataExport;
+    }
     // 准备参数
     const fetchParams = await this.getFetchParams({ ...this.params });
     let tempParams: IParams = {};
@@ -777,9 +793,12 @@ export class MDCtrlController
           ibiz.i18n.t('runtime.controller.common.md.exported'),
         );
       }
+      // 用户通过视图参数srfexportdatakey指定导出选中数据的数据主键属性
+      const srfexportdatakey =
+        params.srfexportdatakey || this.params.srfexportdatakey || 'srfkey';
       tempParams = {
         page: 0,
-        srfkeys: selectedData.map(data => data.srfkey).join(','),
+        srfkeys: selectedData.map(data => data[srfexportdatakey]).join(','),
       };
     } else if (type === 'maxRowCount' || type === 'customPage') {
       const { size } = this.state;
@@ -793,14 +812,25 @@ export class MDCtrlController
             }
           : {
               size:
-                this.dataExport?.maxRowCount ||
+                tempDataExport?.maxRowCount ||
                 ibiz.config.common.maxExportRowsDefault,
               page: 0,
             };
     }
+    // 自定义导出数据集，优先使用外部传入，避免被上面分支的整体赋值覆盖
+    if (params.srfexportdataset) {
+      tempParams.srfexportdataset = params.srfexportdataset;
+    }
     Object.assign(fetchParams, tempParams);
+    // 构建上下文
+    const tempContext = clone(this.context);
+    if (params.srfdatatype) {
+      Object.assign(tempContext, {
+        srfdatatype: params.srfdatatype,
+      });
+    }
     // 执行导出
-    await this.service.exportData(this.dataExport!, this.context, fetchParams);
+    await this.service.exportData(tempDataExport!, tempContext, fetchParams);
   }
 
   /**

package/src/controller/control/toolbar/toolbar.controller.ts

@@ -228,9 +228,18 @@ export class ToolbarController<
    */
   async getToolbarEventArgs(): Promise<Omit<EventBase, 'eventName'>> {
     const result = this.getEventArgs();
+    const newParams = {
+      ...result.params,
+    };
     let data: IData[] = [];
     if (this.xdataControl) {
       data = this.xdataControl?.getData() || [];
+      // 数据导出界面行为需要界面是否选择全部状态，选择全部则导出全部，否则按选中数据导出
+      if ((this.xdataControl as IData).state?.isSelectedAll) {
+        Object.assign(newParams, {
+          srfallselected: true,
+        });
+      }
     } else {
       data = (await this.ctx.view.call(ViewCallTag.GET_DATA)) || [];
     }
@@ -238,6 +247,7 @@ export class ToolbarController<
       ...result,
       data,
       ctrl: this,
+      params: newParams,
     };
   }
 
@@ -460,6 +470,8 @@ export class ToolbarController<
     appDeId?: string,
     _params: IParams = {},
   ): Promise<void> {
+    const app = await ibiz.hub.getApp(this.context.srfappid);
+
     let _data = data;
     if (data && data instanceof ControlVO) {
       _data = data.getOrigin();
@@ -477,23 +489,23 @@ export class ToolbarController<
         itemState.visible = false;
       }
     });
-    // 计算菜单项逻辑的预置逻辑
-    if (this.scheduler) {
-      const logicParams: IData = {};
-      if (_params) {
-        Object.assign(logicParams, { ..._params });
-      }
-      if (_data) {
-        logicParams.data = [_data];
-      }
-      // 遍历所有的项
-      recursiveIterate(
-        this.model,
-        (item: IDEToolbarItem) => {
-          const itemState = this.state.buttonsState[item.id!] as IButtonState;
-          if (!itemState) {
-            return;
-          }
+    const logicParams: IData = {};
+    if (_params) {
+      Object.assign(logicParams, { ..._params });
+    }
+    if (_data) {
+      logicParams.data = [_data];
+    }
+    // 遍历所有的项
+    recursiveIterate(
+      this.model,
+      (item: IDEToolbarItem) => {
+        const itemState = this.state.buttonsState[item.id!] as IButtonState;
+        if (!itemState) {
+          return;
+        }
+        // 计算菜单项逻辑的预置逻辑
+        if (this.scheduler) {
           // 计算项显示逻辑
           if (itemState.visible) {
             const dynaVisible = this.scheduler!.triggerItemVisible(
@@ -515,10 +527,18 @@ export class ToolbarController<
               itemState.disabled = !dynaEnable;
             }
           }
-        },
-        { childrenFields: ['detoolbarItems'] },
-      );
-    }
+        }
+
+        // 如果有统一资源且当前项显示，无权限则隐藏
+        if (item.accessKey && itemState.visible) {
+          const permitted = app.authority.calcByResCode(item.accessKey);
+          if (!permitted) {
+            itemState.visible = false;
+          }
+        }
+      },
+      { childrenFields: ['detoolbarItems'] },
+    );
     this.state.hideSeparator = formatSeparator(
       'TOOLBAR',
       this.model.detoolbarItems,

package/src/interface/api/common/i-api-export-params.ts

@@ -24,4 +24,32 @@ export interface IApiExportParams {
    * @memberof IApiExportParams
    */
   endPage?: number;
+
+  /**
+   * @description 自定义导出数据主键属性
+   * @type {string}
+   * @memberof IApiExportParams
+   */
+  srfexportdatakey?: string;
+
+  /**
+   * @description 自定义导出数据集
+   * @type {string}
+   * @memberof IApiExportParams
+   */
+  srfexportdataset?: string;
+
+  /**
+   * @description 自定义导出模型对象
+   * @type {IData}
+   * @memberof IApiExportParams
+   */
+  srfdataexport?: IData;
+
+  /**
+   * @description 自定义导出数据类型
+   * @type {string}
+   * @memberof IApiExportParams
+   */
+  srfdatatype?: string;
 }

package/src/interface/api/controller/control/i-api-tree-grid.controller.ts

@@ -37,9 +37,9 @@ export interface IApiTreeGridController<
 
   /**
    * @description 数据导出
-   * @param {{ event: MouseEvent; params: IApiExportParams }} _args 导出参数
+   * @param {{ event?: MouseEvent; params?: IApiExportParams }} _args 导出参数
    * @returns {*}  {Promise<void>}
    * @memberof IApiTreeGridController
    */
-  exportData(_args: {event: MouseEvent;params: IApiExportParams}): Promise<void>;
+  exportData(_args: {event?: MouseEvent;params?: IApiExportParams}): Promise<void>;
 }

package/src/interface/api/state/control/i-api-md-control.state.ts

@@ -175,6 +175,14 @@ export interface IApiMDControlState extends IApiControlState {
    * @memberof IApiMDControlState
    */
   enableGroup: boolean;
+
+  /**
+   * @description 是否全选，该状态目前仅PC端表格使用。
+   * @type {boolean}
+   * @default false
+   * @memberof IApiMDControlState
+   */
+  isSelectedAll: boolean;
 }
 
 /**

package/src/interface/controller/controller/control/i-grid.controller.ts

@@ -58,13 +58,13 @@ export interface IGridController<
 
   /**
    * @description 导出数据
-   * @param {{ event: MouseEvent; params: IApiExportParams }} args
+   * @param {{ event?: MouseEvent; params: IApiExportParams }} args
    * @returns {*}  {Promise<void>}
    * @memberof IGridController
    */
   exportData(args: {
-    event: MouseEvent;
-    params: IApiExportParams;
+    event?: MouseEvent;
+    params?: IApiExportParams;
   }): Promise<void>;
 }
 

package/src/interface/controller/controller/control/i-md-control.controller.ts

@@ -7,6 +7,7 @@ import {
   IApiMDControlController,
   IApiMDCtrlLoadParams,
   IApiMDCtrlRemoveParams,
+  IApiExportParams,
 } from '../../../api';
 import { IViewController } from '../view';
 /**
@@ -69,9 +70,12 @@ export interface IMDControlController<
 
   /**
    * @description 导出数据
-   * @param {{ event: MouseEvent }} _args
+   * @param {{ event?: MouseEvent; params?: IApiExportParams }} _args
    * @returns {*}  {Promise<void>}
    * @memberof IMDControlController
    */
-  exportData(_args: { event: MouseEvent }): Promise<void>;
+  exportData(_args: {
+    event?: MouseEvent;
+    params?: IApiExportParams;
+  }): Promise<void>;
 }

package/src/platform/provider/platform-provider-base.ts

@@ -80,6 +80,21 @@ export abstract class PlatformProviderBase implements IPlatformProvider {
    */
   async backendExport(args: IBackendExportParams): Promise<boolean> {
     const { baseURL, url, method, params, data, newWindow } = args;
+
+    // 规范化参数
+    if (
+      data &&
+      Object.prototype.hasOwnProperty.call(data, 'srfexportdataset')
+    ) {
+      delete data.srfexportdataset;
+    }
+    if (
+      data &&
+      Object.prototype.hasOwnProperty.call(data, 'srfexportdatakey')
+    ) {
+      delete data.srfexportdatakey;
+    }
+
     const response = await (ibiz.net.request(url, {
       data,
       method,

package/src/service/service/control/md-control.service.ts

@@ -14,14 +14,20 @@ export class MDControlService<
    * @date 2022-08-31 17:08:41
    * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
+   * @param {IParams} [args={}] 额外参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async fetch(
     context: IContext,
     params: IParams = {},
+    args: IParams = {},
   ): Promise<IHttpResponse<ControlVO[]>> {
-    const fetchAction =
+    let fetchAction =
       this.model.fetchControlAction?.appDEMethodId || 'fetchdefault';
+    // 识别用户定义参数导出数据集合
+    if (args.srfexportdataset) {
+      fetchAction = args.srfexportdataset;
+    }
     let res = await this.exec(fetchAction, context, params);
     res = this.handleResponse(res);
     return res as IHttpResponse<ControlVO[]>;
@@ -166,10 +172,16 @@ export class MDControlService<
       context,
       this.model.appDataEntityId!,
     );
+    let tempFetchAction =
+      dataExport.appDEDataSetId ||
+      this.model.fetchControlAction!.appDEMethodId!;
+    // 识别用户定义的视图参数导出数据集合
+    if (params.srfexportdataset) {
+      tempFetchAction = params.srfexportdataset;
+    }
     return entityService.file.export(
       dataExport,
-      dataExport.appDEDataSetId ||
-        this.model.fetchControlAction!.appDEMethodId!,
+      tempFetchAction,
       context,
       params,
     );