@cloudbase/cals 1.0.9-alpha.1 → 1.0.10-alpha.0

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.
@@ -1,4 +1,4 @@
1
- import { IPlatformListener } from '../../types/platform/common';
1
+ import { IPlatformListener, IPlatformDataset } from '../../types/platform/common';
2
2
  import { IAttributes, IPlatformApp, IComplexComponent, IBasicComponent, IPageComponent, IDataSourceVariable, IDataVarMethod, // 勿删,为了生成d.ts
3
3
  IPlatformDataSource, IDependencies, LCDS } from '../../types';
4
4
  import { IDynamicValue, PropBindType } from '../expression';
@@ -58,7 +58,7 @@ interface ISerializeDynamicMapProps {
58
58
  streamlineDefaultValue?: boolean;
59
59
  }
60
60
  export declare function serializeDynamicMap(props: ISerializeDynamicMapProps): {
61
- [key: string]: string;
61
+ [key: string]: any;
62
62
  };
63
63
  export declare function deserializeDynamicMap(ctx: IDeserializeContext, map: {
64
64
  [key: string]: string | any;
@@ -70,11 +70,22 @@ export declare function deserializeDynamicMap(ctx: IDeserializeContext, map: {
70
70
  export declare function serializeAttributes(ctx: ISerializeContext, scope: 'page' | 'component', attributes?: {
71
71
  [key: string]: IDynamicValue;
72
72
  }): {
73
- [key: string]: string;
73
+ [key: string]: any;
74
74
  };
75
75
  export declare function deserializeAttributes(ctx: IDeserializeContext, attributes?: IAttributes, attributesExtraData?: {}): {
76
76
  [key: string]: IDynamicValue;
77
77
  };
78
+ /**
79
+ * 将dataset({state: {}, params: {}})从 weapp 结构转换为cals结构
80
+ * 目前仅转换 state 中的 initMethod.params 和 updateMethod.params
81
+ */
82
+ export declare function serializeDataset(ctx: ISerializeContext, dataset: any): any;
83
+ /**
84
+ * 将dataset({state: {}, params: {}})从 cals 结构转换为weapp结构
85
+ * 目前仅转换 state 中的 initMethod.params 和 updateMethod.params
86
+ */
87
+ export declare function deserializeDataset(ctx: IDeserializeContext, dataset: IPlatformDataset): any;
88
+ export declare function normalizeQuery(query: any): any;
78
89
  export declare function deserializeDataVariables(ctx: IDeserializeContext, data: IDataSourceVariable): {
79
90
  title: string;
80
91
  name: string;
@@ -340,6 +351,7 @@ export declare function deserializePlatformApp(data: IPlatformApp, optsions: {
340
351
  };
341
352
  domain?: string;
342
353
  originHistoryId?: string;
354
+ enableLoading?: boolean;
343
355
  };
344
356
  dependencies: IDependencies;
345
357
  schemaVersion: string;
@@ -349,6 +361,7 @@ export declare function deserializePlatformApp(data: IPlatformApp, optsions: {
349
361
  * [formily] to [CALS]
350
362
  */
351
363
  export declare function serializeRuntimePage(ctx: Pick<ISerializeContext, 'app' | 'dependencies' | 'streamlineDefaultValue'>, page: any): IPageComponent;
364
+ export declare function serializeRuntimeDataset(ctx: any, dataset: any): any;
352
365
  /**
353
366
  * component
354
367
  * [formily] to [CALS]
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/parser/cals/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/parser/cals/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAuC,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAEvH,OAAO,EACL,WAAW,EACX,YAAY,EACZ,iBAAiB,EACjB,eAAe,EACf,cAAc,EAGd,mBAAmB,EACnB,cAAc,EAAE,cAAc;AAC9B,mBAAmB,EACnB,aAAa,EACb,IAAI,EAEL,MAAM,aAAa,CAAC;AAErB,OAAO,EAAkC,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAgB5F,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAG5D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAEvD,UAAU,mBAAmB;IAC3B,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;IACrB,eAAe,CAAC,EAAE,GAAG,CAAC;IACtB,IAAI,CAAC,EAAE,cAAc,CAAC;CACvB;AAED,UAAU,iBAAiB;IACzB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,IAAI,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACtB,SAAS,CAAC,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAChE;;;OAGG;IACH,YAAY,CAAC,EAAE,GAAG,EAAE,CAAC;IACrB,eAAe,CAAC,EAAE,GAAG,CAAC;IACtB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,wBAAgB,cAAc,CAAC,EAC7B,GAAG,EACH,GAAG,EACH,YAAY,EACZ,KAAc,EACd,sBAAsB,GACvB,EAAE;IACD,GAAG,EAAE,iBAAiB,CAAC;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,aAAa,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC7B,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,GAAG,CAAC;IAAC,KAAK,CAAC,EAAE,GAAG,CAAA;CAAE,CAmE3C;AAID,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,mBAAmB,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,GAAG;;;;;;;EAwC9F;AAED,UAAU,yBAAyB;IACjC,GAAG,EAAE,iBAAiB,CAAC;IACvB,GAAG,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;KAAE,CAAC;IACtC,KAAK,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC7B,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,yBAAyB;;EAEnE;AAkJD,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,mBAAmB,EACxB,GAAG,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAA;CAAE,EACpC,QAAQ,CAAC,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE;;EA4ClC;AAED,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,MAAM,GAAG,WAAW,EAC3B,UAAU,GAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;CAAO;;EAGlD;AAeD,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,mBAAmB,EACxB,UAAU,GAAE,WAAgB,EAC5B,mBAAmB,KAAK;;EAiBzB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,iBAAiB,EAAE,OAAO,EAAE,GAAG,OAyDpE;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,mBAAmB,EAAE,OAAO,EAAE,gBAAgB,OAgCrF;AAED,wBAAgB,cAAc,CAAC,KAAK,KAAA,OAiBnC;AAiLD,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,mBAAmB,EAAE,IAAI,EAAE,mBAAmB;;;;;;;;EAM3F;AAoED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,iBAAiB,GACpB,CACI;IACE,IAAI,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;CAC3C,GACD;IACE,SAAS,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAC,WAAW,CAAC,CAAC;CACrD,CACJ,EACH,SAAS,EAAE;IACT,UAAU,CAAC,EAAE;QAEX,UAAU,EAAE,MAAM,CAAC;QACnB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,MAAM,CAAC,EAAE;QACP,IAAI,EAAE;YAAE,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,CAAA;SAAE,CAAC;QACxC,UAAU,CAAC,EAAE;YACX,IAAI,CAAC,EAAE,aAAa,CAAC;YACrB,SAAS,CAAC,EAAE,aAAa,CAAC;YAC1B,KAAK,CAAC,EAAE,aAAa,CAAC;YACtB,QAAQ,CAAC,EAAE,aAAa,CAAC;SAC1B,CAAC;QACF,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC;QAClB,KAAK,EAAE,GAAG,CAAC;QACX,SAAS,EAAE,aAAa,CAAC;QACzB,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,aAAa,EAAE,aAAa,CAAC;QAC7B,WAAW,EAAE,GAAG,CAAC;QACjB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,uBAAuB,EAAE,MAAM,EAAE,CAAC;KACnC,CAAC;IACF,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE;QACX,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;CACH,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,EAClC,KAAK,GAAE,MAAM,GAAG,WAAoB,GACnC,eAAe,GAAG,iBAAiB,CAwGrC;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,mBAAmB,EAAE,UAAU,EAAE,CAAC,eAAe,GAAG,iBAAiB,CAAC,EAAE;;EAoFjH;AAED,wBAAgB,aAAa,CAC3B,GAAG,EAAE,IAAI,CAAC,iBAAiB,EAAE,KAAK,GAAG,cAAc,GAAG,iBAAiB,CAAC,EACxE,IAAI,EAAE,GAAG,GACR,cAAc,CAiEhB;AAED,wBAAgB,eAAe,CAC7B,GAAG,EAAE;IACH,GAAG,EAAE,QAAQ,CAAC,mBAAmB,CAAC,CAAC,KAAK,CAAC,CAAC;IAC1C,YAAY,EAAE,mBAAmB,CAAC,cAAc,CAAC,CAAC;IAClD,UAAU,EAAE,MAAM,CAAC;CACpB,EACD,IAAI,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4CrB;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,GAAG,EACT,QAAQ,EAAE;IACR,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,GACA,YAAY,CAmEd;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,YAAY,EAClB,QAAQ,EAAE;IACR,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAsEF;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,IAAI,CAAC,iBAAiB,EAAE,KAAK,GAAG,cAAc,GAAG,wBAAwB,CAAC,EAC/E,IAAI,EAAE,GAAG,GACR,cAAc,CAsDhB;AAED,wBAAgB,uBAAuB,CAAC,GAAG,KAAA,EAAE,OAAO,KAAA,OAiCnD;AAWD;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,iBAAiB,GAAG;IACvB,IAAI,EAAE,QAAQ,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;CAC3C,EACD,SAAS,EAAE,GAAG,GAAG;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,GAC9B,eAAe,GAAG,iBAAiB,CAsHrC;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,GAAG,GAAG,CAwBzE;AAaD,wBAAgB,+BAA+B,CAAC,IAAI,EAAE;IACpD,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACzC,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC,UAAU,CAAA;KAAE,CAAC;IAC/C,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC,OAAO,CAAA;KAAE,CAAC;CAC1C;;;;;;;mBAIY,MAAM;mBACN,MAAM;sBACH,MAAM;;;6BACwB,OAAO;;;wBACnC,MAAM;;;;;;EAiCvB;AAED,wBAAgB,2BAA2B,CACzC,GAAG,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EACrC,SAAS,EAAE,GAA4B,EACvC,KAAK,EAAE,MAAM,OAkCd;AAED;;GAEG;AACH,wBAAgB,YAAY,CAC1B,OAAO,SAAK,EACZ,YAAY,QAAK,GAChB;IACD,qBAAqB,EAAE,OAAO,CAAC;IAC/B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,cAAc,EAAE,OAAO,CAAC;IACxB,uBAAuB,EAAE,OAAO,CAAC;CAClC,CA+BA;AAED,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,iBAAiB,EAAE,EAC9B,OAAO,CAAC,EAAE;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,GAC5B;IACD,SAAS,EAAE,iBAAiB,EAAE,CAAC;IAC/B,UAAU,EAAE,UAAU,EAAE,CAAC;CAC1B,CA+DA"}
@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
14
14
  return (mod && mod.__esModule) ? mod : { "default": mod };
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.processListeners = exports.parseVersion = exports.processRuntimeCodeResources = exports.deserializeComponentLibraryMeta = exports.deserializeRuntimeComponent = exports.serializeRuntimeComponent = exports.serializeRuntimePage = exports.deserializePlatformApp = exports.serializePlatformApp = exports.deserializePage = exports.serializePage = exports.deserializeComponent = exports.serializeComponent = exports.deserializeDataVariables = exports.deserializeAttributes = exports.serializeAttributes = exports.deserializeDynamicMap = exports.serializeDynamicMap = exports.deserializeValue = exports.serializeValue = exports.generateDefaultCode = exports.getUsedComps = void 0;
17
+ exports.processListeners = exports.parseVersion = exports.processRuntimeCodeResources = exports.deserializeComponentLibraryMeta = exports.deserializeRuntimeComponent = exports.serializeRuntimeComponent = exports.serializeRuntimeDataset = exports.serializeRuntimePage = exports.deserializePlatformApp = exports.serializePlatformApp = exports.deserializePage = exports.serializePage = exports.deserializeComponent = exports.serializeComponent = exports.deserializeDataVariables = exports.normalizeQuery = exports.deserializeDataset = exports.serializeDataset = exports.deserializeAttributes = exports.serializeAttributes = exports.deserializeDynamicMap = exports.serializeDynamicMap = exports.deserializeValue = exports.serializeValue = exports.generateDefaultCode = exports.getUsedComps = void 0;
18
18
  const get_1 = __importDefault(require("lodash/get"));
19
19
  const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
20
20
  const unset_1 = __importDefault(require("lodash/unset"));
@@ -363,18 +363,36 @@ function serializeDataset(ctx, dataset) {
363
363
  })) === null || _d === void 0 ? void 0 : _d.data;
364
364
  }
365
365
  });
366
- Object.values(result.query || {}).forEach((query) => {
367
- var _a, _b, _c, _d;
368
- if ((_a = query.method) === null || _a === void 0 ? void 0 : _a.params) {
369
- query.method.params = (_b = serializeDynamicMapWithExtra({
370
- ctx,
371
- map: query.method.params,
372
- })) === null || _b === void 0 ? void 0 : _b.data;
366
+ Object.entries(result.query || {}).forEach(([key, query]) => {
367
+ var _a, _b, _c;
368
+ let { dataSourceName, method, listeners, handler, data } = query, restQuery = __rest(query, ["dataSourceName", "method", "listeners", "handler", "data"]);
369
+ let mergedData = (_a = serializeDynamicMapWithExtra({
370
+ ctx,
371
+ map: data || {},
372
+ })) === null || _a === void 0 ? void 0 : _a.data;
373
+ if (dataSourceName && !handler) {
374
+ handler = {
375
+ moduleName: 'platform',
376
+ name: 'cloud.callDataSource',
377
+ };
378
+ mergedData = {
379
+ dataSourceName,
380
+ methodName: method.name,
381
+ params: (_b = serializeDynamicMapWithExtra({
382
+ ctx,
383
+ map: method.params || {},
384
+ })) === null || _b === void 0 ? void 0 : _b.data,
385
+ };
373
386
  }
374
- query.listeners = (_d = (_c = query.listeners) === null || _c === void 0 ? void 0 : _c.map) === null || _d === void 0 ? void 0 : _d.call(_c, (listener) => serializeListener(ctx, listener));
387
+ result.query[key] = Object.assign(Object.assign({}, restQuery), { handler: {
388
+ module: handler === null || handler === void 0 ? void 0 : handler.moduleName,
389
+ name: handler === null || handler === void 0 ? void 0 : handler.name,
390
+ params: mergedData,
391
+ }, listeners: (_c = listeners === null || listeners === void 0 ? void 0 : listeners.map) === null || _c === void 0 ? void 0 : _c.call(listeners, (listener) => serializeListener(ctx, listener)) });
375
392
  });
376
393
  return result;
377
394
  }
395
+ exports.serializeDataset = serializeDataset;
378
396
  /**
379
397
  * 将dataset({state: {}, params: {}})从 cals 结构转换为weapp结构
380
398
  * 目前仅转换 state 中的 initMethod.params 和 updateMethod.params
@@ -396,17 +414,35 @@ function deserializeDataset(ctx, dataset) {
396
414
  state.updateMethod.params = deserializeDynamicMap(ctx, state.updateMethod.params);
397
415
  }
398
416
  });
399
- Object.values(result.query || {}).forEach((query /* IDataSourceQuery */) => {
400
- var _a, _b, _c;
401
- if ((_a = query.method) === null || _a === void 0 ? void 0 : _a.params) {
402
- query.method.params = deserializeDynamicMap(ctx, query.method.params);
403
- }
404
- query.listeners = (_c = (_b = query.listeners) === null || _b === void 0 ? void 0 : _b.map) === null || _c === void 0 ? void 0 : _c.call(_b, (listener) => {
405
- return deserializeListener(ctx, listener);
406
- });
417
+ Object.entries(result.query || {}).forEach(([key, query]) => {
418
+ var _a;
419
+ const _b = normalizeQuery(query), { handler, listeners } = _b, restQuery = __rest(_b, ["handler", "listeners"]);
420
+ result.query[key] = Object.assign(Object.assign({}, restQuery), { handler: {
421
+ moduleName: handler === null || handler === void 0 ? void 0 : handler.module,
422
+ name: (handler === null || handler === void 0 ? void 0 : handler.name) || '',
423
+ }, data: deserializeDynamicMap(ctx, (handler === null || handler === void 0 ? void 0 : handler.params) || {}), listeners: (_a = listeners === null || listeners === void 0 ? void 0 : listeners.map) === null || _a === void 0 ? void 0 : _a.call(listeners, (listener) => {
424
+ return deserializeListener(ctx, listener);
425
+ }) });
407
426
  });
408
427
  return result;
409
428
  }
429
+ exports.deserializeDataset = deserializeDataset;
430
+ function normalizeQuery(query) {
431
+ let { dataSourceName, method, handler } = query, restQuery = __rest(query, ["dataSourceName", "method", "handler"]);
432
+ if (dataSourceName && !handler) {
433
+ handler = {
434
+ module: 'platform',
435
+ name: 'cloud.callDataSource',
436
+ params: {
437
+ dataSourceName,
438
+ methodName: method.name,
439
+ params: method.params,
440
+ },
441
+ };
442
+ }
443
+ return Object.assign(Object.assign({}, restQuery), { handler });
444
+ }
445
+ exports.normalizeQuery = normalizeQuery;
410
446
  function serializeDirecties(ctx, directives, scope = 'page') {
411
447
  var _a;
412
448
  let processed = {
@@ -575,8 +611,7 @@ function serializeXIndex(ctx, list) {
575
611
  .map((component) => {
576
612
  const { extra } = component, restComponent = __rest(component, ["extra"]);
577
613
  const _a = extra || {}, { xIndex } = _a, restExtra = __rest(_a, ["xIndex"]);
578
- return Object.assign(Object.assign({}, restComponent), { exrta: extra
579
- ? Object.assign({}, restExtra) : undefined });
614
+ return Object.assign(Object.assign({}, restComponent), { extra: extra ? restExtra : undefined });
580
615
  });
581
616
  }
582
617
  function serializeComponent(ctx, component, scope = 'page') {
@@ -907,7 +942,7 @@ function serializeRuntimePage(ctx, page) {
907
942
  /**
908
943
  * 感觉此处有问题,状态应该无法直接透传才对
909
944
  */
910
- dataset: page === null || page === void 0 ? void 0 : page.dataset,
945
+ dataset: serializeRuntimeDataset(pageCtx, page === null || page === void 0 ? void 0 : page.dataset),
911
946
  dataVariables: (0, runtime_1.getValidValue)((_e = (_d = page === null || page === void 0 ? void 0 : page.vars) === null || _d === void 0 ? void 0 : _d.data) === null || _e === void 0 ? void 0 : _e.map((item) => serializeDataVariables(pageCtx, item))),
912
947
  listeners: (0, runtime_1.getValidValue)((0, runtime_1.readListeners)(page.listenerInstances || []).map((item) => {
913
948
  return serializeListener(pageCtx, item);
@@ -936,6 +971,31 @@ function serializeRuntimePage(ctx, page) {
936
971
  return processedPage;
937
972
  }
938
973
  exports.serializeRuntimePage = serializeRuntimePage;
974
+ function serializeRuntimeDataset(ctx, dataset) {
975
+ if (!dataset) {
976
+ return dataset;
977
+ }
978
+ const { query } = dataset, resetDataset = __rest(dataset, ["query"]);
979
+ return Object.assign(Object.assign({}, resetDataset), { query: query
980
+ ? Object.entries(query).reduce((map, [key, query]) => {
981
+ var _a;
982
+ const { dataSourceName, listenerInstances, method } = query, restQuey = __rest(query, ["dataSourceName", "listenerInstances", "method"]);
983
+ map[key] = Object.assign(Object.assign({}, restQuey), { handler: {
984
+ module: 'platform',
985
+ name: 'cloud.callDataSource',
986
+ params: {
987
+ dataSourceName,
988
+ methodName: method.name,
989
+ params: serializeAttributesWithExtra(ctx, 'page', (0, runtime_1.getValidValue)((0, runtime_1.readDynamicData)(method)) || {}).data || {},
990
+ },
991
+ }, listeners: (_a = (0, runtime_1.getValidValue)((0, runtime_1.readListeners)(listenerInstances || []))) === null || _a === void 0 ? void 0 : _a.map((listener /* IEventListener */) => {
992
+ return serializeListener(ctx, listener);
993
+ }) });
994
+ return map;
995
+ }, {})
996
+ : query });
997
+ }
998
+ exports.serializeRuntimeDataset = serializeRuntimeDataset;
939
999
  // /**
940
1000
  // * page
941
1001
  // * [CALS] to [formily]
@@ -154,6 +154,10 @@ export interface IPlatformAppExtra {
154
154
  lastDependencies?: {
155
155
  [key: string]: string;
156
156
  };
157
+ /**
158
+ * 是否开启默认loading
159
+ */
160
+ enableLoading?: boolean;
157
161
  }
158
162
  export interface IPlatformAppLifeCycle extends IEvents {
159
163
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/types/platform/app.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/types/platform/app.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
+ import { IHandler } from '../basic/common';
1
2
  import { IPlatformListener } from './common';
2
3
  /**
3
4
  * query基类描述
@@ -15,12 +16,16 @@ interface IQueryBase {
15
16
  * 选填, code区的中文标识
16
17
  */
17
18
  label?: string;
18
- /** 子类型 内置数据模型model 连接器类型apis sql语句类型*/
19
- type: 'model' | 'apis' | 'sql';
20
19
  /**
21
20
  * 选填, 额外描述
22
21
  */
23
22
  description?: '';
23
+ /** 子类型 内置数据模型model 连接器类型apis sql语句类型*/
24
+ type: 'model' | 'apis' | 'sql';
25
+ /**
26
+ * 触发响应动作
27
+ */
28
+ handler?: IHandler;
24
29
  /**
25
30
  * 必选, 触发时机 自动指当前事件因change等事件自动触发 手动指被其他事件带着触发
26
31
  */
@@ -35,13 +40,17 @@ interface IQueryBase {
35
40
  */
36
41
  export interface IDataSourceQuery extends IQueryBase {
37
42
  /**
38
- * 必填, 绑定的数据源名称/当前已创建的sql标志
43
+ * @deprecated
44
+ * 结合采用 handler 的方式索引
45
+ * 绑定的数据源名称/当前已创建的sql标志
39
46
  */
40
- dataSourceName: string;
47
+ dataSourceName?: string;
41
48
  /**
49
+ * @deprecated
50
+ * 结合采用 handler 的方式索引
42
51
  * 变量初始化的方法, 集合/单条记录类型变量需有该方法
43
52
  */
44
- method: IQueryMethod;
53
+ method?: IQueryMethod;
45
54
  }
46
55
  /**
47
56
  * 数据源类型查询时 调用方法内部定义
@@ -1 +1 @@
1
- {"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/types/platform/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE7C;;GAEG;AACH,UAAU,UAAU;IAClB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,0CAA0C;IAC1C,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;IAE/B;;OAEG;IACH,WAAW,CAAC,EAAE,EAAE,CAAC;IAEjB;;OAEG;IACH,OAAO,EAAE,MAAM,GAAG,QAAQ,CAAC;IAE3B;;OAEG;IACH,SAAS,CAAC,EAAE,iBAAiB,EAAE,CAAC;CACjC;AAED;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IAClD;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,MAAM,EAAE,YAAY,CAAC;CACtB;AAED;;GAEG;AACH,UAAU,YAAY;IACpB,eAAe;IACf,IAAI,EAAE,MAAM,CAAC;IACb,4BAA4B;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB"}
1
+ {"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/types/platform/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE7C;;GAEG;AACH,UAAU,UAAU;IAClB;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,WAAW,CAAC,EAAE,EAAE,CAAC;IAEjB,0CAA0C;IAC1C,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;IAE/B;;OAEG;IACH,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;OAEG;IACH,OAAO,EAAE,MAAM,GAAG,QAAQ,CAAC;IAE3B;;OAEG;IACH,SAAS,CAAC,EAAE,iBAAiB,EAAE,CAAC;CACjC;AAED;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IAClD;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB;;;;OAIG;IACH,MAAM,CAAC,EAAE,YAAY,CAAC;CACvB;AAED;;GAEG;AACH,UAAU,YAAY;IACpB,eAAe;IACf,IAAI,EAAE,MAAM,CAAC;IACb,4BAA4B;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/dts/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/dts/index.ts"],"names":[],"mappings":"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"}
@@ -274,8 +274,6 @@ function _generateOneItemDTS(inputData, itemType) {
274
274
  */
275
275
  function getDisplayReturnType(typeStr) {
276
276
  let displayType = typeStr.trim();
277
- if (!displayType)
278
- console.log('>>>>> displayType', displayType, typeStr);
279
277
  if (displayType.endsWith('[]')) {
280
278
  displayType = 'array';
281
279
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cloudbase/cals",
3
- "version": "1.0.9-alpha.1",
3
+ "version": "1.0.10-alpha.0",
4
4
  "description": "Common application specifications",
5
5
  "main": "lib/utils/index.js",
6
6
  "source": "src/utils/index.ts",
@@ -1,5 +0,0 @@
1
- export declare function semverComp(a: string, b: string): number;
2
- export declare function toFixed(num: number, precision: number): number;
3
- export declare const OFFICIAL_COMPONENT_LIB_NAME = "CLOUDBASE_STANDARD";
4
- export declare const OFFICIAL_MATERIAL_LIB_NAME = "gsd-h5-react";
5
- //# sourceMappingURL=common.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/utils/version-migrations/common.ts"],"names":[],"mappings":"AAAA,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAYvD;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAI9D;AAED,eAAO,MAAM,2BAA2B,uBAAuB,CAAC;AAChE,eAAO,MAAM,0BAA0B,iBAAiB,CAAC"}
@@ -1,29 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.OFFICIAL_MATERIAL_LIB_NAME = exports.OFFICIAL_COMPONENT_LIB_NAME = exports.toFixed = exports.semverComp = void 0;
4
- function semverComp(a, b) {
5
- const pa = a.split('.');
6
- const pb = b.split('.');
7
- for (let i = 0; i < 3; i++) {
8
- const na = Number(pa[i]);
9
- const nb = Number(pb[i]);
10
- if (na > nb)
11
- return 1;
12
- if (nb > na)
13
- return -1;
14
- if (!isNaN(na) && isNaN(nb))
15
- return 1;
16
- if (isNaN(na) && !isNaN(nb))
17
- return -1;
18
- }
19
- return 0;
20
- }
21
- exports.semverComp = semverComp;
22
- function toFixed(num, precision) {
23
- const multiplier = Math.pow(10, (precision + 1));
24
- const wholeNumber = Math.floor(num * multiplier);
25
- return (Math.round(wholeNumber / 10) * 10) / multiplier;
26
- }
27
- exports.toFixed = toFixed;
28
- exports.OFFICIAL_COMPONENT_LIB_NAME = 'CLOUDBASE_STANDARD';
29
- exports.OFFICIAL_MATERIAL_LIB_NAME = 'gsd-h5-react';
@@ -1,3 +0,0 @@
1
- import type { IPlatformApp } from '../../types';
2
- export declare function version4(cals: IPlatformApp, isUpgrade: boolean, setSchemaVersionCallback?: (version: string | undefined) => void): IPlatformApp;
3
- //# sourceMappingURL=version4.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"version4.d.ts","sourceRoot":"","sources":["../../../src/utils/version-migrations/version4.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAkB,MAAM,aAAa,CAAC;AAGhE,wBAAgB,QAAQ,CACtB,IAAI,EAAE,YAAY,EAClB,SAAS,EAAE,OAAO,EAClB,wBAAwB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,KAAK,IAAI,GAC/D,YAAY,CAEd"}
@@ -1,199 +0,0 @@
1
- "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
- Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.version4 = void 0;
7
- const postcss_1 = __importDefault(require("postcss"));
8
- const postcss_less_1 = __importDefault(require("postcss-less"));
9
- const __1 = require("..");
10
- const common_1 = require("./common");
11
- function version4(cals, isUpgrade, setSchemaVersionCallback) {
12
- return transformPxLowcodeCompAndSourceComp(cals, isUpgrade, setSchemaVersionCallback);
13
- }
14
- exports.version4 = version4;
15
- const transformPxLowcodeCompAndSourceComp = (cals, isUpgrade, setSchemaVersionCallback) => {
16
- var _a, _b, _c, _d;
17
- {
18
- function transformCals(items, isUpgradeToPx) {
19
- return items.map((item) => {
20
- var _a;
21
- // 对于表单操作区的按钮组件的父容器添加.wd-form__action, 兼容组件规范化按钮升级样式
22
- if ((item === null || item === void 0 ? void 0 : item.module) === common_1.OFFICIAL_COMPONENT_LIB_NAME && (item === null || item === void 0 ? void 0 : item.component) === 'Form') {
23
- item = addClassToButtonContainer(item);
24
- }
25
- if ((_a = item === null || item === void 0 ? void 0 : item.extra) === null || _a === void 0 ? void 0 : _a.commonStyle) {
26
- item.extra.commonStyle = convertCommonStyle(item.extra.commonStyle, isUpgradeToPx);
27
- if (item.extra.commonStyle.self) {
28
- // 处理 margin padding shorthand 同步
29
- const newSelf = (0, __1.processCommonStyle2CSSProperties)(item.extra.commonStyle, {
30
- toRem: false,
31
- ignoreSelf: true,
32
- addPXUnit: true,
33
- });
34
- ['margin', 'padding', 'border'].forEach((k) => {
35
- if (item.extra.commonStyle.self[k]) {
36
- item.extra.commonStyle.self[k] = newSelf[k];
37
- }
38
- });
39
- }
40
- }
41
- if (item === null || item === void 0 ? void 0 : item.resources) {
42
- item.resources = item.resources.map((n) => {
43
- if (n.codeType === 'style') {
44
- n = convertLowCodesStyle(n, isUpgradeToPx);
45
- return n;
46
- }
47
- return n;
48
- });
49
- }
50
- if (item.items) {
51
- item.items = transformCals(item.items, isUpgradeToPx);
52
- }
53
- return item;
54
- });
55
- }
56
- let pages = cals['items'];
57
- let isDivision;
58
- if (isUpgrade && (0, common_1.semverComp)((_a = cals['schemaVersion']) !== null && _a !== void 0 ? _a : '3.0.0', '4.0.0') < 0) {
59
- // 组件库版本高于目标版本,且schemaVersion小于4, 将应用 CALS 数据中的 CSS 和 style 中的无单位和有单位的小写 px统一改写为 1/2 px
60
- isDivision = true;
61
- pages = transformCals(pages, isDivision);
62
- cals.resources = (_b = cals.resources) === null || _b === void 0 ? void 0 : _b.map((n) => {
63
- if (n.codeType === 'style') {
64
- n = convertLowCodesStyle(n, isDivision);
65
- return n;
66
- }
67
- return n;
68
- });
69
- cals['schemaVersion'] = '4.0.0';
70
- setSchemaVersionCallback === null || setSchemaVersionCallback === void 0 ? void 0 : setSchemaVersionCallback('4.0.0');
71
- }
72
- else if (!isUpgrade && (0, common_1.semverComp)((_c = cals['schemaVersion']) !== null && _c !== void 0 ? _c : '3.0.0', '4.0.0') >= 0) {
73
- // 组件库低于目标版本,并且schemaVersion大于4 将应用 CALS 数据中的 CSS 和 style 中的无单位和有单位的小写 px统一改写为 2倍 px
74
- isDivision = false;
75
- pages = transformCals(pages, isDivision);
76
- cals.resources = (_d = cals.resources) === null || _d === void 0 ? void 0 : _d.map((n) => {
77
- if (n.codeType === 'style') {
78
- n = convertLowCodesStyle(n, isDivision);
79
- return n;
80
- }
81
- return n;
82
- });
83
- delete cals['schemaVersion'];
84
- setSchemaVersionCallback === null || setSchemaVersionCallback === void 0 ? void 0 : setSchemaVersionCallback(undefined);
85
- }
86
- cals['items'] = pages;
87
- return cals;
88
- }
89
- };
90
- function hasSubmitButton(item) {
91
- var _a;
92
- if ((_a = item === null || item === void 0 ? void 0 : item.items) === null || _a === void 0 ? void 0 : _a.length) {
93
- const children = item.items;
94
- return children.some((i) => { var _a; return (i === null || i === void 0 ? void 0 : i.module) === common_1.OFFICIAL_COMPONENT_LIB_NAME && i.component === 'Button' && ((_a = i === null || i === void 0 ? void 0 : i.attributes) === null || _a === void 0 ? void 0 : _a.formType) === 'submit'; });
95
- }
96
- return false;
97
- }
98
- function addClassToButtonContainer(item) {
99
- var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
100
- if ((item === null || item === void 0 ? void 0 : item.module) === common_1.OFFICIAL_MATERIAL_LIB_NAME && item.component === 'Container') {
101
- if (hasSubmitButton(item)) {
102
- if (((_a = item.attributes) === null || _a === void 0 ? void 0 : _a.class) && !((_b = item.attributes) === null || _b === void 0 ? void 0 : _b.class.includes('wd-form__action'))) {
103
- if (typeof ((_c = item.attributes) === null || _c === void 0 ? void 0 : _c.class) === 'string') {
104
- item.attributes = Object.assign(Object.assign({}, item.attributes), { class: `${(_d = item.attributes) === null || _d === void 0 ? void 0 : _d.class} wd-form__action` });
105
- }
106
- else if (Array.isArray((_e = item.attributes) === null || _e === void 0 ? void 0 : _e.class)) {
107
- item.attributes = Object.assign(Object.assign({}, item.attributes), { class: [...(_f = item.attributes) === null || _f === void 0 ? void 0 : _f.class, 'wd-form__action'] });
108
- }
109
- }
110
- else if (!((_g = item.attributes) === null || _g === void 0 ? void 0 : _g.class)) {
111
- item.attributes = Object.assign(Object.assign({}, item.attributes), { class: 'wd-form__action' });
112
- }
113
- // 移除旧的padding配置
114
- if ((_j = (_h = item === null || item === void 0 ? void 0 : item.extra) === null || _h === void 0 ? void 0 : _h.commonStyle) === null || _j === void 0 ? void 0 : _j.padding) {
115
- delete item.extra.commonStyle.padding;
116
- }
117
- }
118
- }
119
- if ((_k = item === null || item === void 0 ? void 0 : item.items) === null || _k === void 0 ? void 0 : _k.length) {
120
- item.items = item.items.map((i) => addClassToButtonContainer(i));
121
- }
122
- return item;
123
- }
124
- function jsonTranverse(json, reviver) {
125
- return JSON.parse(JSON.stringify(json, reviver, 2));
126
- }
127
- function convertCommonStyle(value, isUpgrade) {
128
- return jsonTranverse(value, (key, value) => {
129
- if (__1.isUnitlessNumber[key]) {
130
- return value;
131
- }
132
- if (typeof value === 'number') {
133
- if (isUpgrade) {
134
- value = value / 2;
135
- }
136
- else {
137
- value = value * 2;
138
- }
139
- }
140
- else if (/^((\d+\.)?\d+)(px)?$/.test(value)) {
141
- value = !value ? value : value === null || value === void 0 ? void 0 : value.replace('px', '');
142
- if (isUpgrade) {
143
- // console.log(key, value, Number(value) / 2);
144
- value = !value ? value : `${(0, common_1.toFixed)(Number(value) / 2, 3)}px`;
145
- }
146
- else {
147
- value = !value ? value : `${Number(value) * 2}px`;
148
- }
149
- }
150
- return value;
151
- });
152
- }
153
- const rem2PxPlugin = (opts) => {
154
- const rem2pxSym = Symbol('rem2pxSym');
155
- const { isUpgrade } = opts;
156
- return {
157
- postcssPlugin: 'postcss-rem2px',
158
- Declaration(decl, rule) {
159
- // Modified From https://github.com/cuth/postcss-pxtorem/blob/122649015322214f8e9d1ac852eb11c0791b634b/lib/pixel-unit-regex.js#L9
160
- // eslint-disable-next-line no-useless-escape
161
- const pxRegex = /"[^"]+"|'[^']+'|(\d*\.?\d+)px/gm;
162
- if (decl.value.indexOf('px') < 0) {
163
- return;
164
- }
165
- if (decl[rem2pxSym]) {
166
- return;
167
- }
168
- if (isUpgrade) {
169
- const value = decl.value.replace(pxRegex, (match, p1) => {
170
- if (p1 !== null && p1 !== undefined) {
171
- const r = (0, common_1.toFixed)(Number(p1) / 2, 3);
172
- const rs = r.toString();
173
- return `${rs}px`;
174
- }
175
- return match;
176
- });
177
- decl.value = value;
178
- }
179
- else {
180
- const value = decl.value.replace(pxRegex, (match, p1) => {
181
- if (p1 !== null && p1 !== undefined) {
182
- return `${Number(p1) * 2}px`;
183
- }
184
- return match;
185
- });
186
- decl.value = value;
187
- }
188
- decl[rem2pxSym] = true;
189
- },
190
- };
191
- };
192
- rem2PxPlugin.postcss = true;
193
- function convertLowCodesStyle(value, isUpgrade) {
194
- const result = (0, postcss_1.default)([rem2PxPlugin({ isUpgrade })]).process(value.code, {
195
- syntax: postcss_less_1.default,
196
- });
197
- value.code = result.css;
198
- return value;
199
- }