@ibiz-template/runtime 0.7.41-alpha.115 → 0.7.41-alpha.117

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;IAkGhB;;;;;;;;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,24 @@ 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.params.srfallselected) {
+                const srfexportdatakey = presetParams.srfexportdatakey || 'srfkey';
+                const tempParams = {};
+                if (args && args.data && args.data.length > 0) {
+                    Object.assign(tempParams, {
+                        srfkeys: args.data.map(data => data[srfexportdatakey]).join(','),
+                    });
+                }
+                Object.assign(params, tempParams);
+            }
+            // 如果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.115",
+  "version": "0.7.41-alpha.117",
   "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": "107eb2866f38c030a08572b09da812a13b67ac66"
+  "gitHead": "d78a9099a5f4b8820786c9e58372ef68d8e30c4c"
 }

package/src/config/global-config.ts

@@ -131,6 +131,7 @@ export class GlobalConfig implements IGlobalConfig {
     counterMaxValue: 99,
     enhancedUI: false,
     maxExportRowsDefault: 1000,
+    uiActionPermissionMode: 'default',
   };
 
   // 全局分页流布局配置

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

@@ -187,6 +187,7 @@ export class MDControlController<
     this.state.groups = [];
     this.state.hideNoDataImage = false;
     this.state.enableGroup = !!(this.model as IData).enableGroup;
+    this.state.isSelectedAll = false;
   }
 
   /**
@@ -792,12 +793,12 @@ export class MDControlController<
     this.batchToolbarController?.calcButtonState(
       data,
       this.model.appDataEntityId,
-      { view: this.view, ctrl: this },
+      { view: this.view, ctrl: this, data: selection },
     );
     this.quickToolbarController?.calcButtonState(
       data,
       this.model.appDataEntityId,
-      { view: this.view, ctrl: this },
+      { view: this.view, ctrl: this, data: selection },
     );
   }
 

package/src/controller/control/data-view/data-view.controller.ts

@@ -323,6 +323,7 @@ export class DataViewControlController<
             this.context,
             actionGroup.selectedData![0],
             this.model.appDataEntityId!,
+            actionGroup.selectedData,
           );
         }
       }
@@ -335,7 +336,6 @@ export class DataViewControlController<
    * @date 2024-05-29 19:18:42
    * @return {*}  {void}
    */
-
   calcShowMode(items: IData): void {
     const { enablePagingBar } = this.model;
     this.state.hideNoDataImage = false;

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,11 @@ export class GridController<
                 ibiz.config.common.maxExportRowsDefault,
               page: 0,
             };
-      data = await this.loadData({ viewParam });
+      // 识别用户定义的视图参数导出数据集合
+      data = await this.loadData(
+        { viewParam },
+        { srfexportdataset: this.params.srfexportdataset },
+      );
     } else if (type === 'selectedRows') {
       data = this.getData();
     }
@@ -1820,9 +1828,11 @@ export class GridController<
           ibiz.i18n.t('runtime.controller.control.grid.exported'),
         );
       }
+      // 用户通过视图参数srfexportdatakey指定导出选中数据的数据主键属性
+      const 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;

package/src/controller/control/kanban/kanban.controller.ts

@@ -645,10 +645,12 @@ export class KanbanController
     batchtoolbar?.calcButtonState(data, this.model.appDataEntityId, {
       view: this.view,
       ctrl: this,
+      data: selection,
     });
     quicktoolbar?.calcButtonState(data, this.model.appDataEntityId, {
       view: this.view,
       ctrl: this,
+      data: selection,
     });
   }
 }

package/src/controller/control/list/list.controller.ts

@@ -908,6 +908,7 @@ export class ListController
             this.context,
             actionGroup.selectedData![0],
             this.model.appDataEntityId!,
+            actionGroup.selectedData,
           );
         }
       }

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,11 @@ export class MDCtrlController
                 ibiz.config.common.maxExportRowsDefault,
               page: 0,
             };
-      data = await this.loadData({ viewParam });
+      // 识别用户定义的视图参数导出数据集合
+      data = await this.loadData(
+        { viewParam },
+        { srfexportdataset: this.params.srfexportdataset },
+      );
     } else if (type === 'selectedRows') {
       data = this.getData();
     }
@@ -777,9 +785,11 @@ export class MDCtrlController
           ibiz.i18n.t('runtime.controller.common.md.exported'),
         );
       }
+      // 用户通过视图参数srfexportdatakey指定导出选中数据的数据主键属性
+      const 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;

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,11 +470,18 @@ 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();
     }
-    await this.state.buttonsState.update(this.context, _data, appDeId);
+    await this.state.buttonsState.update(
+      this.context,
+      _data,
+      appDeId,
+      _params.data,
+    );
     // 配置是否隐藏 isHiddenItem
     this.allToolbarItems.forEach(item => {
       const itemState = this.state.buttonsState[item.id!] as IButtonState;
@@ -510,6 +527,14 @@ export class ToolbarController<
               itemState.disabled = !dynaEnable;
             }
           }
+
+          // 如果有统一资源且当前项显示，无权限则隐藏
+          if (item.accessKey && itemState.visible) {
+            const permitted = app.authority.calcByResCode(item.accessKey);
+            if (!permitted) {
+              itemState.visible = false;
+            }
+          }
         },
         { childrenFields: ['detoolbarItems'] },
       );

package/src/controller/utils/button-state/button-container.state.ts

@@ -90,10 +90,11 @@ export class ButtonContainerState implements IButtonContainerState {
     context: IContext,
     data?: IData,
     appDeId?: string,
+    selections?: IData[],
   ): Promise<void> {
     await Promise.all(
       this.children.map(child => {
-        return child.update(context, data, appDeId);
+        return child.update(context, data, appDeId, selections);
       }),
     );
     this.visible = this.computeVisable();

package/src/controller/utils/button-state/ui-action-button.state.ts

@@ -242,6 +242,7 @@ export class UIActionButtonState implements IButtonState {
     context: IContext,
     data?: IData,
     appDeId?: string,
+    selections: IData[] = [],
   ): Promise<void> {
     if (!this.isInit) {
       await this.init();
@@ -255,8 +256,17 @@ export class UIActionButtonState implements IButtonState {
       // 有权限时显示
       this.visible = true;
       // 有权限时没数据有些要禁用，有数据没主见时(单项数据)需要禁用
-      this.disabled =
+      let disabled =
         this.noDataDisabled && (!data || (this.noKeyDisabled && !data.srfkey));
+      // 严格模式（单数据目标行为在多选时禁用）
+      if (
+        ibiz.config.common.uiActionPermissionMode === 'strict' &&
+        (this.actionTarget === 'SINGLEDATA' ||
+          this.actionTarget === 'SINGLEKEY')
+      ) {
+        disabled = disabled || selections.length > 1;
+      }
+      this.disabled = disabled;
     }
     await this.calcEnableScript(context, data);
     await this.calcVisibleScript(context, data);

package/src/interface/api/common/global-config/i-api-global-common-config.ts

@@ -77,6 +77,16 @@ export interface IApiGlobalCommonConfig {
    */
   mergeAppMenu: 'default' | 'disable';
 
+  /**
+   * @description 界面行为权限校验模式，值为 'default' 时表示默认模式（单数据目标行为在多选时不禁用），值为 'strict' 时表示严格模式（单数据目标行为在多选时禁用）
+   * @type {('default' | 'strict')}
+   * @default default
+   * @platform web
+   * @platform mob
+   * @memberof IApiGlobalCommonConfig
+   */
+  uiActionPermissionMode: 'default' | 'strict';
+
   /**
    * @description 是否启用AI聊天最小化
    * @type {boolean}

package/src/interface/api/state/common/i-api-button-container.state.ts

@@ -34,6 +34,7 @@ export interface IApiButtonContainerState {
    * @param {IApiContext} context 上下文
    * @param {IApiData} [data] 实体数据
    * @param {string} [appDeId] 实体标识
+   * @param {IData[]} [selections] 选中数据集合
    * @returns {*}  {Promise<void>}
    * @memberof IApiButtonContainerState
    */
@@ -41,6 +42,7 @@ export interface IApiButtonContainerState {
     context: IApiContext,
     data?: IApiData,
     appDeId?: string,
+    selections?: IData[],
   ): Promise<void>;
 
   [p: string]: any;

package/src/interface/api/state/common/i-api-button.state.ts

@@ -41,6 +41,7 @@ export interface IApiButtonState {
    * @param {IApiContext} context 上下文
    * @param {IApiData} [data] 实体数据
    * @param {string} [appDeId] 实体标识
+   * @param {IData[]} [selections] 选中数据集合
    * @returns {*}  {Promise<void>}
    * @memberof IApiButtonState
    */
@@ -48,5 +49,6 @@ export interface IApiButtonState {
     context: IApiContext,
     data?: IApiData,
     appDeId?: string,
+    selections?: IData[],
   ): 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/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,
     );

package/src/ui-action/provider/front-ui-action-provider.ts

@@ -357,6 +357,28 @@ export class FrontUIActionProvider extends UIActionProviderBase {
         ...args.params,
         ...resultParams,
       };
+      // 多项数据和多项数据主键如果没有选择全部界面参数则认为导出选中行
+      const { actionTarget } = action;
+      if (
+        (actionTarget === 'MULTIDATA' || actionTarget === 'MULTIKEY') &&
+        !args.params.srfallselected
+      ) {
+        const srfexportdatakey = presetParams.srfexportdatakey || 'srfkey';
+        const tempParams = {};
+        if (args && args.data && args.data.length > 0) {
+          Object.assign(tempParams, {
+            srfkeys: args.data.map(data => data[srfexportdatakey]).join(','),
+          });
+        }
+        Object.assign(params, tempParams);
+      }
+      // 如果srfallselected存在需要删除，规范化参数
+      if (
+        params &&
+        Object.prototype.hasOwnProperty.call(params, 'srfallselected')
+      ) {
+        delete params.srfallselected;
+      }
 
       // 异步导出时只发消息不下载
       if (isAsyncAction) {

package/src/ui-action/provider/ui-action-provider-base.ts

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