@ibiz-template/runtime 0.4.11 → 0.4.12

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.
Files changed (73) hide show
  1. package/dist/index.esm.js +182 -89
  2. package/dist/index.system.min.js +2 -2
  3. package/out/config/global-config.d.ts.map +1 -1
  4. package/out/config/global-config.js +1 -0
  5. package/out/controller/common/control/control.controller.d.ts +14 -0
  6. package/out/controller/common/control/control.controller.d.ts.map +1 -1
  7. package/out/controller/common/control/control.controller.js +21 -0
  8. package/out/controller/common/control/md-control.controller.d.ts +9 -0
  9. package/out/controller/common/control/md-control.controller.d.ts.map +1 -1
  10. package/out/controller/common/control/md-control.controller.js +20 -0
  11. package/out/controller/common/view/view.controller.d.ts +8 -1
  12. package/out/controller/common/view/view.controller.d.ts.map +1 -1
  13. package/out/controller/common/view/view.controller.js +12 -4
  14. package/out/controller/control/form/edit-form/edit-form.controller.d.ts.map +1 -1
  15. package/out/controller/control/form/edit-form/edit-form.controller.js +9 -22
  16. package/out/controller/control/form/edit-form/edit-form.service.d.ts +3 -2
  17. package/out/controller/control/form/edit-form/edit-form.service.d.ts.map +1 -1
  18. package/out/controller/control/form/edit-form/edit-form.service.js +11 -2
  19. package/out/controller/control/form/form/form.controller.d.ts +0 -7
  20. package/out/controller/control/form/form/form.controller.d.ts.map +1 -1
  21. package/out/controller/control/form/form/form.controller.js +0 -11
  22. package/out/controller/control/form/form/form.service.d.ts +24 -0
  23. package/out/controller/control/form/form/form.service.d.ts.map +1 -0
  24. package/out/controller/control/form/form/form.service.js +45 -0
  25. package/out/controller/control/form/form-detail/form-item/form-item.controller.d.ts.map +1 -1
  26. package/out/controller/control/form/form-detail/form-item/form-item.controller.js +0 -5
  27. package/out/controller/control/form/search-form/search-form.controller.d.ts.map +1 -1
  28. package/out/controller/control/form/search-form/search-form.controller.js +1 -5
  29. package/out/controller/control/form/search-form/search-form.service.d.ts +4 -3
  30. package/out/controller/control/form/search-form/search-form.service.d.ts.map +1 -1
  31. package/out/controller/control/form/search-form/search-form.service.js +8 -3
  32. package/out/controller/control/search-bar/search-bar.controller.d.ts.map +1 -1
  33. package/out/controller/control/search-bar/search-bar.controller.js +10 -6
  34. package/out/interface/common/i-global-config/i-global-view-config.d.ts +7 -0
  35. package/out/interface/common/i-global-config/i-global-view-config.d.ts.map +1 -1
  36. package/out/interface/controller/controller/control/i-control.controller.d.ts +14 -0
  37. package/out/interface/controller/controller/control/i-control.controller.d.ts.map +1 -1
  38. package/out/interface/controller/controller/view/i-view.controller.d.ts +14 -0
  39. package/out/interface/controller/controller/view/i-view.controller.d.ts.map +1 -1
  40. package/out/interface/controller/state/control/i-control.state.d.ts +8 -0
  41. package/out/interface/controller/state/control/i-control.state.d.ts.map +1 -1
  42. package/out/interface/controller/state/view/i-view.state.d.ts +8 -0
  43. package/out/interface/controller/state/view/i-view.state.d.ts.map +1 -1
  44. package/out/interface/service/service/i-auth.service.d.ts +3 -2
  45. package/out/interface/service/service/i-auth.service.d.ts.map +1 -1
  46. package/out/service/service/auth/v7-auth.service.d.ts +1 -1
  47. package/out/service/service/auth/v7-auth.service.d.ts.map +1 -1
  48. package/out/service/service/auth/v7-auth.service.js +12 -7
  49. package/out/service/utils/de-cache/de-cache.js +2 -2
  50. package/out/utils/layout-panel-util/layout-panel-util.d.ts.map +1 -1
  51. package/out/utils/layout-panel-util/layout-panel-util.js +16 -2
  52. package/package.json +3 -3
  53. package/src/config/global-config.ts +1 -0
  54. package/src/controller/common/control/control.controller.ts +23 -0
  55. package/src/controller/common/control/md-control.controller.ts +21 -0
  56. package/src/controller/common/view/view.controller.ts +12 -5
  57. package/src/controller/control/form/edit-form/edit-form.controller.ts +11 -26
  58. package/src/controller/control/form/edit-form/edit-form.service.ts +11 -2
  59. package/src/controller/control/form/form/form.controller.ts +0 -14
  60. package/src/controller/control/form/form/form.service.ts +63 -0
  61. package/src/controller/control/form/form-detail/form-item/form-item.controller.ts +0 -5
  62. package/src/controller/control/form/search-form/search-form.controller.ts +1 -5
  63. package/src/controller/control/form/search-form/search-form.service.ts +8 -3
  64. package/src/controller/control/search-bar/search-bar.controller.ts +11 -8
  65. package/src/interface/common/i-global-config/i-global-view-config.ts +8 -0
  66. package/src/interface/controller/controller/control/i-control.controller.ts +16 -0
  67. package/src/interface/controller/controller/view/i-view.controller.ts +16 -0
  68. package/src/interface/controller/state/control/i-control.state.ts +9 -0
  69. package/src/interface/controller/state/view/i-view.state.ts +9 -0
  70. package/src/interface/service/service/i-auth.service.ts +3 -2
  71. package/src/service/service/auth/v7-auth.service.ts +18 -8
  72. package/src/service/utils/de-cache/de-cache.ts +2 -2
  73. package/src/utils/layout-panel-util/layout-panel-util.ts +17 -2
package/dist/index.esm.js CHANGED
@@ -4,7 +4,8 @@ var GlobalConfig = class {
4
4
  // 全局视图配置
5
5
  this.view = {
6
6
  enableDataInfoBar: true,
7
- expCacheMode: "TABEXPPANEL:"
7
+ expCacheMode: "TABEXPPANEL:",
8
+ noNavTabs: false
8
9
  };
9
10
  // 全局表格配置
10
11
  this.grid = {
@@ -2028,10 +2029,20 @@ var LayoutPanelUtil = class {
2028
2029
  } else if (mainMenuAlign) {
2029
2030
  exTag = mainMenuAlign.toUpperCase();
2030
2031
  }
2032
+ let key = "";
2031
2033
  if (exTag !== "") {
2032
- return "".concat(viewType, "_").concat(viewStyle, "_").concat(exTag);
2034
+ key = "".concat(viewType, "_").concat(viewStyle, "_").concat(exTag);
2035
+ } else {
2036
+ key = "".concat(viewType, "_").concat(viewStyle);
2037
+ }
2038
+ if (ibiz.config.view.noNavTabs && [
2039
+ "APPINDEXVIEW_DEFAULT",
2040
+ "APPINDEXVIEW_DEFAULT_LEFT",
2041
+ "APPINDEXVIEW_DEFAULT_TOP"
2042
+ ].includes(key)) {
2043
+ key += "_NO_NAV";
2033
2044
  }
2034
- return "".concat(viewType, "_").concat(viewStyle);
2045
+ return key;
2035
2046
  }
2036
2047
  };
2037
2048
 
@@ -4633,11 +4644,11 @@ var DECache = class {
4633
4644
  );
4634
4645
  const unionValues = unionKeys.map((key) => {
4635
4646
  if (isNil5(data[key])) {
4636
- throw new RuntimeError13("\u8054\u5408\u952E\u503C\u8BA1\u7B97\u5F02\u5E38\uFF0C".concat(key, "\u5C5E\u6027\u4E3A\u7A7A\u503C\uFF01"));
4647
+ return "__empty__";
4637
4648
  }
4638
4649
  return data[key];
4639
4650
  });
4640
- data.srfkey = unionValues.join("");
4651
+ data.srfkey = unionValues.join("||");
4641
4652
  }
4642
4653
  };
4643
4654
 
@@ -6268,21 +6279,24 @@ var AuthorityService = class {
6268
6279
  import { CoreConst } from "@ibiz-template/core";
6269
6280
  import { clearCookie, getCookie, setCookie } from "qx-util";
6270
6281
  var V7AuthService = class {
6271
- async login(loginname, password, rememberme) {
6282
+ async login(loginName, password, remember) {
6272
6283
  try {
6273
6284
  const res = await ibiz.net.post("/v7/login", {
6274
- loginname,
6285
+ loginname: loginName,
6275
6286
  password,
6276
- rememberme
6287
+ rememberme: remember
6277
6288
  });
6278
6289
  const { data } = res;
6279
6290
  if (data && data.token) {
6280
- setCookie(CoreConst.TOKEN, data.token, rememberme ? 7 : 0, true);
6291
+ if (remember) {
6292
+ setCookie(CoreConst.TOKEN_REMEMBER, "1", 7, true);
6293
+ }
6294
+ setCookie(CoreConst.TOKEN, data.token, remember ? 7 : 0, true);
6281
6295
  const expiredDate = (/* @__PURE__ */ new Date()).getTime() + (data.expirein || 7199) * 1e3;
6282
6296
  setCookie(
6283
6297
  CoreConst.TOKEN_EXPIRES,
6284
6298
  "".concat(expiredDate),
6285
- rememberme ? 7 : 0,
6299
+ remember ? 7 : 0,
6286
6300
  true
6287
6301
  );
6288
6302
  }
@@ -6300,6 +6314,7 @@ var V7AuthService = class {
6300
6314
  await ibiz.net.get("/v7/logout");
6301
6315
  clearCookie(CoreConst.TOKEN);
6302
6316
  clearCookie(CoreConst.TOKEN_EXPIRES);
6317
+ clearCookie(CoreConst.TOKEN_REMEMBER);
6303
6318
  return true;
6304
6319
  } catch (err) {
6305
6320
  ibiz.notification.error({
@@ -6312,6 +6327,7 @@ var V7AuthService = class {
6312
6327
  async extendLogin() {
6313
6328
  const token = getCookie(CoreConst.TOKEN);
6314
6329
  const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
6330
+ const remember = getCookie(CoreConst.TOKEN_REMEMBER);
6315
6331
  if (token && expirein) {
6316
6332
  let wait = Number(expirein) - (/* @__PURE__ */ new Date()).getTime();
6317
6333
  const early = 5 * 60 * 1e3;
@@ -6319,9 +6335,14 @@ var V7AuthService = class {
6319
6335
  setTimeout(async () => {
6320
6336
  const res = await ibiz.net.get("/uaa/refreshtoken2");
6321
6337
  if (res.ok) {
6322
- setCookie(CoreConst.TOKEN, res.data.token, 0, true);
6338
+ setCookie(CoreConst.TOKEN, res.data.token, remember ? 7 : 0, true);
6323
6339
  const expiredDate = (/* @__PURE__ */ new Date()).getTime() + (res.data.expirein || 7199) * 1e3;
6324
- setCookie(CoreConst.TOKEN_EXPIRES, "".concat(expiredDate), 0, true);
6340
+ setCookie(
6341
+ CoreConst.TOKEN_EXPIRES,
6342
+ "".concat(expiredDate),
6343
+ remember ? 7 : 0,
6344
+ true
6345
+ );
6325
6346
  }
6326
6347
  this.extendLogin();
6327
6348
  }, wait);
@@ -11366,7 +11387,6 @@ var ViewController = class extends BaseController {
11366
11387
  * @type {boolean}
11367
11388
  */
11368
11389
  this.isCloseView = false;
11369
- this._isActive = true;
11370
11390
  if (ctx) {
11371
11391
  ctx.registerController(this.model.name, this);
11372
11392
  }
@@ -11387,8 +11407,16 @@ var ViewController = class extends BaseController {
11387
11407
  var _a;
11388
11408
  return (_a = this.ctx.parent) == null ? void 0 : _a.view;
11389
11409
  }
11410
+ /**
11411
+ * 当前是否为激活状态(缓存下的激活状态,一般与框架的生命周期相同)
11412
+ *
11413
+ * @author chitanda
11414
+ * @date 2023-12-13 11:12:48
11415
+ * @readonly
11416
+ * @type {boolean}
11417
+ */
11390
11418
  get isActive() {
11391
- return this._isActive;
11419
+ return this.state.activated;
11392
11420
  }
11393
11421
  /**
11394
11422
  * 视图重新激活
@@ -11397,7 +11425,7 @@ var ViewController = class extends BaseController {
11397
11425
  * @date 2023-07-12 17:07:55
11398
11426
  */
11399
11427
  onActivated() {
11400
- this._isActive = true;
11428
+ this.state.activated = true;
11401
11429
  ibiz.log.debug("\u89C6\u56FE[".concat(this.model.name, "](").concat(this.model.id, ")\u6FC0\u6D3B"));
11402
11430
  }
11403
11431
  /**
@@ -11407,7 +11435,7 @@ var ViewController = class extends BaseController {
11407
11435
  * @date 2023-07-12 17:07:06
11408
11436
  */
11409
11437
  onDeactivated() {
11410
- this._isActive = false;
11438
+ this.state.activated = false;
11411
11439
  ibiz.log.debug("\u89C6\u56FE[".concat(this.model.name, "](").concat(this.model.id, ")\u6682\u505C"));
11412
11440
  }
11413
11441
  /**
@@ -11468,6 +11496,7 @@ var ViewController = class extends BaseController {
11468
11496
  }
11469
11497
  initState() {
11470
11498
  super.initState();
11499
+ this.state.activated = true;
11471
11500
  this.state.isLoading = false;
11472
11501
  this.state.caption = this.model.caption;
11473
11502
  this.state.srfactiveviewdata = null;
@@ -11945,6 +11974,7 @@ var ControlController = class extends BaseController {
11945
11974
  }
11946
11975
  initState() {
11947
11976
  super.initState();
11977
+ this.state.activated = true;
11948
11978
  this.state.isLoading = false;
11949
11979
  }
11950
11980
  async onCreated() {
@@ -12045,6 +12075,26 @@ var ControlController = class extends BaseController {
12045
12075
  this.state.isLoading = false;
12046
12076
  this.ctx.endLoading();
12047
12077
  }
12078
+ /**
12079
+ * 部件重新激活
12080
+ *
12081
+ * @author chitanda
12082
+ * @date 2023-07-12 17:07:55
12083
+ */
12084
+ onActivated() {
12085
+ this.state.activated = true;
12086
+ ibiz.log.debug("\u89C6\u56FE[".concat(this.model.name, "](").concat(this.model.id, ")\u6FC0\u6D3B"));
12087
+ }
12088
+ /**
12089
+ * 部件暂时停用
12090
+ *
12091
+ * @author chitanda
12092
+ * @date 2023-07-12 17:07:06
12093
+ */
12094
+ onDeactivated() {
12095
+ this.state.activated = false;
12096
+ ibiz.log.debug("\u89C6\u56FE[".concat(this.model.name, "](").concat(this.model.id, ")\u6682\u505C"));
12097
+ }
12048
12098
  /**
12049
12099
  * 处理数据能力方法通用参数,返回能力执行最终使用的参数
12050
12100
  * @author lxm
@@ -12178,6 +12228,14 @@ import { debounce } from "lodash-es";
12178
12228
  var MDControlController = class extends ControlController {
12179
12229
  constructor() {
12180
12230
  super(...arguments);
12231
+ /**
12232
+ * 在未激活时记录是否有 command 数据变更事件,有就记录。等待激活时刷新
12233
+ *
12234
+ * @author chitanda
12235
+ * @date 2023-12-13 11:12:19
12236
+ * @protected
12237
+ */
12238
+ this.commandDataChange = false;
12181
12239
  /**
12182
12240
  * 实体属性映射,key是id,value是name
12183
12241
  * @author lxm
@@ -12241,7 +12299,18 @@ var MDControlController = class extends ControlController {
12241
12299
  */
12242
12300
  onDataChange(msg) {
12243
12301
  if (msg.data && msg.data.srfdecodename === this.dataEntity.codeName) {
12302
+ if (this.state.activated) {
12303
+ this.refresh();
12304
+ } else {
12305
+ this.commandDataChange = true;
12306
+ }
12307
+ }
12308
+ }
12309
+ onActivated() {
12310
+ super.onActivated();
12311
+ if (this.commandDataChange) {
12244
12312
  this.refresh();
12313
+ this.commandDataChange = false;
12245
12314
  }
12246
12315
  }
12247
12316
  /**
@@ -18053,7 +18122,7 @@ var ChartExpBarController = class extends ExpBarControlController {
18053
18122
  };
18054
18123
 
18055
18124
  // src/controller/control/form/search-form/search-form.controller.ts
18056
- import { RuntimeError as RuntimeError49, mergeDefaultInLeft } from "@ibiz-template/core";
18125
+ import { RuntimeError as RuntimeError49 } from "@ibiz-template/core";
18057
18126
 
18058
18127
  // src/controller/control/form/form/form.controller.ts
18059
18128
  import { debounceAndAsyncMerge, recursiveIterate as recursiveIterate2 } from "@ibiz-template/core";
@@ -18166,19 +18235,6 @@ var FormController = class extends ControlController {
18166
18235
  );
18167
18236
  });
18168
18237
  }
18169
- /**
18170
- * 获取加载草稿额外参数,新建默认值
18171
- * @author lxm
18172
- * @date 2023-04-27 10:32:06
18173
- * @return {*}
18174
- */
18175
- async getDraftParams() {
18176
- const result = {};
18177
- await Promise.all(
18178
- this.formItems.map((item) => item.setDefaultValue(true, result))
18179
- );
18180
- return result;
18181
- }
18182
18238
  /**
18183
18239
  * 初始化表单成员控制器
18184
18240
  *
@@ -18297,8 +18353,52 @@ var FormController = class extends ControlController {
18297
18353
  };
18298
18354
 
18299
18355
  // src/controller/control/form/search-form/search-form.service.ts
18356
+ import { recursiveIterate as recursiveIterate4 } from "@ibiz-template/core";
18357
+
18358
+ // src/controller/control/form/form/form.service.ts
18300
18359
  import { recursiveIterate as recursiveIterate3 } from "@ibiz-template/core";
18301
- var SearchFormService = class extends ControlService {
18360
+ var FormService = class extends ControlService {
18361
+ /**
18362
+ * 设置表单项的默认值
18363
+ * @author lxm
18364
+ * @date 2023-12-13 03:16:19
18365
+ * @param {IData} data 表单数据
18366
+ * @param {IParams} context 上下文
18367
+ * @param {IParams} params 视图参数
18368
+ * @param {('create' | 'update')} type 新建还是更新
18369
+ */
18370
+ setDefault(data, context, params, type) {
18371
+ recursiveIterate3(
18372
+ this.model,
18373
+ (item) => {
18374
+ if (item.detailType === "FORMITEM") {
18375
+ const { createDVT, createDV, updateDVT, updateDV, valueFormat } = item;
18376
+ const valueType = type === "create" ? createDVT : updateDVT;
18377
+ const defaultValue = type === "create" ? createDV : updateDV;
18378
+ const name = item.id.toLowerCase();
18379
+ const defaultVal = getDefaultValue(
18380
+ {
18381
+ name,
18382
+ valueType,
18383
+ defaultValue,
18384
+ valueFormat
18385
+ },
18386
+ { data, context, params }
18387
+ );
18388
+ if (defaultVal !== void 0) {
18389
+ data[name] = defaultVal;
18390
+ }
18391
+ }
18392
+ },
18393
+ {
18394
+ childrenFields: ["deformPages", "deformTabPages", "deformDetails"]
18395
+ }
18396
+ );
18397
+ }
18398
+ };
18399
+
18400
+ // src/controller/control/form/search-form/search-form.service.ts
18401
+ var SearchFormService = class extends FormService {
18302
18402
  /**
18303
18403
  * 执行获取草稿方法
18304
18404
  *
@@ -18308,10 +18408,13 @@ var SearchFormService = class extends ControlService {
18308
18408
  * @param {IParams} [params={}] 视图参数
18309
18409
  * @returns {*} {Promise<IHttpResponse>}
18310
18410
  */
18311
- async getDraft(_context, params = {}) {
18411
+ async getDraft(context, params = {}) {
18312
18412
  const tempData = this.getFilteredData({ ...params });
18313
18413
  let res = { ok: true, status: 200, data: tempData };
18314
18414
  res = this.handleResponse(res);
18415
+ if (res.ok && res.data) {
18416
+ this.setDefault(res.data, context, params, "create");
18417
+ }
18315
18418
  return res;
18316
18419
  }
18317
18420
  /**
@@ -18321,7 +18424,7 @@ var SearchFormService = class extends ControlService {
18321
18424
  * @date 2022-08-31 18:08:37
18322
18425
  */
18323
18426
  initUIDataMap() {
18324
- recursiveIterate3(
18427
+ recursiveIterate4(
18325
18428
  this.model,
18326
18429
  (item) => {
18327
18430
  if (item.detailType === "FORMITEM") {
@@ -18396,8 +18499,6 @@ var SearchFormController = class extends FormController {
18396
18499
  */
18397
18500
  async load() {
18398
18501
  const queryParams = { ...this.params };
18399
- const params = await this.getDraftParams();
18400
- Object.assign(queryParams, params);
18401
18502
  await this.evt.emit("onBeforeLoadDraft", { params: queryParams });
18402
18503
  let res;
18403
18504
  try {
@@ -18409,7 +18510,6 @@ var SearchFormController = class extends FormController {
18409
18510
  throw error;
18410
18511
  }
18411
18512
  this.state.data = res.data;
18412
- mergeDefaultInLeft(this.data, params);
18413
18513
  this.state.isLoaded = true;
18414
18514
  this.formStateNotify("DRAFT" /* DRAFT */);
18415
18515
  this.actionNotification("GETDRAFTSUCCESS");
@@ -19575,9 +19675,6 @@ var FormItemController = class extends FormDetailController {
19575
19675
  async formStateNotify(state) {
19576
19676
  super.formStateNotify(state);
19577
19677
  this.calcEnableCond();
19578
- if (state === "LOAD" /* LOAD */) {
19579
- this.setDefaultValue(false);
19580
- }
19581
19678
  }
19582
19679
  calcDynamicLogic(names, mustCalc = false) {
19583
19680
  if (!this.model.hidden) {
@@ -20250,8 +20347,7 @@ var FormTabPanelController = class extends FormDetailController {
20250
20347
  import {
20251
20348
  awaitTimeout,
20252
20349
  mergeInLeft as mergeInLeft2,
20253
- RuntimeError as RuntimeError51,
20254
- mergeDefaultInLeft as mergeDefaultInLeft2
20350
+ RuntimeError as RuntimeError51
20255
20351
  } from "@ibiz-template/core";
20256
20352
  import { debounce as debounce2 } from "lodash-es";
20257
20353
  import { createUUID as createUUID10 } from "qx-util";
@@ -20259,10 +20355,10 @@ import { clone as clone21 } from "ramda";
20259
20355
 
20260
20356
  // src/controller/control/form/edit-form/edit-form.service.ts
20261
20357
  import {
20262
- recursiveIterate as recursiveIterate4,
20358
+ recursiveIterate as recursiveIterate5,
20263
20359
  RuntimeModelError as RuntimeModelError55
20264
20360
  } from "@ibiz-template/core";
20265
- var EditFormService = class extends ControlService {
20361
+ var EditFormService = class extends FormService {
20266
20362
  /**
20267
20363
  * 执行获取单条数据方法
20268
20364
  *
@@ -20281,6 +20377,9 @@ var EditFormService = class extends ControlService {
20281
20377
  params
20282
20378
  );
20283
20379
  res = this.handleResponse(res);
20380
+ if (res.ok && res.data) {
20381
+ this.setDefault(res.data, context, params, "update");
20382
+ }
20284
20383
  return res;
20285
20384
  }
20286
20385
  /**
@@ -20301,6 +20400,9 @@ var EditFormService = class extends ControlService {
20301
20400
  params
20302
20401
  );
20303
20402
  res = this.handleResponse(res);
20403
+ if (res.ok && res.data) {
20404
+ this.setDefault(res.data, context, params, "create");
20405
+ }
20304
20406
  return res;
20305
20407
  }
20306
20408
  /**
@@ -20475,7 +20577,7 @@ var EditFormService = class extends ControlService {
20475
20577
  // 向导预置
20476
20578
  "srfnextform"
20477
20579
  ];
20478
- recursiveIterate4(
20580
+ recursiveIterate5(
20479
20581
  this.model,
20480
20582
  (item) => {
20481
20583
  if (item.detailType === "FORMITEM" || item.detailType === "MDCTRL") {
@@ -20570,8 +20672,6 @@ var EditFormController = class extends FormController {
20570
20672
  */
20571
20673
  async loadDraft(args) {
20572
20674
  const { context, params: queryParams } = this.handlerAbilityParams(args);
20573
- const params = await this.getDraftParams();
20574
- Object.assign(queryParams, params);
20575
20675
  let res;
20576
20676
  try {
20577
20677
  await this.startLoading();
@@ -20587,7 +20687,6 @@ var EditFormController = class extends FormController {
20587
20687
  await this.endLoading();
20588
20688
  }
20589
20689
  this.state.data = res.data;
20590
- mergeDefaultInLeft2(this.data, params);
20591
20690
  this.formStateNotify("DRAFT" /* DRAFT */);
20592
20691
  await this.evt.emit("onLoadDraftSuccess", void 0);
20593
20692
  this.actionNotification("GETDRAFTSUCCESS");
@@ -20738,12 +20837,10 @@ var EditFormController = class extends FormController {
20738
20837
  default: "".concat(this.data.srfmajortext || "", "\u4FDD\u5B58\u6210\u529F")
20739
20838
  });
20740
20839
  }
20741
- if (this.view.modal.mode === "ROUTE") {
20742
- ibiz.mc.command.send(
20743
- this.data.$origin,
20744
- isCreate ? "OBJECTCREATED" : "OBJECTUPDATED"
20745
- );
20746
- }
20840
+ ibiz.mc.command.send(
20841
+ this.data.$origin,
20842
+ isCreate ? "OBJECTCREATED" : "OBJECTUPDATED"
20843
+ );
20747
20844
  return this.data;
20748
20845
  }
20749
20846
  /**
@@ -20784,9 +20881,7 @@ var EditFormController = class extends FormController {
20784
20881
  this.state.modified = false;
20785
20882
  await this.evt.emit("onRemoveSuccess", void 0);
20786
20883
  this.actionNotification("REMOVESUCCESS");
20787
- if (this.view.modal.mode === "ROUTE") {
20788
- ibiz.mc.command.send(this.data.$origin, "OBJECTREMOVED");
20789
- }
20884
+ ibiz.mc.command.send(this.data.$origin, "OBJECTREMOVED");
20790
20885
  return ok;
20791
20886
  }
20792
20887
  /**
@@ -20889,10 +20984,8 @@ var EditFormController = class extends FormController {
20889
20984
  const { context, params } = this.handlerAbilityParams(args);
20890
20985
  try {
20891
20986
  await this.service.wfStart(context, params, this.data);
20892
- if (this.view.modal.mode === "ROUTE") {
20893
- ibiz.mc.command.send(this.data.$origin, "OBJECTUPDATED");
20894
- ibiz.mc.command.send({ srfdecodename: "SysTodo" }, "OBJECTUPDATED");
20895
- }
20987
+ ibiz.mc.command.send(this.data.$origin, "OBJECTUPDATED");
20988
+ ibiz.mc.command.send({ srfdecodename: "SysTodo" }, "OBJECTUPDATED");
20896
20989
  } catch (error) {
20897
20990
  this.actionNotification("WFSTARTERROR", {
20898
20991
  error
@@ -20920,10 +21013,8 @@ var EditFormController = class extends FormController {
20920
21013
  const { context, params } = this.handlerAbilityParams(args);
20921
21014
  try {
20922
21015
  await this.service.wfSubmit(context, params, this.data);
20923
- if (this.view.modal.mode === "ROUTE") {
20924
- ibiz.mc.command.send(this.data.$origin, "OBJECTUPDATED");
20925
- ibiz.mc.command.send({ srfdecodename: "SysTodo" }, "OBJECTUPDATED");
20926
- }
21016
+ ibiz.mc.command.send(this.data.$origin, "OBJECTUPDATED");
21017
+ ibiz.mc.command.send({ srfdecodename: "SysTodo" }, "OBJECTUPDATED");
20927
21018
  } catch (error) {
20928
21019
  this.actionNotification("WFSUBMITERROR", {
20929
21020
  error
@@ -21191,8 +21282,8 @@ var GridRowState = class {
21191
21282
  import {
21192
21283
  awaitTimeout as awaitTimeout2,
21193
21284
  debounceAndAsyncMerge as debounceAndAsyncMerge2,
21194
- mergeDefaultInLeft as mergeDefaultInLeft3,
21195
- recursiveIterate as recursiveIterate5,
21285
+ mergeDefaultInLeft,
21286
+ recursiveIterate as recursiveIterate6,
21196
21287
  RuntimeError as RuntimeError52,
21197
21288
  RuntimeModelError as RuntimeModelError56
21198
21289
  } from "@ibiz-template/core";
@@ -21593,7 +21684,7 @@ var GridController = class extends MDControlController {
21593
21684
  throw error;
21594
21685
  }
21595
21686
  const draftData = res.data;
21596
- mergeDefaultInLeft3(draftData, defaultData);
21687
+ mergeDefaultInLeft(draftData, defaultData);
21597
21688
  this.state.items.unshift(draftData);
21598
21689
  const newRow = new GridRowState(draftData, this);
21599
21690
  this.state.rows.unshift(newRow);
@@ -21704,7 +21795,7 @@ var GridController = class extends MDControlController {
21704
21795
  * @return {*} {Promise<void>}
21705
21796
  */
21706
21797
  initColumnStates() {
21707
- recursiveIterate5(
21798
+ recursiveIterate6(
21708
21799
  this.model,
21709
21800
  (column) => {
21710
21801
  if (column.columnType !== "GROUPGRIDCOLUMN") {
@@ -22985,7 +23076,7 @@ var ListController = class extends MDControlController {
22985
23076
  };
22986
23077
 
22987
23078
  // src/controller/control/panel/panel/panel.controller.ts
22988
- import { recursiveIterate as recursiveIterate6, RuntimeError as RuntimeError54 } from "@ibiz-template/core";
23079
+ import { recursiveIterate as recursiveIterate7, RuntimeError as RuntimeError54 } from "@ibiz-template/core";
22989
23080
  var PanelController = class extends ControlController {
22990
23081
  constructor(model, context, params, ctx, container) {
22991
23082
  super(model, context, params, ctx);
@@ -23194,7 +23285,7 @@ var PanelController = class extends ControlController {
23194
23285
  }
23195
23286
  initControlScheduler(logics = []) {
23196
23287
  const actualLogics = [...logics];
23197
- recursiveIterate6(
23288
+ recursiveIterate7(
23198
23289
  this.model,
23199
23290
  (item) => {
23200
23291
  if (item.controlLogics) {
@@ -23704,7 +23795,7 @@ var PickupViewPanelController = class extends ControlController {
23704
23795
  };
23705
23796
 
23706
23797
  // src/controller/control/search-bar/search-bar.controller.ts
23707
- import { recursiveIterate as recursiveIterate7 } from "@ibiz-template/core";
23798
+ import { recursiveIterate as recursiveIterate8 } from "@ibiz-template/core";
23708
23799
  import { isNil as isNil23 } from "ramda";
23709
23800
 
23710
23801
  // src/controller/control/search-bar/search-bar-filter.controller.ts
@@ -23861,7 +23952,7 @@ var SearchBarController = class extends ControlController {
23861
23952
  }
23862
23953
  const filters = this.calcFilters();
23863
23954
  if (filters) {
23864
- params.filters = filters;
23955
+ params.searchconds = filters;
23865
23956
  }
23866
23957
  return params;
23867
23958
  }
@@ -23910,7 +24001,7 @@ var SearchBarController = class extends ControlController {
23910
24001
  }
23911
24002
  let hasFilter = false;
23912
24003
  let hasError = false;
23913
- recursiveIterate7(this.state.filterNodes[0], (node) => {
24004
+ recursiveIterate8(this.state.filterNodes[0], (node) => {
23914
24005
  if (node.leaf) {
23915
24006
  if (node.field && node.valueOP && !isNil23(node.value)) {
23916
24007
  hasFilter = true;
@@ -23920,7 +24011,7 @@ var SearchBarController = class extends ControlController {
23920
24011
  }
23921
24012
  });
23922
24013
  if (hasFilter && !hasError) {
23923
- const filter = this.formatFilters(this.state.filterNodes[0]);
24014
+ const filter = [this.formatFilters(this.state.filterNodes[0])];
23924
24015
  return filter;
23925
24016
  }
23926
24017
  }
@@ -23934,15 +24025,17 @@ var SearchBarController = class extends ControlController {
23934
24025
  formatFilters(node) {
23935
24026
  if (!node.leaf) {
23936
24027
  return {
23937
- ["$".concat(node.logicType.toLowerCase())]: node.children.map(
23938
- (item) => this.formatFilters(item)
23939
- )
24028
+ condtype: "GROUP",
24029
+ condop: node.logicType,
24030
+ bnotmode: false,
24031
+ searchcondlist: node.children.map((item) => this.formatFilters(item))
23940
24032
  };
23941
24033
  }
23942
24034
  return {
23943
- ["".concat(node.field)]: {
23944
- ["$".concat(node.valueOP.toLowerCase())]: node.value
23945
- }
24035
+ condtype: "DEFIELD",
24036
+ fieldname: node.field,
24037
+ condop: node.valueOP,
24038
+ value: node.value
23946
24039
  };
23947
24040
  }
23948
24041
  };
@@ -24184,7 +24277,7 @@ var TabExpPanelController = class extends ControlController {
24184
24277
  };
24185
24278
 
24186
24279
  // src/controller/control/tree/tree.controller.ts
24187
- import { recursiveIterate as recursiveIterate8 } from "@ibiz-template/core";
24280
+ import { recursiveIterate as recursiveIterate9 } from "@ibiz-template/core";
24188
24281
 
24189
24282
  // src/controller/control/tree/tree.service.ts
24190
24283
  import { ModelError as ModelError29 } from "@ibiz-template/core";
@@ -24595,7 +24688,7 @@ var TreeController = class extends MDControlController {
24595
24688
  this.state.rootNodes = nodes;
24596
24689
  }
24597
24690
  this.state.items = [];
24598
- recursiveIterate8(
24691
+ recursiveIterate9(
24599
24692
  { children: this.state.rootNodes },
24600
24693
  (node) => {
24601
24694
  this.state.items.push(node);
@@ -24749,7 +24842,7 @@ var TreeController = class extends MDControlController {
24749
24842
  */
24750
24843
  calcExpandedKeys(nodes) {
24751
24844
  let expandedKeys = [...this.state.expandedKeys];
24752
- recursiveIterate8({ children: nodes }, (node) => {
24845
+ recursiveIterate9({ children: nodes }, (node) => {
24753
24846
  var _a;
24754
24847
  if ((_a = node.children) == null ? void 0 : _a.length) {
24755
24848
  expandedKeys.push(node.id);
@@ -25716,7 +25809,7 @@ var KanbanController = class extends DataViewControlController {
25716
25809
  };
25717
25810
 
25718
25811
  // src/controller/control/tree-grid-ex/tree-grid-ex.controller.ts
25719
- import { recursiveIterate as recursiveIterate9 } from "@ibiz-template/core";
25812
+ import { recursiveIterate as recursiveIterate10 } from "@ibiz-template/core";
25720
25813
 
25721
25814
  // src/controller/control/tree-grid-ex/tree-grid-ex.service.ts
25722
25815
  import { isArray as isArray10 } from "qx-util";
@@ -25956,7 +26049,7 @@ var TreeGridExController = class extends MDControlController {
25956
26049
  * @memberof TreeGridExController
25957
26050
  */
25958
26051
  initColumnStates() {
25959
- recursiveIterate9(
26052
+ recursiveIterate10(
25960
26053
  this.model,
25961
26054
  (column) => {
25962
26055
  if (column.columnType !== "GROUPGRIDCOLUMN") {
@@ -26044,7 +26137,7 @@ var TreeGridExController = class extends MDControlController {
26044
26137
  this.state.rootNodes = nodes;
26045
26138
  }
26046
26139
  this.state.items = [];
26047
- recursiveIterate9(
26140
+ recursiveIterate10(
26048
26141
  { children: this.state.rootNodes },
26049
26142
  (node) => {
26050
26143
  this.state.items.push(node);
@@ -26063,7 +26156,7 @@ var TreeGridExController = class extends MDControlController {
26063
26156
  */
26064
26157
  calcExpandedKeys(nodes) {
26065
26158
  let expandedKeys = [];
26066
- recursiveIterate9({ children: nodes }, (node) => {
26159
+ recursiveIterate10({ children: nodes }, (node) => {
26067
26160
  var _a;
26068
26161
  if ((_a = node.children) == null ? void 0 : _a.length) {
26069
26162
  expandedKeys.push(node.id);
@@ -26809,7 +26902,7 @@ var ReportPanelController = class extends ControlController {
26809
26902
  };
26810
26903
 
26811
26904
  // src/controller/control/gantt/gantt.controller.ts
26812
- import { recursiveIterate as recursiveIterate10 } from "@ibiz-template/core";
26905
+ import { recursiveIterate as recursiveIterate11 } from "@ibiz-template/core";
26813
26906
 
26814
26907
  // src/controller/control/gantt/gantt.service.ts
26815
26908
  import { ModelError as ModelError30 } from "@ibiz-template/core";
@@ -27193,7 +27286,7 @@ var GanttController = class extends MDControlController {
27193
27286
  this.state.rootNodes = nodes;
27194
27287
  }
27195
27288
  this.state.items = [];
27196
- recursiveIterate10(
27289
+ recursiveIterate11(
27197
27290
  { children: this.state.rootNodes },
27198
27291
  (node) => {
27199
27292
  this.state.items.push(node);