@operato/scene-chartjs 1.1.13 → 1.1.16
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.
- package/CHANGELOG.md +18 -0
- package/dist/plugins/chartjs-plugin-data-binder.js +1 -1
- package/dist/plugins/chartjs-plugin-data-binder.js.map +1 -1
- package/logs/application-2022-11-12-23.log +6 -0
- package/logs/connections-2022-11-12-23.log +35 -0
- package/logs/system/.28d571833e9eaa9f4498fa345f6a5fdf86ab8b41-audit.json +15 -0
- package/logs/system/scenario-PUBSUB-TEST-2022-11-13-00.log +2024 -0
- package/package.json +4 -4
- package/src/plugins/chartjs-plugin-data-binder.ts +1 -1
- package/tsconfig.tsbuildinfo +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,24 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
### [1.1.16](https://github.com/things-scene/operato-scene/compare/v1.1.15...v1.1.16) (2022-12-04)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### :bug: Bug Fix
|
|
10
|
+
|
|
11
|
+
* upgrade firebase 9 ([ff1d4da](https://github.com/things-scene/operato-scene/commit/ff1d4dacfbe3e9b6968a342c059055bf3b555875))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
### [1.1.15](https://github.com/things-scene/operato-scene/compare/v1.1.14...v1.1.15) (2022-11-13)
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
### :bug: Bug Fix
|
|
19
|
+
|
|
20
|
+
* use @things-factory/operato-board@6.0.0-zeta.x ([a9deef9](https://github.com/things-scene/operato-scene/commit/a9deef935fde00c6c0d09ca424ca949ac24cbd6a))
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
6
24
|
### [1.1.13](https://github.com/things-scene/operato-scene/compare/v1.1.12...v1.1.13) (2022-11-12)
|
|
7
25
|
|
|
8
26
|
|
|
@@ -45,7 +45,7 @@ function convertObject(dataArray, chartInstance) {
|
|
|
45
45
|
if (!seriesData[i])
|
|
46
46
|
seriesData[i] = [];
|
|
47
47
|
// 값이 NaN 경우엔 차트를 그리지 않음
|
|
48
|
-
if (
|
|
48
|
+
if (isNaN(currData[seriesKeys[i]])) {
|
|
49
49
|
currData[seriesKeys[i]] = NaN;
|
|
50
50
|
}
|
|
51
51
|
seriesData[i].push(currData[seriesKeys[i]]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chartjs-plugin-data-binder.js","sourceRoot":"","sources":["../../src/plugins/chartjs-plugin-data-binder.ts"],"names":[],"mappings":"AAAA,SAAS,aAAa,CACpB,SAAkD,EAClD,aAAyB;IAEzB,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,IAAI,CAAA;KACZ;IAED,IAAI,OAAO,SAAS,IAAI,QAAQ,EAAE;QAChC,IAAI;YACF,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;SAClC;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,IAAI,CAAC,2BAA2B,EAAE,CAAC,CAAC,CAAA;YAC5C,OAAO,IAAI,CAAA;SACZ;KACF;IAED,IAAI,CAAC,CAAC,SAAS,YAAY,KAAK,CAAC,EAAE;QACjC,eAAe;QACf,IAAI,SAAS,YAAY,MAAM,EAAE;YAC/B,OAAO,SAAS,CAAA;SACjB;QACD,OAAO,IAAI,CAAA;KACZ;IAED,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;QAC1B,OAAO,IAAI,CAAA;KACZ;IAED,0BAA0B;IAC1B,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE;QAC3C,SAAS,GAAG,kBAAkB,CAAC,SAAS,CAA0B,CAAA;KACnE;IAED,IAAI,KAAK,GAAG,aAAa,CAAC,IAAI,CAAC,YAAY,CAAA;IAC3C,IAAI,UAAU,GAAG,EAAE,CAAA;IAEnB,KAAK,IAAI,CAAC,IAAI,aAAa,CAAC,IAAI,CAAC,QAAQ,EAAE;QACzC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;KAChE;IAED,IAAI,UAAU,GAA0B,EAAE,CAAA;IAC1C,IAAI,SAAS,GAA0B,EAAE,CAAA;IAEzC,IAAI,eAAe,GAAG;QACpB,UAAU;QACV,SAAS;KACV,CAAA;IAED,KAAK,IAAI,CAAC,IAAI,SAAS,EAAE;QACvB,IAAI,QAAQ,GAAqB,SAAmC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;QAC/E,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAM,CAAC,CAAC,CAAA;QAEhC,KAAK,IAAI,CAAC,IAAI,UAAU,EAAE;YACxB,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;gBAAE,SAAQ;YAE5B,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;gBAAE,UAAU,CAAC,CAAC,CAAC,GAAG,EAAE,CAAA;YAEtC,wBAAwB;YACxB,IAAI,
|
|
1
|
+
{"version":3,"file":"chartjs-plugin-data-binder.js","sourceRoot":"","sources":["../../src/plugins/chartjs-plugin-data-binder.ts"],"names":[],"mappings":"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","sourcesContent":["function convertObject(\n dataArray: string | SceneChart.DataSeries | Object,\n chartInstance: SceneChart\n): null | Object | SceneChart.DataSeries {\n if (!dataArray) {\n return null\n }\n\n if (typeof dataArray == 'string') {\n try {\n dataArray = JSON.parse(dataArray)\n } catch (e) {\n console.warn('invalid chart data format', e)\n return null\n }\n }\n\n if (!(dataArray instanceof Array)) {\n // is not Array\n if (dataArray instanceof Object) {\n return dataArray\n }\n return null\n }\n\n if (dataArray.length === 0) {\n return null\n }\n\n // modeling중 변수 기본값에 대한 처리\n if (dataArray[0].hasOwnProperty('__field1')) {\n dataArray = toObjectArrayValue(dataArray) as SceneChart.DataSeries\n }\n\n let label = chartInstance.data.labelDataKey\n let seriesKeys = []\n\n for (let i in chartInstance.data.datasets) {\n seriesKeys.push(chartInstance.data.datasets[Number(i)].dataKey)\n }\n\n let seriesData: SceneChart.DataSeries = []\n let labelData: SceneChart.DataSeries = []\n\n let convertedObject = {\n seriesData,\n labelData\n }\n\n for (let i in dataArray) {\n let currData: SceneChart.Data = (dataArray as SceneChart.DataSeries)[Number(i)]\n labelData.push(currData[label!])\n\n for (let i in seriesKeys) {\n if (!seriesKeys[i]) continue\n\n if (!seriesData[i]) seriesData[i] = []\n\n // 값이 NaN 경우엔 차트를 그리지 않음\n if (isNaN(currData[seriesKeys[i]])) {\n currData[seriesKeys[i]] = NaN\n }\n\n seriesData[i].push(currData[seriesKeys[i]])\n }\n }\n\n return convertedObject\n}\n\nfunction toObjectArrayValue(array: SceneChart.DataSeries): SceneChart.DataSeries | null {\n if (!array || array.length === 0) {\n return null\n }\n\n let indexKeyMap: SceneChart.Data = {}\n let value = []\n\n for (let key in array[0]) {\n indexKeyMap[key] = array[0][key]\n }\n\n for (var i = 1; i < array.length; i++) {\n let object: SceneChart.Data = {}\n let thisObject = array[i]\n\n for (let key in indexKeyMap) {\n let k = indexKeyMap[key]\n let v = thisObject[key]\n object[k] = v\n }\n\n value.push(object)\n }\n\n return value\n}\n\nfunction updateSeriesDatas(chartInstance: SceneChart) {\n if (!chartInstance.data.rawData) {\n return\n }\n\n let seriesData = chartInstance.data.rawData.seriesData\n\n if (!seriesData || seriesData.length === 0) seriesData = [null]\n\n for (let key in chartInstance.data.datasets) {\n chartInstance.data.datasets[Number(key)].data = seriesData[key] || []\n }\n}\n\nfunction updateLabelDatas(chartInstance: SceneChart) {\n let labelData = chartInstance.data.rawData.labelData\n chartInstance.config.data!.labels = labelData || []\n}\n\nexport default {\n id: 'data-binder',\n beforeUpdate: function (chartInstance: SceneChart) {\n if (!chartInstance.data) return\n\n if (!chartInstance.data.rawData) chartInstance.data.rawData = []\n\n chartInstance.data.rawData = convertObject(chartInstance.data.rawData, chartInstance) || {\n seriesData: [],\n labelData: []\n }\n\n let seriesData = chartInstance.data.rawData.seriesData\n updateLabelDatas(chartInstance)\n updateSeriesDatas(chartInstance)\n }\n}\n"]}
|
|
@@ -4,3 +4,9 @@
|
|
|
4
4
|
2022-11-12T23:19:26+09:00 info: Transaction DataSource established
|
|
5
5
|
2022-11-12T23:19:27+09:00 info: 🚀 Server ready at http://0.0.0.0:3000/graphql
|
|
6
6
|
2022-11-12T23:19:27+09:00 info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/graphql
|
|
7
|
+
2022-11-12T23:59:35+09:00 info: File Storage is Ready.
|
|
8
|
+
2022-11-12T23:59:35+09:00 error: oracledb module loading failed
|
|
9
|
+
2022-11-12T23:59:36+09:00 info: Default DataSource established
|
|
10
|
+
2022-11-12T23:59:36+09:00 info: Transaction DataSource established
|
|
11
|
+
2022-11-12T23:59:37+09:00 info: 🚀 Server ready at http://0.0.0.0:3000/graphql
|
|
12
|
+
2022-11-12T23:59:37+09:00 info: 🚀 Subscriptions ready at ws://0.0.0.0:3000/graphql
|
|
@@ -33,3 +33,38 @@
|
|
|
33
33
|
2022-11-12T23:19:27+09:00 info: All connector for 'mysql-connector' ready
|
|
34
34
|
2022-11-12T23:19:27+09:00 info: All connector for 'socket-server' ready
|
|
35
35
|
2022-11-12T23:19:27+09:00 info: ConnectionManager initialization done:
|
|
36
|
+
2022-11-12T23:59:37+09:00 info: Initializing ConnectionManager...
|
|
37
|
+
2022-11-12T23:59:37+09:00 info: Connector 'echo-back-server' started to ready
|
|
38
|
+
2022-11-12T23:59:37+09:00 info: Connector 'echo-back' started to ready
|
|
39
|
+
2022-11-12T23:59:37+09:00 info: Connector 'http-connector' started to ready
|
|
40
|
+
2022-11-12T23:59:37+09:00 info: Connector 'graphql-connector' started to ready
|
|
41
|
+
2022-11-12T23:59:37+09:00 info: Connector 'sqlite-connector' started to ready
|
|
42
|
+
2022-11-12T23:59:37+09:00 info: Connector 'postgresql-connector' started to ready
|
|
43
|
+
2022-11-12T23:59:37+09:00 info: Connector 'mqtt-connector' started to ready
|
|
44
|
+
2022-11-12T23:59:37+09:00 info: Connector 'mssql-connector' started to ready
|
|
45
|
+
2022-11-12T23:59:37+09:00 info: Connector 'oracle-connector' started to ready
|
|
46
|
+
2022-11-12T23:59:37+09:00 info: Connector 'mysql-connector' started to ready
|
|
47
|
+
2022-11-12T23:59:37+09:00 info: Connector 'socket-server' started to ready
|
|
48
|
+
2022-11-12T23:59:37+09:00 info: echo-back-servers are ready
|
|
49
|
+
2022-11-12T23:59:37+09:00 info: echo-back connections are ready
|
|
50
|
+
2022-11-12T23:59:37+09:00 info: http-connector connections are ready
|
|
51
|
+
2022-11-12T23:59:37+09:00 info: graphql-connector connections are ready
|
|
52
|
+
2022-11-12T23:59:37+09:00 info: sqlite-connector connections are ready
|
|
53
|
+
2022-11-12T23:59:37+09:00 info: postgresql-connector connections are ready
|
|
54
|
+
2022-11-12T23:59:37+09:00 info: mqtt-connector connections are ready
|
|
55
|
+
2022-11-12T23:59:37+09:00 info: mssql-connector connections are ready
|
|
56
|
+
2022-11-12T23:59:37+09:00 info: oracle-connector connections are ready
|
|
57
|
+
2022-11-12T23:59:37+09:00 info: mysql-connector connections are ready
|
|
58
|
+
2022-11-12T23:59:37+09:00 info: socket servers are ready
|
|
59
|
+
2022-11-12T23:59:37+09:00 info: All connector for 'echo-back-server' ready
|
|
60
|
+
2022-11-12T23:59:37+09:00 info: All connector for 'echo-back' ready
|
|
61
|
+
2022-11-12T23:59:37+09:00 info: All connector for 'http-connector' ready
|
|
62
|
+
2022-11-12T23:59:37+09:00 info: All connector for 'graphql-connector' ready
|
|
63
|
+
2022-11-12T23:59:37+09:00 info: All connector for 'sqlite-connector' ready
|
|
64
|
+
2022-11-12T23:59:37+09:00 info: All connector for 'postgresql-connector' ready
|
|
65
|
+
2022-11-12T23:59:37+09:00 info: All connector for 'mqtt-connector' ready
|
|
66
|
+
2022-11-12T23:59:37+09:00 info: All connector for 'mssql-connector' ready
|
|
67
|
+
2022-11-12T23:59:37+09:00 info: All connector for 'oracle-connector' ready
|
|
68
|
+
2022-11-12T23:59:37+09:00 info: All connector for 'mysql-connector' ready
|
|
69
|
+
2022-11-12T23:59:37+09:00 info: All connector for 'socket-server' ready
|
|
70
|
+
2022-11-12T23:59:37+09:00 info: ConnectionManager initialization done:
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
{
|
|
2
|
+
"keep": {
|
|
3
|
+
"days": true,
|
|
4
|
+
"amount": 14
|
|
5
|
+
},
|
|
6
|
+
"auditLog": "logs/system/.28d571833e9eaa9f4498fa345f6a5fdf86ab8b41-audit.json",
|
|
7
|
+
"files": [
|
|
8
|
+
{
|
|
9
|
+
"date": 1668265396906,
|
|
10
|
+
"name": "logs/system/scenario-PUBSUB-TEST-2022-11-13-00.log",
|
|
11
|
+
"hash": "3f453e0db41f6b7e98c78a7ccc284cd4db3b876d8948c96e13b7435beb8df355"
|
|
12
|
+
}
|
|
13
|
+
],
|
|
14
|
+
"hashType": "sha256"
|
|
15
|
+
}
|