@ibiz-template/runtime 0.7.41-alpha.108 → 0.7.41-alpha.109
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.esm.js +48 -5
- package/dist/index.system.min.js +1 -1
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-md.controller.d.ts.map +1 -1
- package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-md.controller.js +10 -1
- package/out/controller/control/form/search-form/search-form.controller.d.ts +3 -1
- package/out/controller/control/form/search-form/search-form.controller.d.ts.map +1 -1
- package/out/controller/control/form/search-form/search-form.controller.js +21 -1
- package/out/controller/control/search-bar/search-bar.controller.d.ts +1 -1
- package/out/controller/control/search-bar/search-bar.controller.d.ts.map +1 -1
- package/out/controller/control/search-bar/search-bar.controller.js +12 -2
- package/out/interface/api/controller/control/i-api-search-bar.controller.d.ts +1 -1
- package/out/interface/api/controller/control/i-api-search-bar.controller.d.ts.map +1 -1
- package/out/interface/api/controller/control/i-api-search-form.controller.d.ts +4 -1
- package/out/interface/api/controller/control/i-api-search-form.controller.d.ts.map +1 -1
- package/out/interface/controller/event/argument/before-search.event.d.ts +13 -0
- package/out/interface/controller/event/argument/before-search.event.d.ts.map +1 -0
- package/out/interface/controller/event/argument/before-search.event.js +1 -0
- package/out/interface/controller/event/argument/index.d.ts +1 -0
- package/out/interface/controller/event/argument/index.d.ts.map +1 -1
- package/out/interface/controller/event/control/i-search-bar.event.d.ts +18 -1
- package/out/interface/controller/event/control/i-search-bar.event.d.ts.map +1 -1
- package/out/interface/controller/event/control/i-search-form.event.d.ts +18 -1
- package/out/interface/controller/event/control/i-search-form.event.d.ts.map +1 -1
- package/out/ui-action/provider/ui-action-provider-base.d.ts.map +1 -1
- package/out/ui-action/provider/ui-action-provider-base.js +9 -1
- package/package.json +4 -4
- package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-md.controller.ts +11 -1
- package/src/controller/control/form/search-form/search-form.controller.ts +23 -1
- package/src/controller/control/search-bar/search-bar.controller.ts +13 -2
- package/src/interface/api/controller/control/i-api-search-bar.controller.ts +1 -1
- package/src/interface/api/controller/control/i-api-search-form.controller.ts +2 -1
- package/src/interface/controller/event/argument/before-search.event.ts +12 -0
- package/src/interface/controller/event/argument/index.ts +1 -0
- package/src/interface/controller/event/control/i-search-bar.event.ts +14 -1
- package/src/interface/controller/event/control/i-search-form.event.ts +14 -1
- package/src/ui-action/provider/ui-action-provider-base.ts +18 -1
package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl-md.controller.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form-mdctrl-md.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-md.controller.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,uBAAuB,EACxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;GAMG;AACH,qBAAa,sBACX,SAAQ,oBACR,YAAW,uBAAuB;IAElC;;;;OAIG;IACH,UAAU,EAAG,gBAAgB,CAAC;IAE9B;;;;OAIG;IACH,YAAY,EAAG,oBAAoB,CAAC;IAEpC;;;OAGG;IACH,oBAAoB,UAAS;IAE7B;;;OAGG;IACH,aAAa,UAAS;IAEtB;;;;;OAKG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"form-mdctrl-md.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-md.controller.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EACpB,uBAAuB,EACxB,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;GAMG;AACH,qBAAa,sBACX,SAAQ,oBACR,YAAW,uBAAuB;IAElC;;;;OAIG;IACH,UAAU,EAAG,gBAAgB,CAAC;IAE9B;;;;OAIG;IACH,YAAY,EAAG,oBAAoB,CAAC;IAEpC;;;OAGG;IACH,oBAAoB,UAAS;IAE7B;;;OAGG;IACH,aAAa,UAAS;IAEtB;;;;;OAKG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAqCvC;;;;OAIG;IACH,YAAY,CAAC,UAAU,EAAE,oBAAoB,GAAG,IAAI;IAepD;;;;OAIG;IACH,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAM/B;;;OAGG;IACH,MAAM,IAAI,IAAI;IAMd;;;OAGG;IACH,MAAM,IAAI,IAAI;IAad;;;OAGG;IACH,OAAO,IAAI,IAAI;IAWf;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAK5D;;;;;OAKG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IActD;;;;OAIG;IACH,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAMtC;;;;OAIG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAM5B"}
|
|
@@ -40,13 +40,22 @@ export class FormMDCtrlMDController extends FormMDCtrlController {
|
|
|
40
40
|
async onInit() {
|
|
41
41
|
var _a;
|
|
42
42
|
await super.onInit();
|
|
43
|
-
const { contentControl } = this.model;
|
|
43
|
+
const { appId, contentControl } = this.model;
|
|
44
44
|
if (!contentControl) {
|
|
45
45
|
if (((_a = this.context) === null || _a === void 0 ? void 0 : _a.srfrunmode) === 'DESIGN') {
|
|
46
46
|
return;
|
|
47
47
|
}
|
|
48
48
|
throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.control.form.unconfiguredWidgets'));
|
|
49
49
|
}
|
|
50
|
+
// 合并部件参数
|
|
51
|
+
if (this.model.ctrlParams) {
|
|
52
|
+
mergeInLeft(contentControl, {
|
|
53
|
+
controlParam: {
|
|
54
|
+
appId,
|
|
55
|
+
ctrlParams: this.model.ctrlParams,
|
|
56
|
+
},
|
|
57
|
+
});
|
|
58
|
+
}
|
|
50
59
|
// 把修改表格的模型，把行编辑打开，行新建看多数据部件的新建是否开启
|
|
51
60
|
if (contentControl.controlType === 'GRID') {
|
|
52
61
|
mergeInLeft(contentControl, {
|
|
@@ -77,7 +77,9 @@ export declare class SearchFormController extends FormController<IDESearchForm,
|
|
|
77
77
|
* @date 2023-03-26 02:27:23
|
|
78
78
|
* @return {*} {Promise<void>}
|
|
79
79
|
*/
|
|
80
|
-
search(
|
|
80
|
+
search(args?: {
|
|
81
|
+
silentVerify: boolean;
|
|
82
|
+
}): Promise<void>;
|
|
81
83
|
/**
|
|
82
84
|
* 搜索表单按钮回调
|
|
83
85
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/search-form/search-form.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,
|
|
1
|
+
{"version":3,"file":"search-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/form/search-form/search-form.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAEL,qBAAqB,EACrB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAa,MAAM,qBAAqB,CAAC;AAG/D;;;;;;;;;GASG;AACH,qBAAa,oBACX,SAAQ,cAAc,CAAC,aAAa,EAAE,gBAAgB,EAAE,gBAAgB,CACxE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,OAAO,EAAG,iBAAiB,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,KAAK,CAAmB;IAE3C;;;;;OAKG;IACH,MAAM,EAAG,aAAa,CAAC;IAEvB;;;;;OAKG;IACH,IAAI,gBAAgB,IAAI,SAAS,GAAG,aAAa,CAKhD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;cAMX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B1C;;;;;;OAMG;IACH,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAiBhC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAqB5B;;;;;;OAMG;IACH,eAAe,IAAI,OAAO;IA+B1B;;;;;OAKG;IACG,MAAM,CAAC,IAAI,CAAC,EAAE;QAAE,YAAY,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB7D;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1C;;;;;OAKG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5B;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAOtD;;;;;;OAMG;IACG,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAQlD;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,IAAI;IAuDvC;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAUjC;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IASjC;;;;;;OAMG;IACG,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9C;;;;;OAKG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IActC;;;;;OAKG;IACG,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAUvD"}
|
|
@@ -154,7 +154,27 @@ export class SearchFormController extends FormController {
|
|
|
154
154
|
* @date 2023-03-26 02:27:23
|
|
155
155
|
* @return {*} {Promise<void>}
|
|
156
156
|
*/
|
|
157
|
-
async search() {
|
|
157
|
+
async search(args) {
|
|
158
|
+
// 校验表单值规则
|
|
159
|
+
const isValid = (args === null || args === void 0 ? void 0 : args.silentVerify) === true
|
|
160
|
+
? await this.silentValidate()
|
|
161
|
+
: await this.validate();
|
|
162
|
+
if (!isValid) {
|
|
163
|
+
if ((args === null || args === void 0 ? void 0 : args.silentVerify) === true) {
|
|
164
|
+
return;
|
|
165
|
+
}
|
|
166
|
+
this.handleValidateFail();
|
|
167
|
+
}
|
|
168
|
+
// 触发onBeforeSearch事件，基于eventCtx.allowSearch进行拦截
|
|
169
|
+
const eventCtx = {};
|
|
170
|
+
await this.evt.emit('onBeforeSearch', {
|
|
171
|
+
data: [this.data],
|
|
172
|
+
args: { eventCtx },
|
|
173
|
+
});
|
|
174
|
+
if (eventCtx.allowSearch === false) {
|
|
175
|
+
return;
|
|
176
|
+
}
|
|
177
|
+
// 触发onSearch事件
|
|
158
178
|
await this.evt.emit('onSearch', undefined);
|
|
159
179
|
}
|
|
160
180
|
/**
|
|
@@ -185,7 +185,7 @@ export declare class SearchBarController extends ControlController<ISearchBar, I
|
|
|
185
185
|
* @description 搜索
|
|
186
186
|
* @memberof SearchBarController
|
|
187
187
|
*/
|
|
188
|
-
onSearch(): void
|
|
188
|
+
onSearch(): Promise<void>;
|
|
189
189
|
/**
|
|
190
190
|
* @description 查找过滤项控制器
|
|
191
191
|
* @param {(string | null)} fieldName
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,cAAc,EACd,eAAe,EACf,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,WAAW,EAGX,eAAe,EACf,eAAe,EACf,eAAe,EAIf,oBAAoB,EACpB,oBAAoB,EACpB,sBAAsB,
|
|
1
|
+
{"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,cAAc,EACd,eAAe,EACf,gBAAgB,EACjB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,WAAW,EAGX,eAAe,EACf,eAAe,EACf,eAAe,EAIf,oBAAoB,EACpB,oBAAoB,EACpB,sBAAsB,EAEvB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAaxD,OAAO,EAAE,UAAU,EAAkB,MAAM,kBAAkB,CAAC;AAI9D;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;OAKG;IACH,WAAW,SAAM;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,yBAAyB,EAAE,CAAM;IAEpD;;;;;OAKG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B;;;;;OAKG;IACH,gBAAgB,EAAE,sBAAsB,GAAG,IAAI,CAAQ;IAEvD;;;;;OAKG;IACH,oBAAoB,UAA8C;IAElE;;;;;OAKG;IACH,gBAAgB,UAAS;IAEzB;;;;OAIG;IACH,OAAO,CAAC,EAAE,UAAU,CAAC;IAErB;;;;;OAKG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;OAKG;IACH,IAAI,gBAAgB,IAAI,gBAAgB,EAAE,CAEzC;IAED;;;;OAIG;IACH,gBAAgB,UAAS;IAEzB;;;;;;OAMG;IACH,gBAAgB,EAAE,OAAO,CAAM;IAE/B;;;;;OAKG;IACH,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAa;IAE7D;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,GAAG,SAAS,CAGtC;IAED;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,oBAAoB,GAAG,SAAS,CAE7C;IAED;;;;;OAKG;IACH,IAAI,iBAAiB,IAAI,MAAM,CAK9B;IAED;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B;;;;;;OAMG;IACH,aAAa,EAAE,OAAO,CAAS;IAE/B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IAExC;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,EAAE,MAAM,MAAM,GAAG,SAAS,GAAG,IAAI;IAInD,SAAS,CAAC,SAAS,IAAI,IAAI;cAoBX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAwC1C;;;;;;;OAOG;IACG,mBAAmB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAerD;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IA4CzC;;;;;;OAMG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA4B5C;;;;OAIG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;OAGG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAc/B;;;;;;OAMG;IACH,oBAAoB,CAClB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,yBAAyB,GAAG,SAAS;IAUxC;;;;OAIG;IACH,eAAe,IAAI,OAAO;IA2C1B;;;OAGG;IACH,WAAW,IAAI,IAAI;IAMnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IA0DrD;;;;;;;OAOG;IACH,gBAAgB,CAAC,KAAK,EAAE,WAAW,EAAE,GAAG,IAAI;IA6B5C;;;;;OAKG;IACH,WAAW,IAAI,KAAK,EAAE,GAAG,SAAS;IAmClC;;;;;OAKG;IACG,iBAAiB,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA6IlE;;;;OAIG;IACH,gBAAgB,IAAI,IAAI;IA0BxB;;;;OAIG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAiEjC;;;;;OAKG;IACG,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAwExE;;;;OAIG;IACH,SAAS,CAAC,uBAAuB,IAAI,IAAI;IAsBzC;;;OAGG;IACH,0BAA0B,IAAI,IAAI;IAgBlC;;;;OAIG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAoB9B;;;;;OAKG;IACI,gBAAgB,CACrB,IAAI,EAAE,sBAAsB,GAAG,eAAe,GAC7C,OAAO;IAeV;;;;;OAKG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAa5C;;;;;OAKG;cACa,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAO5C;;;;OAIG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;CAmB3C"}
|
|
@@ -296,7 +296,17 @@ export class SearchBarController extends ControlController {
|
|
|
296
296
|
* @description 搜索
|
|
297
297
|
* @memberof SearchBarController
|
|
298
298
|
*/
|
|
299
|
-
onSearch() {
|
|
299
|
+
async onSearch() {
|
|
300
|
+
// 触发onBeforeSearch事件，基于eventCtx.allowSearch进行拦截
|
|
301
|
+
const eventCtx = {};
|
|
302
|
+
await this.evt.emit('onBeforeSearch', {
|
|
303
|
+
data: [this.getFilterParams()],
|
|
304
|
+
args: { eventCtx },
|
|
305
|
+
});
|
|
306
|
+
if (eventCtx.allowSearch === false) {
|
|
307
|
+
return;
|
|
308
|
+
}
|
|
309
|
+
// 触发onSearch事件
|
|
300
310
|
this.evt.emit('onSearch', undefined);
|
|
301
311
|
}
|
|
302
312
|
/**
|
|
@@ -365,7 +375,7 @@ export class SearchBarController extends ControlController {
|
|
|
365
375
|
resetFilter() {
|
|
366
376
|
this.state.filterNodes = getOriginFilterNodes();
|
|
367
377
|
this.evt.emit('onReset', undefined);
|
|
368
|
-
this.
|
|
378
|
+
this.onSearch();
|
|
369
379
|
}
|
|
370
380
|
/**
|
|
371
381
|
* 初始化过滤项控制器
|
|
@@ -57,7 +57,7 @@ export interface IApiSearchBarController<T extends ISearchBar = ISearchBar, S ex
|
|
|
57
57
|
* @description 执行搜索，触发关联表格/列表重新加载
|
|
58
58
|
* @memberof IApiSearchBarController
|
|
59
59
|
*/
|
|
60
|
-
onSearch(): void
|
|
60
|
+
onSearch(): Promise<void>;
|
|
61
61
|
/**
|
|
62
62
|
* @description 重置过滤条件为默认值并重新搜索
|
|
63
63
|
* @memberof IApiSearchBarController
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-api-search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-search-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C;;;;OAIG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,uBAAuB,CACtC,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,CACjD,SAAQ,qBAAqB,CAAC,CAAC,EAAE,CAAC,CAAC;IACnC;;;;OAIG;IACH,eAAe,IAAI,UAAU,CAAC;IAE9B;;;OAGG;IACH,QAAQ,IAAI,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"i-api-search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-search-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C;;;;OAIG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;;;OAIG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,uBAAuB,CACtC,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,kBAAkB,GAAG,kBAAkB,CACjD,SAAQ,qBAAqB,CAAC,CAAC,EAAE,CAAC,CAAC;IACnC;;;;OAIG;IACH,eAAe,IAAI,UAAU,CAAC;IAE9B;;;OAGG;IACH,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1B;;;OAGG;IACH,WAAW,IAAI,IAAI,CAAC;IAEpB;;;;OAIG;IACH,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAE/B;;;;OAIG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAE/B;;;;OAIG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B;;;;;;OAMG;IACH,oBAAoB,CAClB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,6BAA6B,GAAG,SAAS,CAAC;CAC9C"}
|
|
@@ -34,10 +34,13 @@ export interface IApiSearchFormController<T extends IDESearchForm = IDESearchFor
|
|
|
34
34
|
getFilterParams(): IApiParams;
|
|
35
35
|
/**
|
|
36
36
|
* @description 执行搜索，触发关联表格/列表重新加载
|
|
37
|
+
* @param {{ silentVerify: boolean }} args 是否静默校验
|
|
37
38
|
* @returns {*} {Promise<void>}
|
|
38
39
|
* @memberof IApiSearchFormController
|
|
39
40
|
*/
|
|
40
|
-
search(
|
|
41
|
+
search(args?: {
|
|
42
|
+
silentVerify: boolean;
|
|
43
|
+
}): Promise<void>;
|
|
41
44
|
/**
|
|
42
45
|
* @description 重置搜索条件为默认值并重新搜索
|
|
43
46
|
* @returns {*} {Promise<void>}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-api-search-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-search-form.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,WAAW,wBAAwB,CACvC,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CACnD,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC;IAChC;;;;OAIG;IACH,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE1B;;;;OAIG;IACH,eAAe,IAAI,UAAU,CAAC;IAE9B
|
|
1
|
+
{"version":3,"file":"i-api-search-form.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/api/controller/control/i-api-search-form.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,WAAW,wBAAwB,CACvC,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CACnD,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC;IAChC;;;;OAIG;IACH,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;IAE1B;;;;OAIG;IACH,eAAe,IAAI,UAAU,CAAC;IAE9B;;;;;OAKG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE;QAAE,YAAY,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD;;;;OAIG;IACH,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB;;;;;OAKG;IACH,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzC;;;;OAIG;IACH,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvC;;;;;OAKG;IACH,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"before-search.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/argument/before-search.event.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -17,4 +17,5 @@ export { RedrawViewEvent } from './redraw-view.event';
|
|
|
17
17
|
export { PresetPanelItemEvent } from './preset-panel-item.event';
|
|
18
18
|
export { FormDataChangeEvent } from './form-data-change.event';
|
|
19
19
|
export { PanelDataContainerEvent, PanelDataContainerEventName, } from './panel-data-container.event';
|
|
20
|
+
export type { BeforeSearchEventCtx } from './before-search.event';
|
|
20
21
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/argument/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,YAAY,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,YAAY,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EACL,uBAAuB,EACvB,2BAA2B,GAC5B,MAAM,8BAA8B,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/argument/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,YAAY,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,YAAY,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACtD,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACnE,YAAY,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,YAAY,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,YAAY,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EACL,uBAAuB,EACvB,2BAA2B,GAC5B,MAAM,8BAA8B,CAAC;AACtC,YAAY,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { EventBase } from '../argument';
|
|
1
|
+
import { BeforeSearchEventCtx, EventBase } from '../argument';
|
|
2
2
|
import { IControlEvent } from './i-control.event';
|
|
3
3
|
/**
|
|
4
4
|
* @description 搜索栏事件
|
|
@@ -8,6 +8,23 @@ import { IControlEvent } from './i-control.event';
|
|
|
8
8
|
* @extends {IControlEvent}
|
|
9
9
|
*/
|
|
10
10
|
export interface ISearchBarEvent extends IControlEvent {
|
|
11
|
+
/**
|
|
12
|
+
* @description 搜索前事件，监听器可通过 eventctx.allowSearch=false 阻止搜索
|
|
13
|
+
* @type {{
|
|
14
|
+
* event: EventBase;
|
|
15
|
+
* emitArgs: { data: IData[]; args: { eventCtx: BeforeSearchEventCtx } };
|
|
16
|
+
* }}
|
|
17
|
+
* @memberof ISearchBarEvent
|
|
18
|
+
*/
|
|
19
|
+
onBeforeSearch: {
|
|
20
|
+
event: EventBase;
|
|
21
|
+
emitArgs: {
|
|
22
|
+
data: IData[];
|
|
23
|
+
args: {
|
|
24
|
+
eventCtx: BeforeSearchEventCtx;
|
|
25
|
+
};
|
|
26
|
+
};
|
|
27
|
+
};
|
|
11
28
|
/**
|
|
12
29
|
* @description 搜索事件
|
|
13
30
|
* @type {{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-search-bar.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-search-bar.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"i-search-bar.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-search-bar.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD;;;;;;GAMG;AACH,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACpD;;;;;;;OAOG;IACH,cAAc,EAAE;QACd,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE;YAAE,IAAI,EAAE,KAAK,EAAE,CAAC;YAAC,IAAI,EAAE;gBAAE,QAAQ,EAAE,oBAAoB,CAAA;aAAE,CAAA;SAAE,CAAC;KACvE,CAAC;IAEF;;;;;;;OAOG;IACH,QAAQ,EAAE;QACR,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,SAAS,CAAC;KACrB,CAAC;IAEF;;;;;;;;OAQG;IACH,OAAO,EAAE;QACP,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,SAAS,CAAC;KACrB,CAAC;IAEF;;;;;;;OAOG;IACH,WAAW,EAAE;QACX,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,KAAK,CAAC;KACjB,CAAC;CACH"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { EventBase } from '../argument';
|
|
1
|
+
import { BeforeSearchEventCtx, EventBase } from '../argument';
|
|
2
2
|
import { IFormEvent } from './i-form.event';
|
|
3
3
|
/**
|
|
4
4
|
* @description 搜索表单事件
|
|
@@ -8,6 +8,23 @@ import { IFormEvent } from './i-form.event';
|
|
|
8
8
|
* @extends {IFormEvent}
|
|
9
9
|
*/
|
|
10
10
|
export interface ISearchFormEvent extends IFormEvent {
|
|
11
|
+
/**
|
|
12
|
+
* @description 搜索前事件，监听器可通过 eventctx.allowSearch=false 阻止搜索
|
|
13
|
+
* @type {{
|
|
14
|
+
* event: EventBase;
|
|
15
|
+
* emitArgs: { data: IData[]; args: { eventCtx: BeforeSearchEventCtx } };
|
|
16
|
+
* }}
|
|
17
|
+
* @memberof ISearchFormEvent
|
|
18
|
+
*/
|
|
19
|
+
onBeforeSearch: {
|
|
20
|
+
event: EventBase;
|
|
21
|
+
emitArgs: {
|
|
22
|
+
data: IData[];
|
|
23
|
+
args: {
|
|
24
|
+
eventCtx: BeforeSearchEventCtx;
|
|
25
|
+
};
|
|
26
|
+
};
|
|
27
|
+
};
|
|
11
28
|
/**
|
|
12
29
|
* @description 搜索事件
|
|
13
30
|
* @type {{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i-search-form.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-search-form.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"i-search-form.event.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/event/control/i-search-form.event.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;GAMG;AACH,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IAClD;;;;;;;OAOG;IACH,cAAc,EAAE;QACd,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE;YAAE,IAAI,EAAE,KAAK,EAAE,CAAC;YAAC,IAAI,EAAE;gBAAE,QAAQ,EAAE,oBAAoB,CAAA;aAAE,CAAA;SAAE,CAAC;KACvE,CAAC;IAEF;;;;;;;OAOG;IACH,QAAQ,EAAE;QACR,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,SAAS,CAAC;KACrB,CAAC;IAEF;;;;;;;OAOG;IACH,iBAAiB,EAAE;QACjB,KAAK,EAAE,SAAS,CAAC;QACjB,QAAQ,EAAE,SAAS,CAAC;KACrB,CAAC;CACH"}
|
|
@@ -1 +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;
|
|
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"}
|
|
@@ -27,7 +27,7 @@ export class UIActionProviderBase {
|
|
|
27
27
|
refreshMode: action.refreshMode,
|
|
28
28
|
closeView: action.closeEditView,
|
|
29
29
|
};
|
|
30
|
-
const { context, params, data, view } = args;
|
|
30
|
+
const { context, params, data, view, ctrl } = args;
|
|
31
31
|
if (action.closeEditView) {
|
|
32
32
|
view.state.isClosing = true;
|
|
33
33
|
}
|
|
@@ -52,6 +52,10 @@ export class UIActionProviderBase {
|
|
|
52
52
|
result.cancel = true;
|
|
53
53
|
return this.returnError(result, view);
|
|
54
54
|
}
|
|
55
|
+
// ** 执行前置脚本代码**
|
|
56
|
+
if (action.beforeCode) {
|
|
57
|
+
await ScriptFactory.asyncExecScriptFn({ context, params, data, view, ctrl, args }, action.beforeCode);
|
|
58
|
+
}
|
|
55
59
|
// ** 执行不同类型的界面行为独有逻辑，并且合并result
|
|
56
60
|
const _result = await this.execAction(action, args);
|
|
57
61
|
// 预置属性相关处理
|
|
@@ -60,6 +64,10 @@ export class UIActionProviderBase {
|
|
|
60
64
|
view.modal.ignoreDismissCheck = true;
|
|
61
65
|
}
|
|
62
66
|
Object.assign(result, _result);
|
|
67
|
+
// ** 执行后置脚本代码**
|
|
68
|
+
if (action.afterCode) {
|
|
69
|
+
await ScriptFactory.asyncExecScriptFn({ context, params, data: result, view, ctrl, args }, action.afterCode);
|
|
70
|
+
}
|
|
63
71
|
// 如果是取消操作则中断后续处理逻辑。
|
|
64
72
|
if (result.cancel === true) {
|
|
65
73
|
return this.returnError(result, view);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ibiz-template/runtime",
|
|
3
|
-
"version": "0.7.41-alpha.
|
|
3
|
+
"version": "0.7.41-alpha.109",
|
|
4
4
|
"description": "运行时逻辑库",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "out/index.js",
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@ibiz-template/core": "^0.7.41-alpha.106",
|
|
43
|
-
"@ibiz/model-core": "^0.1.
|
|
43
|
+
"@ibiz/model-core": "^0.1.87",
|
|
44
44
|
"@types/animejs": "^3.1.12",
|
|
45
45
|
"@types/path-browserify": "^1.0.2",
|
|
46
46
|
"@types/qs": "^6.9.11",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
},
|
|
59
59
|
"peerDependencies": {
|
|
60
60
|
"@ibiz-template/core": "^0.6.0",
|
|
61
|
-
"@ibiz/model-core": "^0.1.
|
|
61
|
+
"@ibiz/model-core": "^0.1.87",
|
|
62
62
|
"async-validator": "^4.2.5",
|
|
63
63
|
"dayjs": "^1.11.7",
|
|
64
64
|
"echarts": "^5.4.3",
|
|
@@ -70,5 +70,5 @@
|
|
|
70
70
|
"qx-util": "^0.4.8",
|
|
71
71
|
"ramda": "^0.29.0"
|
|
72
72
|
},
|
|
73
|
-
"gitHead": "
|
|
73
|
+
"gitHead": "dfbfbc47c46c24d26434ff593293b95a83933c21"
|
|
74
74
|
}
|
|
@@ -67,7 +67,7 @@ export class FormMDCtrlMDController
|
|
|
67
67
|
*/
|
|
68
68
|
protected async onInit(): Promise<void> {
|
|
69
69
|
await super.onInit();
|
|
70
|
-
const { contentControl } = this.model;
|
|
70
|
+
const { appId, contentControl } = this.model;
|
|
71
71
|
if (!contentControl) {
|
|
72
72
|
if (this.context?.srfrunmode === 'DESIGN') {
|
|
73
73
|
return;
|
|
@@ -78,6 +78,16 @@ export class FormMDCtrlMDController
|
|
|
78
78
|
);
|
|
79
79
|
}
|
|
80
80
|
|
|
81
|
+
// 合并部件参数
|
|
82
|
+
if (this.model.ctrlParams) {
|
|
83
|
+
mergeInLeft(contentControl, {
|
|
84
|
+
controlParam: {
|
|
85
|
+
appId,
|
|
86
|
+
ctrlParams: this.model.ctrlParams,
|
|
87
|
+
},
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
|
|
81
91
|
// 把修改表格的模型，把行编辑打开，行新建看多数据部件的新建是否开启
|
|
82
92
|
if (contentControl.controlType === 'GRID') {
|
|
83
93
|
mergeInLeft(contentControl, {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { RuntimeError } from '@ibiz-template/core';
|
|
2
2
|
import { IDESearchForm } from '@ibiz/model-core';
|
|
3
3
|
import {
|
|
4
|
+
BeforeSearchEventCtx,
|
|
4
5
|
ISearchFormController,
|
|
5
6
|
ISearchFormEvent,
|
|
6
7
|
ISearchFormState,
|
|
@@ -194,7 +195,28 @@ export class SearchFormController
|
|
|
194
195
|
* @date 2023-03-26 02:27:23
|
|
195
196
|
* @return {*} {Promise<void>}
|
|
196
197
|
*/
|
|
197
|
-
async search(): Promise<void> {
|
|
198
|
+
async search(args?: { silentVerify: boolean }): Promise<void> {
|
|
199
|
+
// 校验表单值规则
|
|
200
|
+
const isValid =
|
|
201
|
+
args?.silentVerify === true
|
|
202
|
+
? await this.silentValidate()
|
|
203
|
+
: await this.validate();
|
|
204
|
+
if (!isValid) {
|
|
205
|
+
if (args?.silentVerify === true) {
|
|
206
|
+
return;
|
|
207
|
+
}
|
|
208
|
+
this.handleValidateFail();
|
|
209
|
+
}
|
|
210
|
+
// 触发onBeforeSearch事件，基于eventCtx.allowSearch进行拦截
|
|
211
|
+
const eventCtx: BeforeSearchEventCtx = {};
|
|
212
|
+
await this.evt.emit('onBeforeSearch', {
|
|
213
|
+
data: [this.data],
|
|
214
|
+
args: { eventCtx },
|
|
215
|
+
});
|
|
216
|
+
if (eventCtx.allowSearch === false) {
|
|
217
|
+
return;
|
|
218
|
+
}
|
|
219
|
+
// 触发onSearch事件
|
|
198
220
|
await this.evt.emit('onSearch', undefined);
|
|
199
221
|
}
|
|
200
222
|
|
|
@@ -20,6 +20,7 @@ import {
|
|
|
20
20
|
IMobMDCtrlController,
|
|
21
21
|
ISearchBarController,
|
|
22
22
|
IBackendSearchBarGroup,
|
|
23
|
+
BeforeSearchEventCtx,
|
|
23
24
|
} from '../../../interface';
|
|
24
25
|
import { convertNavData, ScriptFactory } from '../../../utils';
|
|
25
26
|
import { ControlController } from '../../common';
|
|
@@ -405,7 +406,17 @@ export class SearchBarController
|
|
|
405
406
|
* @description 搜索
|
|
406
407
|
* @memberof SearchBarController
|
|
407
408
|
*/
|
|
408
|
-
onSearch(): void {
|
|
409
|
+
async onSearch(): Promise<void> {
|
|
410
|
+
// 触发onBeforeSearch事件，基于eventCtx.allowSearch进行拦截
|
|
411
|
+
const eventCtx: BeforeSearchEventCtx = {};
|
|
412
|
+
await this.evt.emit('onBeforeSearch', {
|
|
413
|
+
data: [this.getFilterParams()],
|
|
414
|
+
args: { eventCtx },
|
|
415
|
+
});
|
|
416
|
+
if (eventCtx.allowSearch === false) {
|
|
417
|
+
return;
|
|
418
|
+
}
|
|
419
|
+
// 触发onSearch事件
|
|
409
420
|
this.evt.emit('onSearch', undefined);
|
|
410
421
|
}
|
|
411
422
|
|
|
@@ -484,7 +495,7 @@ export class SearchBarController
|
|
|
484
495
|
resetFilter(): void {
|
|
485
496
|
this.state.filterNodes = getOriginFilterNodes();
|
|
486
497
|
this.evt.emit('onReset', undefined);
|
|
487
|
-
this.
|
|
498
|
+
this.onSearch();
|
|
488
499
|
}
|
|
489
500
|
|
|
490
501
|
/**
|
|
@@ -40,10 +40,11 @@ export interface IApiSearchFormController<
|
|
|
40
40
|
|
|
41
41
|
/**
|
|
42
42
|
* @description 执行搜索，触发关联表格/列表重新加载
|
|
43
|
+
* @param {{ silentVerify: boolean }} args 是否静默校验
|
|
43
44
|
* @returns {*} {Promise<void>}
|
|
44
45
|
* @memberof IApiSearchFormController
|
|
45
46
|
*/
|
|
46
|
-
search(): Promise<void>;
|
|
47
|
+
search(args?: { silentVerify: boolean }): Promise<void>;
|
|
47
48
|
|
|
48
49
|
/**
|
|
49
50
|
* @description 重置搜索条件为默认值并重新搜索
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { EventBase } from '../argument';
|
|
1
|
+
import { BeforeSearchEventCtx, EventBase } from '../argument';
|
|
2
2
|
import { IControlEvent } from './i-control.event';
|
|
3
3
|
|
|
4
4
|
/**
|
|
@@ -9,6 +9,19 @@ import { IControlEvent } from './i-control.event';
|
|
|
9
9
|
* @extends {IControlEvent}
|
|
10
10
|
*/
|
|
11
11
|
export interface ISearchBarEvent extends IControlEvent {
|
|
12
|
+
/**
|
|
13
|
+
* @description 搜索前事件，监听器可通过 eventctx.allowSearch=false 阻止搜索
|
|
14
|
+
* @type {{
|
|
15
|
+
* event: EventBase;
|
|
16
|
+
* emitArgs: { data: IData[]; args: { eventCtx: BeforeSearchEventCtx } };
|
|
17
|
+
* }}
|
|
18
|
+
* @memberof ISearchBarEvent
|
|
19
|
+
*/
|
|
20
|
+
onBeforeSearch: {
|
|
21
|
+
event: EventBase;
|
|
22
|
+
emitArgs: { data: IData[]; args: { eventCtx: BeforeSearchEventCtx } };
|
|
23
|
+
};
|
|
24
|
+
|
|
12
25
|
/**
|
|
13
26
|
* @description 搜索事件
|
|
14
27
|
* @type {{
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { EventBase } from '../argument';
|
|
1
|
+
import { BeforeSearchEventCtx, EventBase } from '../argument';
|
|
2
2
|
import { IFormEvent } from './i-form.event';
|
|
3
3
|
|
|
4
4
|
/**
|
|
@@ -9,6 +9,19 @@ import { IFormEvent } from './i-form.event';
|
|
|
9
9
|
* @extends {IFormEvent}
|
|
10
10
|
*/
|
|
11
11
|
export interface ISearchFormEvent extends IFormEvent {
|
|
12
|
+
/**
|
|
13
|
+
* @description 搜索前事件，监听器可通过 eventctx.allowSearch=false 阻止搜索
|
|
14
|
+
* @type {{
|
|
15
|
+
* event: EventBase;
|
|
16
|
+
* emitArgs: { data: IData[]; args: { eventCtx: BeforeSearchEventCtx } };
|
|
17
|
+
* }}
|
|
18
|
+
* @memberof ISearchFormEvent
|
|
19
|
+
*/
|
|
20
|
+
onBeforeSearch: {
|
|
21
|
+
event: EventBase;
|
|
22
|
+
emitArgs: { data: IData[]; args: { eventCtx: BeforeSearchEventCtx } };
|
|
23
|
+
};
|
|
24
|
+
|
|
12
25
|
/**
|
|
13
26
|
* @description 搜索事件
|
|
14
27
|
* @type {{
|
|
@@ -39,7 +39,7 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
|
|
|
39
39
|
closeView: action.closeEditView,
|
|
40
40
|
};
|
|
41
41
|
|
|
42
|
-
const { context, params, data, view } = args;
|
|
42
|
+
const { context, params, data, view, ctrl } = args;
|
|
43
43
|
if (action.closeEditView) {
|
|
44
44
|
view.state.isClosing = true;
|
|
45
45
|
}
|
|
@@ -80,6 +80,14 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
|
|
|
80
80
|
return this.returnError(result, view);
|
|
81
81
|
}
|
|
82
82
|
|
|
83
|
+
// ** 执行前置脚本代码**
|
|
84
|
+
if (action.beforeCode) {
|
|
85
|
+
await ScriptFactory.asyncExecScriptFn(
|
|
86
|
+
{ context, params, data, view, ctrl, args },
|
|
87
|
+
action.beforeCode,
|
|
88
|
+
);
|
|
89
|
+
}
|
|
90
|
+
|
|
83
91
|
// ** 执行不同类型的界面行为独有逻辑，并且合并result
|
|
84
92
|
const _result = await this.execAction(action, args);
|
|
85
93
|
|
|
@@ -95,6 +103,15 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
|
|
|
95
103
|
}
|
|
96
104
|
|
|
97
105
|
Object.assign(result, _result);
|
|
106
|
+
|
|
107
|
+
// ** 执行后置脚本代码**
|
|
108
|
+
if (action.afterCode) {
|
|
109
|
+
await ScriptFactory.asyncExecScriptFn(
|
|
110
|
+
{ context, params, data: result, view, ctrl, args },
|
|
111
|
+
action.afterCode,
|
|
112
|
+
);
|
|
113
|
+
}
|
|
114
|
+
|
|
98
115
|
// 如果是取消操作则中断后续处理逻辑。
|
|
99
116
|
if (result.cancel === true) {
|
|
100
117
|
return this.returnError(result, view);
|