@ibiz-template/runtime 0.7.41-alpha.135 → 0.7.41-alpha.136

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 (15) hide show
  1. package/dist/index.esm.js +51375 -51328
  2. package/dist/index.system.min.js +1 -1
  3. package/out/controller/control/calendar/calendar.service.d.ts.map +1 -1
  4. package/out/controller/control/calendar/calendar.service.js +22 -0
  5. package/out/interface/api/state/control/i-api-tree.state.d.ts +1 -1
  6. package/out/register/helper/tree-node-register.d.ts.map +1 -1
  7. package/out/register/helper/tree-node-register.js +4 -1
  8. package/out/ui-logic/index.d.ts +1 -0
  9. package/out/ui-logic/index.d.ts.map +1 -1
  10. package/out/ui-logic/index.js +1 -0
  11. package/package.json +2 -2
  12. package/src/controller/control/calendar/calendar.service.ts +22 -0
  13. package/src/interface/api/state/control/i-api-tree.state.ts +1 -1
  14. package/src/register/helper/tree-node-register.ts +4 -1
  15. package/src/ui-logic/index.ts +2 -0
package/out/controller/control/calendar/calendar.service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"calendar.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/calendar/calendar.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAoB,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qDAAqD,CAAC;AAEvF;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,KAAK,EAAE,iBAAiB,EAAE,CAAC;CAC5B;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;OAKG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;;OAIG;IACH,SAAS,EAAE,WAAW,GAAG,SAAS,CAAC;CACpC;AAED;;;;;;;;GAQG;AACH,qBAAa,eAAgB,SAAQ,gBAAgB,CAAC,YAAY,CAAC;IACjE;;;;;;OAMG;IACH,QAAQ,EAAE;QACR,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAAC;KAClC,CAAM;IAEP;;;;;;;;OAQG;IACG,UAAU,CACd,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,mBAAmB,GAAE,MAAiB,GACrC,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,iBAAiB,GACvB,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAqC/B;;;;;;;;;OASG;IACH,OAAO,CAAC,qBAAqB;IAuC7B;;;;;;;;;;;;OAYG;YACW,KAAK;IAiBnB;;;;;;;;OAQG;IACH,OAAO,CAAC,cAAc;IAkEtB;;;;;;;;OAQG;IACH,OAAO,CAAC,mBAAmB;CA+B5B"}
1
+ {"version":3,"file":"calendar.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/calendar/calendar.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAoB,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qDAAqD,CAAC;AAEvF;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,KAAK,EAAE,iBAAiB,EAAE,CAAC;CAC5B;AAED;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;OAKG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;;OAIG;IACH,SAAS,EAAE,WAAW,GAAG,SAAS,CAAC;CACpC;AAED;;;;;;;;GAQG;AACH,qBAAa,eAAgB,SAAQ,gBAAgB,CAAC,YAAY,CAAC;IACjE;;;;;;OAMG;IACH,QAAQ,EAAE;QACR,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAAC;KAClC,CAAM;IAEP;;;;;;;;OAQG;IACG,UAAU,CACd,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,mBAAmB,GAAE,MAAiB,GACrC,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,CAAC,EAAE,iBAAiB,GACvB,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAqC/B;;;;;;;;;OASG;IACH,OAAO,CAAC,qBAAqB;IAuC7B;;;;;;;;;;;;OAYG;YACW,KAAK;IAiBnB;;;;;;;;OAQG;IACH,OAAO,CAAC,cAAc;IAwFtB;;;;;;;;OAQG;IACH,OAAO,CAAC,mBAAmB;CA+B5B"}
package/out/controller/control/calendar/calendar.service.js CHANGED
@@ -133,6 +133,28 @@ export class CalendarService extends MDControlService {
133
133
  */
134
134
  getSearchConds(item, params) {
135
135
  const { srfstartdate, srfenddate } = params;
136
+ // 如果开始和结束时间字段相同，则条件为大于等于开始时间，小于等于结束时间
137
+ if (item.beginTimeAppDEFieldId === item.endTimeAppDEFieldId)
138
+ return [
139
+ {
140
+ condop: 'AND',
141
+ condtype: 'GROUP',
142
+ searchconds: [
143
+ {
144
+ condtype: 'DEFIELD',
145
+ fieldname: item.beginTimeAppDEFieldId,
146
+ value: srfstartdate,
147
+ condop: 'GTANDEQ',
148
+ },
149
+ {
150
+ condtype: 'DEFIELD',
151
+ fieldname: item.beginTimeAppDEFieldId,
152
+ value: srfenddate,
153
+ condop: 'LTANDEQ',
154
+ },
155
+ ],
156
+ },
157
+ ];
136
158
  return [
137
159
  {
138
160
  condop: 'OR',
package/out/interface/api/state/control/i-api-tree.state.d.ts CHANGED
@@ -81,7 +81,7 @@ export interface IApiTreeNodeData {
81
81
  */
82
82
  _parent?: IApiTreeNodeData;
83
83
  /**
84
- * @description 实体数据
84
+ * @description 实体数据（实体动态代码表树节点/实体数据集树节点类型存在该属性，静态树节点类型不存在该属性）
85
85
  * @type {IApiData}
86
86
  * @memberof IApiTreeNodeData
87
87
  */
package/out/register/helper/tree-node-register.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tree-node-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/tree-node-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAIpD,eAAe;AACf,eAAO,MAAM,yBAAyB,cAAc,CAAC;AAErD;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,iBAAiB,GAChC,IAAI,CAEN;AAQD;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAwCxC"}
1
+ {"version":3,"file":"tree-node-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/tree-node-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAIpD,eAAe;AACf,eAAO,MAAM,yBAAyB,cAAc,CAAC;AAErD;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,iBAAiB,GAChC,IAAI,CAEN;AAQD;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC,CA2CxC"}
package/out/register/helper/tree-node-register.js CHANGED
@@ -53,7 +53,10 @@ export async function getTreeNodeProvider(model, tree) {
53
53
  return provider;
54
54
  }
55
55
  }
56
- // 找树节点类型适配器
56
+ // 找树节点类型适配器,未找到则找默认适配器
57
57
  provider = getProvider(treeNodeType);
58
+ if (!provider) {
59
+ provider = getProvider('DEFAULT');
60
+ }
58
61
  return provider;
59
62
  }
package/out/ui-logic/index.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import { IUILogicParams } from '../interface';
2
+ export * from './ui-logic-node';
2
3
  /**
3
4
  * @description 执行界面逻辑
4
5
  * @export
package/out/ui-logic/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ui-logic/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAoB,MAAM,cAAc,CAAC;AAQhE;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAC/B,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,OAAO,CAAC,CAmClB"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ui-logic/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAoB,MAAM,cAAc,CAAC;AAGhE,cAAc,iBAAiB,CAAC;AAOhC;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAC/B,WAAW,EAAE,MAAM,EACnB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,OAAO,CAAC,CAmClB"}
package/out/ui-logic/index.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import { RuntimeError } from '@ibiz-template/core';
2
2
  import { getUILogicProvider } from '../register';
3
+ export * from './ui-logic-node';
3
4
  /**
4
5
  * 界面逻辑实例缓存
5
6
  */
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ibiz-template/runtime",
3
- "version": "0.7.41-alpha.135",
3
+ "version": "0.7.41-alpha.136",
4
4
  "description": "运行时逻辑库",
5
5
  "type": "module",
6
6
  "main": "out/index.js",
@@ -70,5 +70,5 @@
70
70
  "qx-util": "^0.4.8",
71
71
  "ramda": "^0.29.0"
72
72
  },
73
- "gitHead": "88956b47ccf53ca5cc4a2499e5fa59655f979912"
73
+ "gitHead": "1b93abc0b7ace1087581e25717564d4f35a8056d"
74
74
  }
package/src/controller/control/calendar/calendar.service.ts CHANGED
@@ -239,6 +239,28 @@ export class CalendarService extends MDControlService<ISysCalendar> {
239
239
  */
240
240
  private getSearchConds(item: ISysCalendarItem, params: IParams): IParams[] {
241
241
  const { srfstartdate, srfenddate } = params;
242
+ // 如果开始和结束时间字段相同，则条件为大于等于开始时间，小于等于结束时间
243
+ if (item.beginTimeAppDEFieldId === item.endTimeAppDEFieldId)
244
+ return [
245
+ {
246
+ condop: 'AND',
247
+ condtype: 'GROUP',
248
+ searchconds: [
249
+ {
250
+ condtype: 'DEFIELD',
251
+ fieldname: item.beginTimeAppDEFieldId,
252
+ value: srfstartdate,
253
+ condop: 'GTANDEQ',
254
+ },
255
+ {
256
+ condtype: 'DEFIELD',
257
+ fieldname: item.beginTimeAppDEFieldId,
258
+ value: srfenddate,
259
+ condop: 'LTANDEQ',
260
+ },
261
+ ],
262
+ },
263
+ ];
242
264
  return [
243
265
  {
244
266
  condop: 'OR',
package/src/interface/api/state/control/i-api-tree.state.ts CHANGED
@@ -94,7 +94,7 @@ export interface IApiTreeNodeData {
94
94
  _parent?: IApiTreeNodeData;
95
95
 
96
96
  /**
97
- * @description 实体数据
97
+ * @description 实体数据（实体动态代码表树节点/实体数据集树节点类型存在该属性，静态树节点类型不存在该属性）
98
98
  * @type {IApiData}
99
99
  * @memberof IApiTreeNodeData
100
100
  */
package/src/register/helper/tree-node-register.ts CHANGED
@@ -72,7 +72,10 @@ export async function getTreeNodeProvider(
72
72
  }
73
73
  }
74
74
 
75
- // 找树节点类型适配器
75
+ // 找树节点类型适配器,未找到则找默认适配器
76
76
  provider = getProvider(treeNodeType);
77
+ if (!provider) {
78
+ provider = getProvider('DEFAULT');
79
+ }
77
80
  return provider;
78
81
  }
package/src/ui-logic/index.ts CHANGED
@@ -3,6 +3,8 @@ import { IDEUILogic } from '@ibiz/model-core';
3
3
  import { IUILogicParams, IUILogicProvider } from '../interface';
4
4
  import { getUILogicProvider } from '../register';
5
5
 
6
+ export * from './ui-logic-node';
7
+
6
8
  /**
7
9
  * 界面逻辑实例缓存
8
10
  */