@steedos/service-metadata-objects 2.2.55 → 2.3.0-beta.3

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.
@@ -26,8 +26,8 @@ function getDBType(objectName, field) {
26
26
  case "html":
27
27
  return SteedosFieldDBType.text;
28
28
  case "select":
29
- if (this.multiple) {
30
- return SteedosFieldDBType.array;
29
+ if (field.multiple) {
30
+ return SteedosFieldDBType.varchar;
31
31
  }
32
32
  else {
33
33
  return SteedosFieldDBType.varchar;
@@ -38,15 +38,15 @@ function getDBType(objectName, field) {
38
38
  return SteedosFieldDBType.boolean;
39
39
  case "date":
40
40
  return SteedosFieldDBType.date;
41
+ case "time":
41
42
  case "datetime":
42
43
  return SteedosFieldDBType.dateTime;
43
- case "time":
44
- return this.getDBType("datetime");
44
+ case "percent":
45
45
  case "number":
46
46
  return SteedosFieldDBType.number;
47
47
  case "currency":
48
- if (!this.scale && this.scale != 0) {
49
- this.scale = 2;
48
+ if (!field.scale && field.scale != 0) {
49
+ field.scale = 2;
50
50
  }
51
51
  return SteedosFieldDBType.number;
52
52
  case "password":
@@ -106,11 +106,9 @@ function getDBType(objectName, field) {
106
106
  case "markdown":
107
107
  return SteedosFieldDBType.varchar;
108
108
  case "formula":
109
- return this.getDBType(this.data_type);
109
+ return getDBType(objectName, Object.assign(Object.assign({}, field), { type: "datetime" }));
110
110
  case "summary":
111
111
  return SteedosFieldDBType.varchar;
112
- case "percent":
113
- return this.getDBType("number");
114
112
  default:
115
113
  console.log(`field`, field);
116
114
  throw new Error(`${objectName}.${field.name} invalid field type ${field.type}`);
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/objects/fields/index.ts"],"names":[],"mappings":";;;;AAAA,SAAsB,cAAc;kEAAI,CAAC;CAAA;AAAzC,wCAAyC;AAEzC,IAAK,kBAaJ;AAbD,WAAK,kBAAkB;IACnB,yCAAmB,CAAA;IACnB,mCAAa,CAAA;IACb,uCAAiB,CAAA;IACjB,yCAAmB,CAAA;IACnB,mCAAa,CAAA;IACb,2CAAqB,CAAA;IACrB,mCAAa,CAAA;IACb,qCAAe,CAAA;AAKnB,CAAC,EAbI,kBAAkB,KAAlB,kBAAkB,QAatB;AAED,SAAgB,SAAS,CAAC,UAAU,EAAE,KAAK;IACvC,QAAQ,KAAK,CAAC,IAAI,EAAE;QAChB,KAAK,MAAM;YACP,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,UAAU;YACX,OAAO,kBAAkB,CAAC,IAAI,CAAC;QACnC,KAAK,MAAM;YACP,OAAO,kBAAkB,CAAC,IAAI,CAAC;QACnC,KAAK,QAAQ;YACT,IAAI,IAAI,CAAC,QAAQ,EAAE;gBACf,OAAO,kBAAkB,CAAC,KAAK,CAAC;aACnC;iBAAM;gBACH,OAAO,kBAAkB,CAAC,OAAO,CAAC;aACrC;QACL,KAAK,SAAS;YACV,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,QAAQ;YACT,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,MAAM;YACP,OAAO,kBAAkB,CAAC,IAAI,CAAC;QACnC,KAAK,UAAU;YACX,OAAO,kBAAkB,CAAC,QAAQ,CAAC;QACvC,KAAK,MAAM;YAEP,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACtC,KAAK,QAAQ;YACT,OAAO,kBAAkB,CAAC,MAAM,CAAC;QACrC,KAAK,UAAU;YACX,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE;gBAChC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;aAClB;YACD,OAAO,kBAAkB,CAAC,MAAM,CAAC;QACrC,KAAK,UAAU;YACX,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,QAAQ;YAeT,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,eAAe;YAehB,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,MAAM;YACP,OAAO,kBAAkB,CAAC,KAAK,CAAC;QACpC,KAAK,KAAK;YACN,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,OAAO;YACR,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,QAAQ;YACT,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,UAAU;YACX,OAAO,kBAAkB,CAAC,IAAI,CAAC;QACnC,KAAK,OAAO;YACR,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,QAAQ;YACT,OAAO,kBAAkB,CAAC,IAAI,CAAC;QACnC,KAAK,KAAK;YACN,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,UAAU;YACX,OAAO,kBAAkB,CAAC,KAAK,CAAC;QACpC,KAAK,UAAU;YACX,OAAO,kBAAkB,CAAC,KAAK,CAAC;QACpC,KAAK,QAAQ;YACT,OAAO,kBAAkB,CAAC,KAAK,CAAC;QACpC,KAAK,QAAQ;YACT,OAAO,kBAAkB,CAAC,KAAK,CAAC;QACpC,KAAK,YAAY;YACb,OAAO,kBAAkB,CAAC,IAAI,CAAC;QACnC,KAAK,OAAO;YACR,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,UAAU;YACX,OAAO,kBAAkB,CAAC,MAAM,CAAC;QACrC,KAAK,MAAM;YACP,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,QAAQ;YACT,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,MAAM;YACP,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,qCAAqC;YACtC,OAAO,kBAAkB,CAAC,IAAI,CAAC;QACnC,KAAK,MAAM;YACP,OAAO,kBAAkB,CAAC,IAAI,CAAC;QACnC,KAAK,qCAAqC;YACtC,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,MAAM;YACP,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,QAAQ;YACT,OAAO,kBAAkB,CAAC,IAAI,CAAC;QACnC,KAAK,YAAY;YACb,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,UAAU;YACX,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,SAAS;YACV,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC1C,KAAK,SAAS;YAEV,OAAO,kBAAkB,CAAC,OAAO,CAAC;QACtC,KAAK,SAAS;YAEV,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACpC;YACI,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC5B,MAAM,IAAI,KAAK,CACX,GAAG,UAAU,IAAI,KAAK,CAAC,IAAI,uBAAuB,KAAK,CAAC,IAAI,EAAE,CACjE,CAAC;KACT;AACL,CAAC;AAlID,8BAkIC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/objects/fields/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/service-metadata-objects",
3
- "version": "2.2.55",
3
+ "version": "2.3.0-beta.3",
4
4
  "description": "",
5
5
  "main": "lib/objects.service.js",
6
6
  "scripts": {
@@ -20,9 +20,9 @@
20
20
  "license": "MIT",
21
21
  "dependencies": {
22
22
  "@salesforce/ts-types": "^1.1.1",
23
- "@steedos/formula": "2.2.55",
24
- "@steedos/i18n": "2.2.55",
25
- "@steedos/metadata-registrar": "2.2.55",
23
+ "@steedos/formula": "2.3.0-beta.3",
24
+ "@steedos/i18n": "2.3.0-beta.3",
25
+ "@steedos/metadata-registrar": "2.3.0-beta.3",
26
26
  "dotenv-flow": "^3.1.0",
27
27
  "ioredis": "^4.22.0",
28
28
  "lodash": "^4.17.21",
@@ -36,5 +36,5 @@
36
36
  "publishConfig": {
37
37
  "access": "public"
38
38
  },
39
- "gitHead": "1d94628192d53118f66a75f2399f2b3e1cec184b"
39
+ "gitHead": "bb746c90035f38b361011e4b10f0993a390e8355"
40
40
  }
@@ -24,8 +24,8 @@ export function getDBType(objectName, field) {
24
24
  case "html":
25
25
  return SteedosFieldDBType.text;
26
26
  case "select":
27
- if (this.multiple) {
28
- return SteedosFieldDBType.array;
27
+ if (field.multiple) {
28
+ return SteedosFieldDBType.varchar;
29
29
  } else {
30
30
  return SteedosFieldDBType.varchar;
31
31
  }
@@ -35,16 +35,17 @@ export function getDBType(objectName, field) {
35
35
  return SteedosFieldDBType.boolean;
36
36
  case "date":
37
37
  return SteedosFieldDBType.date;
38
+ //时间字段按日期时间类型处理
39
+ case "time":
38
40
  case "datetime":
39
41
  return SteedosFieldDBType.dateTime;
40
- case "time":
41
- //时间字段按日期时间类型处理
42
- return this.getDBType("datetime");
42
+ //百分比字段按数值类型处理
43
+ case "percent":
43
44
  case "number":
44
45
  return SteedosFieldDBType.number;
45
46
  case "currency":
46
- if (!this.scale && this.scale != 0) {
47
- this.scale = 2;
47
+ if (!field.scale && field.scale != 0) {
48
+ field.scale = 2;
48
49
  }
49
50
  return SteedosFieldDBType.number;
50
51
  case "password":
@@ -132,13 +133,10 @@ export function getDBType(objectName, field) {
132
133
  case "markdown":
133
134
  return SteedosFieldDBType.varchar;
134
135
  case "formula":
135
- return this.getDBType(this.data_type);
136
+ return getDBType(objectName, { ...field, type: "datetime" });
136
137
  case "summary":
137
138
  //汇总不需要check类型
138
139
  return SteedosFieldDBType.varchar;
139
- case "percent":
140
- //百分比字段按数值类型处理
141
- return this.getDBType("number");
142
140
  default:
143
141
  console.log(`field`, field);
144
142
  throw new Error(