@ibiz-template/runtime 0.5.7-alpha.0 → 0.5.7-alpha.2

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 (24) hide show
  1. package/dist/index.esm.js +43 -36
  2. package/dist/index.system.min.js +1 -1
  3. package/out/controller/control/form/form-detail/form-item/form-item.controller.d.ts +0 -8
  4. package/out/controller/control/form/form-detail/form-item/form-item.controller.d.ts.map +1 -1
  5. package/out/controller/control/form/form-detail/form-item/form-item.controller.js +1 -22
  6. package/out/controller/control/search-bar/search-bar.controller.d.ts +7 -0
  7. package/out/controller/control/search-bar/search-bar.controller.d.ts.map +1 -1
  8. package/out/controller/control/search-bar/search-bar.controller.js +19 -3
  9. package/out/engine/md-view.engine.d.ts.map +1 -1
  10. package/out/engine/md-view.engine.js +10 -4
  11. package/out/interface/controller/controller/control/i-search-bar.controller.d.ts +7 -0
  12. package/out/interface/controller/controller/control/i-search-bar.controller.d.ts.map +1 -1
  13. package/out/service/service/entity/method/de-action.d.ts.map +1 -1
  14. package/out/service/service/entity/method/de-action.js +4 -4
  15. package/out/service/utils/de-cache/de-cache.d.ts +4 -2
  16. package/out/service/utils/de-cache/de-cache.d.ts.map +1 -1
  17. package/out/service/utils/de-cache/de-cache.js +9 -5
  18. package/package.json +4 -4
  19. package/src/controller/control/form/form-detail/form-item/form-item.controller.ts +1 -31
  20. package/src/controller/control/search-bar/search-bar.controller.ts +20 -3
  21. package/src/engine/md-view.engine.ts +11 -6
  22. package/src/interface/controller/controller/control/i-search-bar.controller.ts +8 -0
  23. package/src/service/service/entity/method/de-action.ts +12 -2
  24. package/src/service/utils/de-cache/de-cache.ts +19 -5
package/out/controller/control/form/form-detail/form-item/form-item.controller.d.ts CHANGED
@@ -154,14 +154,6 @@ export declare class FormItemController extends FormDetailController<IDEFormItem
154
154
  * @param {string} name 要设置的表单数据的属性名称
155
155
  */
156
156
  setDataValue(value: unknown, name?: string): Promise<void>;
157
- /**
158
- * 设置默认值
159
- *
160
- * @author lxm
161
- * @date 2022-09-15 22:09:52
162
- * @param {boolean} isCreate 新建默认值还是更新默认值
163
- */
164
- setDefaultValue(isCreate: boolean, data?: IData): void;
165
157
  /**
166
158
  * 聚焦事件
167
159
  * @author lxm
package/out/controller/control/form/form-detail/form-item/form-item.controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-item/form-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAoB,MAAM,kBAAkB,CAAC;AAIjE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAEL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAOvD,qBAAa,kBACX,SAAQ,oBAAoB,CAAC,WAAW,CACxC,YAAW,0BAA0B;IAE7B,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,SAAS,CAMrC;IAED;;;;;;;;OAQG;gBAED,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAKzC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;;OAOG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;OAOG;IACH,cAAc,IAAI,IAAI;IAQhB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B/C,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5D,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAO5E;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAyBlC;;;;;;;OAOG;IACG,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAShE;;;;;;OAMG;IACH,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,GAAE,KAAiB,GAAG,IAAI;IAmBjE;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQhC;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQ/B;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;CAOjC"}
1
+ {"version":3,"file":"form-item.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-item/form-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAoB,MAAM,kBAAkB,CAAC;AAIjE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAEL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EACf,8BAA8B,EAC/B,MAAM,0BAA0B,CAAC;AAIlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,qBAAa,kBACX,SAAQ,oBAAoB,CAAC,WAAW,CACxC,YAAW,0BAA0B;IAE7B,KAAK,EAAE,aAAa,CAAC;IAE7B,SAAS,CAAC,WAAW,IAAI,aAAa;IAItC;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAE3B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;;;OAOG;IACH,IAAI,KAAK,IAAI,OAAO,CAEnB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,SAAS,CAMrC;IAED;;;;;;;;OAQG;gBAED,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,cAAc,EACpB,MAAM,CAAC,EAAE,8BAA8B;IAKzC;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;;OAOG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;OAOG;IACH,cAAc,IAAI,IAAI;IAQhB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B/C,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5D,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAO5E;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAyBlC;;;;;;;OAOG;IACG,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAShE;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQhC;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAQ/B;;;;OAIG;IACH,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;CAOjC"}
package/out/controller/control/form/form-detail/form-item/form-item.controller.js CHANGED
@@ -6,7 +6,7 @@ import { FormDetailEventName, } from '../../../../../interface';
6
6
  import { getEditorProvider } from '../../../../../register';
7
7
  import { Srfuf } from '../../../../../service';
8
8
  import { filterValueRules } from '../../../../../utils';
9
- import { generateEditorRules, generateRules, getDefaultValue, } from '../../../../utils';
9
+ import { generateEditorRules, generateRules } from '../../../../utils';
10
10
  export class FormItemController extends FormDetailController {
11
11
  createState() {
12
12
  var _a;
@@ -255,27 +255,6 @@ export class FormItemController extends FormDetailController {
255
255
  formDetailEventName: FormDetailEventName.CHANGE,
256
256
  });
257
257
  }
258
- /**
259
- * 设置默认值
260
- *
261
- * @author lxm
262
- * @date 2022-09-15 22:09:52
263
- * @param {boolean} isCreate 新建默认值还是更新默认值
264
- */
265
- setDefaultValue(isCreate, data = this.data) {
266
- const { createDVT, createDV, updateDVT, updateDV } = this.model;
267
- const valueType = isCreate ? createDVT : updateDVT;
268
- const defaultValue = isCreate ? createDV : updateDV;
269
- const defaultVal = getDefaultValue({
270
- name: this.name,
271
- valueType,
272
- defaultValue,
273
- valueFormat: this.model.valueFormat,
274
- }, { data, context: this.context, params: this.params });
275
- if (defaultVal !== undefined) {
276
- data[this.name] = defaultVal;
277
- }
278
- }
279
258
  /**
280
259
  * 聚焦事件
281
260
  * @author lxm
package/out/controller/control/search-bar/search-bar.controller.d.ts CHANGED
@@ -179,6 +179,13 @@ export declare class SearchBarController extends ControlController<ISearchBar, I
179
179
  * @Date: 2023-12-19 14:43:46
180
180
  */
181
181
  initSearBarGroups(firstInit?: boolean): Promise<void>;
182
+ /**
183
+ * 点击默认选中
184
+ * @return {*}
185
+ * @author: zhujiamin
186
+ * @Date: 2024-01-24 11:12:43
187
+ */
188
+ setDefaultSelect(): void;
182
189
  /**
183
190
  * 处理保存
184
191
  * @return {*}
package/out/controller/control/search-bar/search-bar.controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,WAAW,EACX,sBAAsB,EACtB,eAAe,EAChB,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;AAIxD;;;;;;;;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;;;;;OAKG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;OAKG;IACH,IAAI,gBAAgB,IAAI,gBAAgB,EAAE,CAEzC;IAED;;;;OAIG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,GAAG,SAAS,CAEtC;IAED;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAcX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAoCzC;;;;;;OAMG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA2B5C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAIhB;;;;;OAKG;IACH,eAAe,IAAI,OAAO;IA2B1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYrD;;;;;OAKG;IACH,WAAW,IAAI,KAAK,EAAE,GAAG,SAAS;IAsBlC;;;;;;OAMG;IACH,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,KAAK;IAkBvC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW;IAqBtC;;;;;OAKG;IACH,SAAS,CAAC,oBAAoB,IAAI,WAAW,EAAE;IAU/C;;;;;OAKG;IACG,iBAAiB,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAqGlE;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCjC;;;;;OAKG;IACG,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;CA4BzE"}
1
+ {"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,WAAW,EACX,sBAAsB,EACtB,eAAe,EAChB,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;AAIxD;;;;;;;;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;;;;;OAKG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;OAKG;IACH,IAAI,gBAAgB,IAAI,gBAAgB,EAAE,CAEzC;IAED;;;;OAIG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,GAAG,SAAS,CAEtC;IAED;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;cAcX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAoCzC;;;;;;OAMG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA2B5C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAIhB;;;;;OAKG;IACH,eAAe,IAAI,OAAO;IA4B1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAYrD;;;;;OAKG;IACH,WAAW,IAAI,KAAK,EAAE,GAAG,SAAS;IAsBlC;;;;;;OAMG;IACH,aAAa,CAAC,IAAI,EAAE,WAAW,GAAG,KAAK;IAkBvC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,WAAW;IAqBtC;;;;;OAKG;IACH,SAAS,CAAC,oBAAoB,IAAI,WAAW,EAAE;IAU/C;;;;;OAKG;IACG,iBAAiB,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAoGlE;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IAWxB;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAmCjC;;;;;OAKG;IACG,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;CA4BzE"}
package/out/controller/control/search-bar/search-bar.controller.js CHANGED
@@ -214,7 +214,8 @@ export class SearchBarController extends ControlController {
214
214
  }
215
215
  // 快速分组
216
216
  if (((_a = this.state.selectedGroupItem) === null || _a === void 0 ? void 0 : _a.data) &&
217
- typeof this.state.selectedGroupItem.data === 'string') {
217
+ typeof this.state.selectedGroupItem.data === 'string' &&
218
+ !this.isBackendSearchGroup) {
218
219
  const navParams = ScriptFactory.execSingleLine(this.state.selectedGroupItem.data);
219
220
  const addParams = convertNavData(navParams, this.params, this.context);
220
221
  Object.assign(params, addParams);
@@ -420,7 +421,7 @@ export class SearchBarController extends ControlController {
420
421
  this.state.searchBarGroups.forEach((item, index) => {
421
422
  item.order = (index + 1) * 100;
422
423
  });
423
- // 设置默认选中
424
+ // 设置是否有默认选中
424
425
  if (firstInit &&
425
426
  this.state.searchBarGroups &&
426
427
  this.state.searchBarGroups.length > 0) {
@@ -429,11 +430,26 @@ export class SearchBarController extends ControlController {
429
430
  });
430
431
  if (defaultSelectedGroup) {
431
432
  this.hasDefaultSelect = true;
432
- this.handleGroupClick(defaultSelectedGroup);
433
433
  }
434
434
  }
435
435
  }
436
436
  }
437
+ /**
438
+ * 点击默认选中
439
+ * @return {*}
440
+ * @author: zhujiamin
441
+ * @Date: 2024-01-24 11:12:43
442
+ */
443
+ setDefaultSelect() {
444
+ if (this.state.searchBarGroups && this.state.searchBarGroups.length > 0) {
445
+ const defaultSelectedGroup = this.state.searchBarGroups.find(group => {
446
+ return group.defaultSelect;
447
+ });
448
+ if (defaultSelectedGroup) {
449
+ this.handleGroupClick(defaultSelectedGroup);
450
+ }
451
+ }
452
+ }
437
453
  /**
438
454
  * 处理保存
439
455
  * @return {*}
package/out/engine/md-view.engine.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EAChB,SAAS,EACT,eAAe,EAChB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA0DhC;;;;;;;OAOG;cACa,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IA8CrE,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;;OAQG;cACa,QAAQ,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GAAG,OAAO,CAAC,eAAe,CAAC;IA4B5B;;;;;;;;OAQG;cACa,OAAO,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,eAAe,CAAC;IAgC5B;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IAapC;;;;;OAKG;cACa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAc1C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}
1
+ {"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EAChB,SAAS,EACT,eAAe,EAChB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA+DhC;;;;;;;OAOG;cACa,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IA8CrE,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;;OAQG;cACa,QAAQ,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GAAG,OAAO,CAAC,eAAe,CAAC;IA4B5B;;;;;;;;OAQG;cACa,OAAO,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,eAAe,CAAC;IAgC5B;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IAapC;;;;;OAKG;cACa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAc1C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;CAS/B"}
package/out/engine/md-view.engine.js CHANGED
@@ -104,10 +104,16 @@ export class MDViewEngine extends ViewEngineBase {
104
104
  });
105
105
  }
106
106
  // 默认加载
107
- if (!this.view.state.noLoadDefault &&
108
- model.loadDefault &&
109
- (!this.searchBar || !this.searchBar.hasDefaultSelect)) {
110
- this.load();
107
+ if (!this.view.state.noLoadDefault && model.loadDefault) {
108
+ if (this.searchBar &&
109
+ this.searchBar.hasDefaultSelect &&
110
+ this.xdataControlName === 'grid') {
111
+ // 搜索栏默认选中，由搜索栏自己触发表格的加载
112
+ this.searchBar.setDefaultSelect();
113
+ }
114
+ else {
115
+ this.load();
116
+ }
111
117
  }
112
118
  }
113
119
  /**
package/out/interface/controller/controller/control/i-search-bar.controller.d.ts CHANGED
@@ -27,5 +27,12 @@ export interface ISearchBarController extends IControlController<ISearchBar, ISe
27
27
  * @returns {*} {IParams}
28
28
  */
29
29
  hasDefaultSelect: boolean;
30
+ /**
31
+ * 设置默认选中
32
+ * @return {*}
33
+ * @author: zhujiamin
34
+ * @Date: 2024-01-24 11:12:43
35
+ */
36
+ setDefaultSelect(): void;
30
37
  }
31
38
  //# sourceMappingURL=i-search-bar.controller.d.ts.map
package/out/interface/controller/controller/control/i-search-bar.controller.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"i-search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-search-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;;GAOG;AACH,MAAM,WAAW,oBACf,SAAQ,kBAAkB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CAAC;IACxE;;;;;;OAMG;IACH,eAAe,IAAI,OAAO,CAAC;IAE3B;;;;;;OAMG;IACH,gBAAgB,EAAE,OAAO,CAAC;CAC3B"}
1
+ {"version":3,"file":"i-search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-search-bar.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D;;;;;;;GAOG;AACH,MAAM,WAAW,oBACf,SAAQ,kBAAkB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CAAC;IACxE;;;;;;OAMG;IACH,eAAe,IAAI,OAAO,CAAC;IAE3B;;;;;;OAMG;IACH,gBAAgB,EAAE,OAAO,CAAC;IAE1B;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI,CAAC;CAC1B"}
package/out/service/service/entity/method/de-action.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"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"}
package/out/service/service/entity/method/de-action.js CHANGED
@@ -212,10 +212,10 @@ export class DEActionMethod extends Method {
212
212
  const addData = this.createEntity(entity);
213
213
  let resultData;
214
214
  if (isArray(addData)) {
215
- resultData = await Promise.all(addData.map(item => this.service.local.add(context, this.attach(context, item))));
215
+ resultData = await Promise.all(addData.map(item => this.service.local.add(context, this.attach(context, item), false)));
216
216
  }
217
217
  else {
218
- resultData = await this.service.local.add(context, this.attach(context, addData));
218
+ resultData = await this.service.local.add(context, this.attach(context, addData), false);
219
219
  }
220
220
  return new HttpResponse(resultData);
221
221
  }
@@ -395,10 +395,10 @@ export class DEActionMethod extends Method {
395
395
  const updateData = this.createEntity(entity);
396
396
  let resultData;
397
397
  if (isArray(updateData)) {
398
- resultData = await Promise.all(updateData.map(item => this.service.local.update(context, this.attach(context, item))));
398
+ resultData = await Promise.all(updateData.map(item => this.service.local.update(context, this.attach(context, item), false)));
399
399
  }
400
400
  else {
401
- resultData = await this.service.local.update(context, this.attach(context, updateData));
401
+ resultData = await this.service.local.update(context, this.attach(context, updateData), false);
402
402
  }
403
403
  if (resultData) {
404
404
  return new HttpResponse(resultData);
package/out/service/utils/de-cache/de-cache.d.ts CHANGED
@@ -67,10 +67,11 @@ export declare class DECache {
67
67
  *
68
68
  * @param {*} context
69
69
  * @param {IDataEntity} entity
70
+ * @param {boolean} [ignoreDuplicate=true] 是否忽略主键重复（不忽略报错，忽略则覆盖）
70
71
  * @return {*} {boolean}
71
72
  * @memberof EntityCache
72
73
  */
73
- add(context: IContext, entity: IDataEntity): IDataEntity | null;
74
+ add(context: IContext, entity: IDataEntity, ignoreDuplicate?: boolean): IDataEntity | null;
74
75
  /**
75
76
  * 查找数据
76
77
  *
@@ -85,10 +86,11 @@ export declare class DECache {
85
86
  *
86
87
  * @param {IContext} context
87
88
  * @param {IDataEntity} entity
89
+ * @param {boolean} [ignoreDuplicate=true] 是否忽略主键重复（不忽略报错，忽略则覆盖）
88
90
  * @return {*} {IDataEntity}
89
91
  * @memberof EntityCache
90
92
  */
91
- update(context: IContext, entity: IDataEntity): IDataEntity | null;
93
+ update(context: IContext, entity: IDataEntity, ignoreDuplicate?: boolean): IDataEntity | null;
92
94
  /**
93
95
  * 删除数据
94
96
  *
package/out/service/utils/de-cache/de-cache.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"de-cache.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-cache/de-cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAMlD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAG/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IAoBN,SAAS,CAAC,MAAM,EAAE,cAAc;IAnB5C;;;;;;;OAOG;IACH,SAAS,KAAK,UAAU,IAAI,OAAO,CAElC;IAED;;;;;;OAMG;gBACmB,MAAM,EAAE,cAAc;IAE5C;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAExD;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAQvD;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAK1D;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAKrD;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IAoC/D;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAY1D;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IA+ClE;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IA2B7D;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IA8BtE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IA4DtE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAwC3D;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAItD;;;;;;OAMG;IACH,OAAO,IAAI,WAAW,EAAE;IAKxB;;;;;;;OAOG;IACH,YAAY,CAAC,MAAM,GAAE,OAAY,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO;IAgB9D;;;;;OAKG;IACH,KAAK,IAAI,IAAI;IAOb;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;IAgB/C;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,GAAG,YAAY,GAAG,IAAI;CAOjE"}
1
+ {"version":3,"file":"de-cache.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-cache/de-cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAMlD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAG/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IAoBN,SAAS,CAAC,MAAM,EAAE,cAAc;IAnB5C;;;;;;;OAOG;IACH,SAAS,KAAK,UAAU,IAAI,OAAO,CAElC;IAED;;;;;;OAMG;gBACmB,MAAM,EAAE,cAAc;IAE5C;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAExD;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAQvD;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAK1D;;;;;;;OAOG;IACH,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAKrD;;;;;;;;OAQG;IACH,GAAG,CACD,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,WAAW,EACnB,eAAe,UAAO,GACrB,WAAW,GAAG,IAAI;IAoCrB;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAY1D;;;;;;;;OAQG;IACH,MAAM,CACJ,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,WAAW,EACnB,eAAe,UAAO,GACrB,WAAW,GAAG,IAAI;IAmDrB;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IA2B7D;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IA8BtE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IA4DtE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAwC3D;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAItD;;;;;;OAMG;IACH,OAAO,IAAI,WAAW,EAAE;IAKxB;;;;;;;OAOG;IACH,YAAY,CAAC,MAAM,GAAE,OAAY,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO;IAgB9D;;;;;OAKG;IACH,KAAK,IAAI,IAAI;IAOb;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;IAgB/C;;;;;;;;OAQG;IACH,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,GAAG,YAAY,GAAG,IAAI;CAOjE"}
package/out/service/utils/de-cache/de-cache.js CHANGED
@@ -86,14 +86,15 @@ export class DECache {
86
86
  *
87
87
  * @param {*} context
88
88
  * @param {IDataEntity} entity
89
+ * @param {boolean} [ignoreDuplicate=true] 是否忽略主键重复（不忽略报错，忽略则覆盖）
89
90
  * @return {*} {boolean}
90
91
  * @memberof EntityCache
91
92
  */
92
- add(context, entity) {
93
+ add(context, entity, ignoreDuplicate = true) {
93
94
  // 联合主键相关数据处理
94
95
  if (this.isUnionKey) {
95
96
  this.calcUnionKey(entity);
96
- if (this.checkData(context, entity.srfkey)) {
97
+ if (ignoreDuplicate === false && this.checkData(context, entity.srfkey)) {
97
98
  throw new RuntimeError(`新建联合主键数据失败，已有主键为${entity.srfkey}的数据`);
98
99
  }
99
100
  }
@@ -149,16 +150,19 @@ export class DECache {
149
150
  *
150
151
  * @param {IContext} context
151
152
  * @param {IDataEntity} entity
153
+ * @param {boolean} [ignoreDuplicate=true] 是否忽略主键重复（不忽略报错，忽略则覆盖）
152
154
  * @return {*} {IDataEntity}
153
155
  * @memberof EntityCache
154
156
  */
155
- update(context, entity) {
157
+ update(context, entity, ignoreDuplicate = true) {
156
158
  const oldKey = entity.srfkey;
157
159
  // 联合主键相关数据处理
158
160
  if (this.isUnionKey) {
159
161
  this.calcUnionKey(entity);
160
- // 主键改变的时候，检测变更之后的主键是否已经存在
161
- if (oldKey !== entity.srfkey && this.checkData(context, entity.srfkey)) {
162
+ // 只在临时数据的新建更新时，主键改变的时候，检测变更之后的主键是否已经存在
163
+ if (ignoreDuplicate === false &&
164
+ oldKey !== entity.srfkey &&
165
+ this.checkData(context, entity.srfkey)) {
162
166
  throw new RuntimeError(`更新联合主键数据失败，已有主键为${entity.srfkey}的数据`);
163
167
  }
164
168
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ibiz-template/runtime",
3
- "version": "0.5.7-alpha.0",
3
+ "version": "0.5.7-alpha.2",
4
4
  "description": "控制器包",
5
5
  "type": "module",
6
6
  "main": "out/index.js",
@@ -31,7 +31,7 @@
31
31
  "license": "MIT",
32
32
  "devDependencies": {
33
33
  "@ibiz-template/core": "^0.5.7-alpha.0",
34
- "@ibiz/model-core": "^0.1.6",
34
+ "@ibiz/model-core": "^0.1.7",
35
35
  "@types/path-browserify": "^1.0.2",
36
36
  "@types/qs": "^6.9.11",
37
37
  "@types/systemjs": "^6.13.5",
@@ -48,7 +48,7 @@
48
48
  },
49
49
  "peerDependencies": {
50
50
  "@ibiz-template/core": "^0.5.0-beta.0",
51
- "@ibiz/model-core": "^0.1.6",
51
+ "@ibiz/model-core": "^0.1.7",
52
52
  "async-validator": "^4.2.5",
53
53
  "dayjs": "^1.11.7",
54
54
  "echarts": "^5.4.3",
@@ -60,5 +60,5 @@
60
60
  "qx-util": "^0.4.8",
61
61
  "ramda": "^0.29.0"
62
62
  },
63
- "gitHead": "d334b6bfb6f0869076ab2d09f9d959885eef71dc"
63
+ "gitHead": "1f04c8345f5b91063b3163f1f057eeb8b6a0ce1b"
64
64
  }
package/src/controller/control/form/form-detail/form-item/form-item.controller.ts CHANGED
@@ -17,11 +17,7 @@ import { getEditorProvider } from '../../../../../register';
17
17
  import { Srfuf } from '../../../../../service';
18
18
  import { filterValueRules } from '../../../../../utils';
19
19
  import { FormNotifyState } from '../../../../constant';
20
- import {
21
- generateEditorRules,
22
- generateRules,
23
- getDefaultValue,
24
- } from '../../../../utils';
20
+ import { generateEditorRules, generateRules } from '../../../../utils';
25
21
 
26
22
  export class FormItemController
27
23
  extends FormDetailController<IDEFormItem>
@@ -341,32 +337,6 @@ export class FormItemController
341
337
  });
342
338
  }
343
339
 
344
- /**
345
- * 设置默认值
346
- *
347
- * @author lxm
348
- * @date 2022-09-15 22:09:52
349
- * @param {boolean} isCreate 新建默认值还是更新默认值
350
- */
351
- setDefaultValue(isCreate: boolean, data: IData = this.data): void {
352
- const { createDVT, createDV, updateDVT, updateDV } = this.model;
353
- const valueType = isCreate ? createDVT : updateDVT;
354
- const defaultValue = isCreate ? createDV : updateDV;
355
-
356
- const defaultVal = getDefaultValue(
357
- {
358
- name: this.name,
359
- valueType,
360
- defaultValue,
361
- valueFormat: this.model.valueFormat,
362
- },
363
- { data, context: this.context, params: this.params },
364
- );
365
- if (defaultVal !== undefined) {
366
- data[this.name] = defaultVal;
367
- }
368
- }
369
-
370
340
  /**
371
341
  * 聚焦事件
372
342
  * @author lxm
package/src/controller/control/search-bar/search-bar.controller.ts CHANGED
@@ -279,7 +279,8 @@ export class SearchBarController
279
279
  // 快速分组
280
280
  if (
281
281
  this.state.selectedGroupItem?.data &&
282
- typeof this.state.selectedGroupItem.data === 'string'
282
+ typeof this.state.selectedGroupItem.data === 'string' &&
283
+ !this.isBackendSearchGroup
283
284
  ) {
284
285
  const navParams = ScriptFactory.execSingleLine(
285
286
  this.state.selectedGroupItem.data,
@@ -513,7 +514,7 @@ export class SearchBarController
513
514
  this.state.searchBarGroups.forEach((item, index) => {
514
515
  item.order = (index + 1) * 100;
515
516
  });
516
- // 设置默认选中
517
+ // 设置是否有默认选中
517
518
  if (
518
519
  firstInit &&
519
520
  this.state.searchBarGroups &&
@@ -524,12 +525,28 @@ export class SearchBarController
524
525
  });
525
526
  if (defaultSelectedGroup) {
526
527
  this.hasDefaultSelect = true;
527
- this.handleGroupClick(defaultSelectedGroup);
528
528
  }
529
529
  }
530
530
  }
531
531
  }
532
532
 
533
+ /**
534
+ * 点击默认选中
535
+ * @return {*}
536
+ * @author: zhujiamin
537
+ * @Date: 2024-01-24 11:12:43
538
+ */
539
+ setDefaultSelect(): void {
540
+ if (this.state.searchBarGroups && this.state.searchBarGroups.length > 0) {
541
+ const defaultSelectedGroup = this.state.searchBarGroups.find(group => {
542
+ return group.defaultSelect;
543
+ });
544
+ if (defaultSelectedGroup) {
545
+ this.handleGroupClick(defaultSelectedGroup);
546
+ }
547
+ }
548
+ }
549
+
533
550
  /**
534
551
  * 处理保存
535
552
  * @return {*}
package/src/engine/md-view.engine.ts CHANGED
@@ -139,12 +139,17 @@ export class MDViewEngine extends ViewEngineBase {
139
139
  }
140
140
 
141
141
  // 默认加载
142
- if (
143
- !this.view.state.noLoadDefault &&
144
- model.loadDefault &&
145
- (!this.searchBar || !this.searchBar.hasDefaultSelect)
146
- ) {
147
- this.load();
142
+ if (!this.view.state.noLoadDefault && model.loadDefault) {
143
+ if (
144
+ this.searchBar &&
145
+ this.searchBar.hasDefaultSelect &&
146
+ this.xdataControlName === 'grid'
147
+ ) {
148
+ // 搜索栏默认选中，由搜索栏自己触发表格的加载
149
+ this.searchBar.setDefaultSelect();
150
+ } else {
151
+ this.load();
152
+ }
148
153
  }
149
154
  }
150
155
 
package/src/interface/controller/controller/control/i-search-bar.controller.ts CHANGED
@@ -30,4 +30,12 @@ export interface ISearchBarController
30
30
  * @returns {*} {IParams}
31
31
  */
32
32
  hasDefaultSelect: boolean;
33
+
34
+ /**
35
+ * 设置默认选中
36
+ * @return {*}
37
+ * @author: zhujiamin
38
+ * @Date: 2024-01-24 11:12:43
39
+ */
40
+ setDefaultSelect(): void;
33
41
  }
package/src/service/service/entity/method/de-action.ts CHANGED
@@ -279,13 +279,18 @@ export class DEActionMethod extends Method {
279
279
  resultData = await Promise.all(
280
280
  addData.map(
281
281
  item =>
282
- this.service.local.add(context, this.attach(context, item))!,
282
+ this.service.local.add(
283
+ context,
284
+ this.attach(context, item),
285
+ false,
286
+ )!,
283
287
  ),
284
288
  );
285
289
  } else {
286
290
  resultData = await this.service.local.add(
287
291
  context,
288
292
  this.attach(context, addData),
293
+ false,
289
294
  )!;
290
295
  }
291
296
  return new HttpResponse(resultData);
@@ -495,13 +500,18 @@ export class DEActionMethod extends Method {
495
500
  resultData = await Promise.all(
496
501
  updateData.map(
497
502
  item =>
498
- this.service.local.update(context, this.attach(context, item))!,
503
+ this.service.local.update(
504
+ context,
505
+ this.attach(context, item),
506
+ false,
507
+ )!,
499
508
  ),
500
509
  );
501
510
  } else {
502
511
  resultData = await this.service.local.update(
503
512
  context,
504
513
  this.attach(context, updateData),
514
+ false,
505
515
  )!;
506
516
  }
507
517
  if (resultData) {
package/src/service/utils/de-cache/de-cache.ts CHANGED
@@ -95,14 +95,19 @@ export class DECache {
95
95
  *
96
96
  * @param {*} context
97
97
  * @param {IDataEntity} entity
98
+ * @param {boolean} [ignoreDuplicate=true] 是否忽略主键重复（不忽略报错，忽略则覆盖）
98
99
  * @return {*} {boolean}
99
100
  * @memberof EntityCache
100
101
  */
101
- add(context: IContext, entity: IDataEntity): IDataEntity | null {
102
+ add(
103
+ context: IContext,
104
+ entity: IDataEntity,
105
+ ignoreDuplicate = true,
106
+ ): IDataEntity | null {
102
107
  // 联合主键相关数据处理
103
108
  if (this.isUnionKey) {
104
109
  this.calcUnionKey(entity);
105
- if (this.checkData(context, entity.srfkey)) {
110
+ if (ignoreDuplicate === false && this.checkData(context, entity.srfkey)) {
106
111
  throw new RuntimeError(
107
112
  `新建联合主键数据失败，已有主键为${entity.srfkey}的数据`,
108
113
  );
@@ -159,16 +164,25 @@ export class DECache {
159
164
  *
160
165
  * @param {IContext} context
161
166
  * @param {IDataEntity} entity
167
+ * @param {boolean} [ignoreDuplicate=true] 是否忽略主键重复（不忽略报错，忽略则覆盖）
162
168
  * @return {*} {IDataEntity}
163
169
  * @memberof EntityCache
164
170
  */
165
- update(context: IContext, entity: IDataEntity): IDataEntity | null {
171
+ update(
172
+ context: IContext,
173
+ entity: IDataEntity,
174
+ ignoreDuplicate = true,
175
+ ): IDataEntity | null {
166
176
  const oldKey = entity.srfkey!;
167
177
  // 联合主键相关数据处理
168
178
  if (this.isUnionKey) {
169
179
  this.calcUnionKey(entity);
170
- // 主键改变的时候，检测变更之后的主键是否已经存在
171
- if (oldKey !== entity.srfkey && this.checkData(context, entity.srfkey)) {
180
+ // 只在临时数据的新建更新时，主键改变的时候，检测变更之后的主键是否已经存在
181
+ if (
182
+ ignoreDuplicate === false &&
183
+ oldKey !== entity.srfkey &&
184
+ this.checkData(context, entity.srfkey)
185
+ ) {
172
186
  throw new RuntimeError(
173
187
  `更新联合主键数据失败，已有主键为${entity.srfkey}的数据`,
174
188
  );