aldehyde 0.1.86 → 0.2.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.
- package/LICENSE +2 -2
- package/README.md +2 -1
- package/lib/controls/action/index.d.ts +2 -2
- package/lib/controls/action/index.d.ts.map +1 -1
- package/lib/controls/action/index.js +6 -6
- package/lib/controls/action/index.js.map +1 -1
- package/lib/controls/chemstruc/graph.d.ts +2 -2
- package/lib/controls/chemstruc/graph.d.ts.map +1 -1
- package/lib/controls/chemstruc/graph.js +5 -5
- package/lib/controls/chemstruc/graph.js.map +1 -1
- package/lib/controls/chemstruc/index.css +28 -28
- package/lib/controls/color-picker/index.d.ts.map +1 -1
- package/lib/controls/color-picker/index.js +2 -3
- package/lib/controls/color-picker/index.js.map +1 -1
- package/lib/controls/cquery/cquick-button.js +2 -2
- package/lib/controls/cquery/cquick-button.js.map +1 -1
- package/lib/controls/date-picker/index.js +17 -17
- package/lib/controls/date-picker/index.js.map +1 -1
- package/lib/controls/entity-select/index.css +6 -6
- package/lib/controls/file-view/drawer-file-view.d.ts +2 -2
- package/lib/controls/file-view/drawer-file-view.d.ts.map +1 -1
- package/lib/controls/file-view/drawer-file-view.js +5 -5
- package/lib/controls/file-view/drawer-file-view.js.map +1 -1
- package/lib/controls/html-editor/tinymce.d.ts +0 -5
- package/lib/controls/html-editor/tinymce.d.ts.map +1 -1
- package/lib/controls/password-setter/index.d.ts +0 -1
- package/lib/controls/password-setter/index.d.ts.map +1 -1
- package/lib/controls/password-setter/index.js +1 -1
- package/lib/controls/password-setter/index.js.map +1 -1
- package/lib/controls/relation-existion/index.css +4 -4
- package/lib/controls/rfield/index.css +4 -4
- package/lib/controls/rfield/index.js +1 -1
- package/lib/controls/rfield/index.js.map +1 -1
- package/lib/controls/signature/index.d.ts +2 -2
- package/lib/controls/signature/index.d.ts.map +1 -1
- package/lib/controls/signature/index.js +5 -5
- package/lib/controls/signature/index.js.map +1 -1
- package/lib/controls/view-control.d.ts.map +1 -1
- package/lib/controls/view-control.js +2 -4
- package/lib/controls/view-control.js.map +1 -1
- package/lib/custom-page/def-custom-page.d.ts +0 -1
- package/lib/custom-page/def-custom-page.d.ts.map +1 -1
- package/lib/detail/edit/dtmpl-edit-page.d.ts +1 -1
- package/lib/detail/edit/dtmpl-edit-page.d.ts.map +1 -1
- package/lib/detail/edit/dtmpl-edit-page.js +8 -8
- package/lib/detail/edit/dtmpl-edit-page.js.map +1 -1
- package/lib/detail/edit/dtmpl-edit.js +1 -1
- package/lib/detail/edit/dtmpl-edit.js.map +1 -1
- package/lib/detail/edit/modal-row-edit.d.ts +1 -1
- package/lib/detail/edit/modal-row-edit.d.ts.map +1 -1
- package/lib/detail/edit/modal-row-edit.js +2 -2
- package/lib/detail/edit/modal-row-edit.js.map +1 -1
- package/lib/detail/edit/post-result/index.d.ts +1 -1
- package/lib/detail/edit/post-result/index.d.ts.map +1 -1
- package/lib/detail/edit/post-result/index.js +2 -2
- package/lib/detail/edit/post-result/index.js.map +1 -1
- package/lib/detail/edit/row-editor.d.ts +2 -2
- package/lib/detail/edit/row-editor.d.ts.map +1 -1
- package/lib/detail/edit/row-editor.js +6 -6
- package/lib/detail/edit/row-editor.js.map +1 -1
- package/lib/detail/view/act-dtmpl-view.d.ts +2 -2
- package/lib/detail/view/act-dtmpl-view.d.ts.map +1 -1
- package/lib/detail/view/act-dtmpl-view.js +5 -5
- package/lib/detail/view/act-dtmpl-view.js.map +1 -1
- package/lib/detail/view/dtmpl-view.d.ts +1 -1
- package/lib/detail/view/dtmpl-view.js +2 -2
- package/lib/detail/view/dtmpl-view.js.map +1 -1
- package/lib/detail/view/modal-dtmpl-view.d.ts +2 -1
- package/lib/detail/view/modal-dtmpl-view.d.ts.map +1 -1
- package/lib/detail/view/modal-dtmpl-view.js +3 -3
- package/lib/detail/view/modal-dtmpl-view.js.map +1 -1
- package/lib/detail/view/snapshot-timeline.d.ts +1 -1
- package/lib/detail/view/snapshot-timeline.d.ts.map +1 -1
- package/lib/detail/view/snapshot-timeline.js +5 -5
- package/lib/detail/view/snapshot-timeline.js.map +1 -1
- package/lib/form/criteria-form.d.ts +1 -1
- package/lib/form/criteria-form.d.ts.map +1 -1
- package/lib/form/criteria-form.js +4 -4
- package/lib/form/criteria-form.js.map +1 -1
- package/lib/form/form-Item-group.d.ts +0 -1
- package/lib/form/form-Item-group.d.ts.map +1 -1
- package/lib/form/form-Item-group.js +0 -1
- package/lib/form/form-Item-group.js.map +1 -1
- package/lib/import/excel-import.d.ts +3 -3
- package/lib/import/excel-import.d.ts.map +1 -1
- package/lib/import/excel-import.js +6 -6
- package/lib/import/excel-import.js.map +1 -1
- package/lib/import/template-builder.d.ts +0 -8
- package/lib/import/template-builder.d.ts.map +1 -1
- package/lib/import/template-builder.js +1 -1
- package/lib/import/template-builder.js.map +1 -1
- package/lib/layout/footer/index.d.ts +0 -1
- package/lib/layout/footer/index.d.ts.map +1 -1
- package/lib/layout/menu/l2menu-message-bar.d.ts +1 -1
- package/lib/layout/menu/l2menu-message-bar.d.ts.map +1 -1
- package/lib/layout/menu/l2menu-message-bar.js +1 -1
- package/lib/layout/menu/l2menu-message-bar.js.map +1 -1
- package/lib/layout/menu/l2menu-quick-bar.d.ts +1 -1
- package/lib/layout/menu/l2menu-quick-bar.d.ts.map +1 -1
- package/lib/layout/menu/l2menu-quick-bar.js +2 -2
- package/lib/layout/menu/l2menu-quick-bar.js.map +1 -1
- package/lib/layout/menu/reset-password.d.ts +1 -1
- package/lib/layout/menu/reset-password.d.ts.map +1 -1
- package/lib/layout/menu/reset-password.js +2 -2
- package/lib/layout/menu/reset-password.js.map +1 -1
- package/lib/layout/menu/userinfo-bar.js +1 -1
- package/lib/layout/menu/userinfo-bar.js.map +1 -1
- package/lib/login/login-context.d.ts +0 -11
- package/lib/login/login-context.d.ts.map +1 -1
- package/lib/login/login.d.ts +0 -10
- package/lib/login/login.d.ts.map +1 -1
- package/lib/module/dtmpl-view-page.js +1 -1
- package/lib/module/dtmpl-view-page.js.map +1 -1
- package/lib/module/ltmpl-page.js +3 -3
- package/lib/module/ltmpl-page.js.map +1 -1
- package/lib/table/act-table.d.ts.map +1 -1
- package/lib/table/act-table.js +1 -4
- package/lib/table/act-table.js.map +1 -1
- package/lib/table/modal-select-table.d.ts +1 -1
- package/lib/table/modal-select-table.d.ts.map +1 -1
- package/lib/table/modal-select-table.js +7 -7
- package/lib/table/modal-select-table.js.map +1 -1
- package/lib/table/relation-table.js +3 -3
- package/lib/table/relation-table.js.map +1 -1
- package/lib/table/select-table.js +1 -1
- package/lib/table/select-table.js.map +1 -1
- package/lib/table/stat/restat.d.ts +2 -2
- package/lib/table/stat/restat.d.ts.map +1 -1
- package/lib/table/stat/restat.js +5 -5
- package/lib/table/stat/restat.js.map +1 -1
- package/lib/tmpl/hcservice-v3.d.ts.map +1 -1
- package/lib/tmpl/hcservice-v3.js +4 -3
- package/lib/tmpl/hcservice-v3.js.map +1 -1
- package/lib/tmpl/superagent.js +2 -2
- package/lib/tmpl/superagent.js.map +1 -1
- package/lib/tmpl/tmpl-config-analysis.d.ts.map +1 -1
- package/lib/tmpl/tmpl-config-analysis.js +15 -14
- package/lib/tmpl/tmpl-config-analysis.js.map +1 -1
- package/lib/units/index.d.ts +1 -1
- package/lib/units/index.js +3 -3
- package/lib/units/index.js.map +1 -1
- package/lib/welcome/HCWelcome.d.ts +0 -4
- package/lib/welcome/HCWelcome.d.ts.map +1 -1
- package/lib/welcome/quick-entrance.d.ts +1 -1
- package/lib/welcome/quick-entrance.d.ts.map +1 -1
- package/lib/welcome/quick-entrance.js +1 -1
- package/lib/welcome/quick-entrance.js.map +1 -1
- package/lib/welcome/workbench.d.ts +1 -1
- package/lib/welcome/workbench.d.ts.map +1 -1
- package/lib/welcome/workbench.js +1 -1
- package/lib/welcome/workbench.js.map +1 -1
- package/package.json +31 -33
- package/src/aldehyde/controls/action/index.tsx +8 -8
- package/src/aldehyde/controls/chemstruc/graph.tsx +6 -6
- package/src/aldehyde/controls/chemstruc/index.css +28 -28
- package/src/aldehyde/controls/color-picker/index.tsx +2 -5
- package/src/aldehyde/controls/cquery/cquick-button.tsx +2 -2
- package/src/aldehyde/controls/date-picker/index.tsx +20 -20
- package/src/aldehyde/controls/entity-select/index.css +6 -6
- package/src/aldehyde/controls/file-view/drawer-file-view.tsx +7 -7
- package/src/aldehyde/controls/password-setter/index.js +1 -1
- package/src/aldehyde/controls/relation-existion/index.css +4 -4
- package/src/aldehyde/controls/rfield/index.css +4 -4
- package/src/aldehyde/controls/rfield/index.tsx +1 -1
- package/src/aldehyde/controls/signature/index.tsx +6 -6
- package/src/aldehyde/controls/view-control.tsx +3 -4
- package/src/aldehyde/detail/edit/dtmpl-edit-page.tsx +9 -9
- package/src/aldehyde/detail/edit/dtmpl-edit.tsx +1 -1
- package/src/aldehyde/detail/edit/modal-row-edit.tsx +3 -3
- package/src/aldehyde/detail/edit/post-result/index.tsx +3 -3
- package/src/aldehyde/detail/edit/row-editor.tsx +7 -7
- package/src/aldehyde/detail/view/act-dtmpl-view.tsx +6 -6
- package/src/aldehyde/detail/view/dtmpl-view.tsx +2 -2
- package/src/aldehyde/detail/view/modal-dtmpl-view.tsx +4 -3
- package/src/aldehyde/detail/view/snapshot-timeline.tsx +6 -6
- package/src/aldehyde/form/criteria-form.tsx +5 -5
- package/src/aldehyde/form/form-Item-group.tsx +0 -2
- package/src/aldehyde/import/excel-import.tsx +8 -9
- package/src/aldehyde/import/template-builder.js +1 -1
- package/src/aldehyde/layout/menu/l2menu-message-bar.tsx +1 -1
- package/src/aldehyde/layout/menu/l2menu-quick-bar.tsx +2 -2
- package/src/aldehyde/layout/menu/reset-password.tsx +2 -2
- package/src/aldehyde/layout/menu/userinfo-bar.tsx +1 -1
- package/src/aldehyde/module/criteria-page.tsx1 +2 -2
- package/src/aldehyde/module/dtmpl-view-page.tsx +1 -1
- package/src/aldehyde/module/ltmpl-page.tsx +3 -3
- package/src/aldehyde/table/act-table.tsx +8 -9
- package/src/aldehyde/table/modal-select-table.tsx +8 -8
- package/src/aldehyde/table/relation-table.tsx +4 -4
- package/src/aldehyde/table/select-table.tsx +1 -1
- package/src/aldehyde/table/stat/restat.tsx +6 -6
- package/src/aldehyde/tmpl/hcservice-v3.tsx +4 -3
- package/src/aldehyde/tmpl/superagent.js +2 -2
- package/src/aldehyde/tmpl/tmpl-config-analysis.tsx +15 -14
- package/src/aldehyde/units/index.tsx +3 -3
- package/src/aldehyde/welcome/quick-entrance.tsx +1 -1
- package/src/aldehyde/welcome/workbench.tsx +1 -1
- package/lib/chart/antd/Chart.d.ts +0 -10
- package/lib/chart/antd/Chart.d.ts.map +0 -1
- package/lib/chart/antd/Chart.js +0 -31
- package/lib/chart/antd/Chart.js.map +0 -1
- package/lib/chart/antd/Max2DimLineChart.d.ts +0 -15
- package/lib/chart/antd/Max2DimLineChart.d.ts.map +0 -1
- package/lib/chart/antd/Max2DimLineChart.js +0 -126
- package/lib/chart/antd/Max2DimLineChart.js.map +0 -1
- package/lib/chart/antd/chart-utils.d.ts +0 -7
- package/lib/chart/antd/chart-utils.d.ts.map +0 -1
- package/lib/chart/antd/chart-utils.js +0 -46
- package/lib/chart/antd/chart-utils.js.map +0 -1
- package/lib/chart/antd/column-chart-sub.d.ts +0 -7
- package/lib/chart/antd/column-chart-sub.d.ts.map +0 -1
- package/lib/chart/antd/column-chart-sub.js +0 -50
- package/lib/chart/antd/column-chart-sub.js.map +0 -1
- package/lib/chart/antd/line-chart-sub.d.ts +0 -7
- package/lib/chart/antd/line-chart-sub.d.ts.map +0 -1
- package/lib/chart/antd/line-chart-sub.js +0 -49
- package/lib/chart/antd/line-chart-sub.js.map +0 -1
- package/lib/chart/antd/pie-chart-sub.d.ts +0 -7
- package/lib/chart/antd/pie-chart-sub.d.ts.map +0 -1
- package/lib/chart/antd/pie-chart-sub.js +0 -37
- package/lib/chart/antd/pie-chart-sub.js.map +0 -1
- package/lib/chart/antd/statview-d2-chart.d.ts +0 -17
- package/lib/chart/antd/statview-d2-chart.d.ts.map +0 -1
- package/lib/chart/antd/statview-d2-chart.js +0 -108
- package/lib/chart/antd/statview-d2-chart.js.map +0 -1
- package/lib/chart/statview-l2-chart.d.ts +0 -23
- package/lib/chart/statview-l2-chart.d.ts.map +0 -1
- package/lib/chart/statview-l2-chart.js +0 -64
- package/lib/chart/statview-l2-chart.js.map +0 -1
- package/src/aldehyde/chart/antd/Chart.js +0 -31
- package/src/aldehyde/chart/antd/Max2DimLineChart.js +0 -127
- package/src/aldehyde/chart/antd/chart-utils.tsx +0 -50
- package/src/aldehyde/chart/antd/column-chart-sub.tsx +0 -77
- package/src/aldehyde/chart/antd/line-chart-sub.tsx +0 -75
- package/src/aldehyde/chart/antd/pie-chart-sub.tsx +0 -65
- package/src/aldehyde/chart/antd/statview-d2-chart.tsx +0 -125
- package/src/aldehyde/chart/statview-l2-chart.tsx +0 -69
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quick-entrance.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/quick-entrance.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAoC,SAAS,EAAC,MAAM,MAAM,CAAA;AAEjE,OAAO,
|
|
1
|
+
{"version":3,"file":"quick-entrance.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/quick-entrance.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAoC,SAAS,EAAC,MAAM,MAAM,CAAA;AAEjE,OAAO,qBAAqB,CAAC;AAG7B,OAAO,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAE7C,UAAU,kBAAmB,SAAQ,SAAS;CAC7C;AAED,UAAU,kBAAkB;IACxB,OAAO,EAAC,UAAU,EAAE,CAAA;CACvB;AAED,cAAM,aAAc,SAAQ,KAAK,CAAC,aAAa,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACnF,KAAK;;MAEJ;IACD,SAAS,EAAC,GAAG,EAAE,CAAI;IACb,iBAAiB;IAoBvB,oBAAoB,IAAI,IAAI;IAU5B,MAAM;CAwBT;AAED,eAAe,aAAa,CAAA"}
|
|
@@ -21,7 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
21
21
|
import React from 'react';
|
|
22
22
|
import { Badge, Button, Card, Space } from 'antd';
|
|
23
23
|
import { CodeTwoTone } from '@ant-design/icons';
|
|
24
|
-
import 'antd/dist/
|
|
24
|
+
import 'antd/dist/reset.css';
|
|
25
25
|
import HcserviceV3 from "../tmpl/hcservice-v3";
|
|
26
26
|
import HCDataSource from '../tmpl/hc-data-source';
|
|
27
27
|
class QuickEntrance extends React.PureComponent {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quick-entrance.js","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/quick-entrance.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAU,KAAK,EAAW,MAAM,MAAM,CAAA;AACjE,OAAO,EAAC,WAAW,EAAC,MAAM,mBAAmB,CAAC;AAC9C,OAAO,
|
|
1
|
+
{"version":3,"file":"quick-entrance.js","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/quick-entrance.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workbench.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/workbench.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAgC,SAAS,EAAC,MAAM,MAAM,CAAA;AAE7D,OAAO,
|
|
1
|
+
{"version":3,"file":"workbench.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/workbench.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAgC,SAAS,EAAC,MAAM,MAAM,CAAA;AAE7D,OAAO,qBAAqB,CAAC;AAG7B,OAAO,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAE7C,UAAU,cAAe,SAAQ,SAAS;CACzC;AAED,UAAU,cAAc;IACpB,OAAO,EAAE,UAAU,EAAE,CAAA;CACxB;AAED,cAAM,SAAU,SAAQ,KAAK,CAAC,aAAa,CAAC,cAAc,EAAE,cAAc,CAAC;IACvE,KAAK;;MAEJ;IACD,SAAS,EAAE,GAAG,EAAE,CAAM;IAEhB,iBAAiB;IAkBvB,oBAAoB,IAAI,IAAI;IAU5B,MAAM;CAwBT;AAED,eAAe,SAAS,CAAA"}
|
package/lib/welcome/workbench.js
CHANGED
|
@@ -21,7 +21,7 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
21
21
|
import React from 'react';
|
|
22
22
|
import { Button, Card, Space, Statistic } from 'antd';
|
|
23
23
|
import { RocketTwoTone } from '@ant-design/icons';
|
|
24
|
-
import 'antd/dist/
|
|
24
|
+
import 'antd/dist/reset.css';
|
|
25
25
|
import HcserviceV3 from "../tmpl/hcservice-v3";
|
|
26
26
|
import HCDataSource from '../tmpl/hc-data-source';
|
|
27
27
|
class Workbench extends React.PureComponent {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workbench.js","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/workbench.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAW,MAAM,MAAM,CAAA;AAC7D,OAAO,EAA+D,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC/G,OAAO,
|
|
1
|
+
{"version":3,"file":"workbench.js","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/workbench.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "aldehyde",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.2.2",
|
|
4
4
|
"author": "cosmicparticle",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "src/aldehyde/index.txs",
|
|
@@ -21,14 +21,12 @@
|
|
|
21
21
|
},
|
|
22
22
|
"homepage": "./",
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@ant-design/charts": "^1.3.5",
|
|
25
24
|
"@ant-design/icons": "^4.6.2",
|
|
26
|
-
"@antv/g6": "^4.6.18",
|
|
27
25
|
"@codemirror/lang-sql": "^6.3.3",
|
|
28
26
|
"@codemirror/state": "^6.1.4",
|
|
29
27
|
"@tinymce/tinymce-react": "^3.12.2",
|
|
30
28
|
"add": "^2.0.6",
|
|
31
|
-
"antd": "^
|
|
29
|
+
"antd": "^5.2.2",
|
|
32
30
|
"array-move": "^4.0.0",
|
|
33
31
|
"axios": "^0.18.0",
|
|
34
32
|
"bfj": "^6.1.1",
|
|
@@ -55,7 +53,7 @@
|
|
|
55
53
|
"identity-obj-proxy": "^3.0.0",
|
|
56
54
|
"immutability-helper": "^3.0.0",
|
|
57
55
|
"jquery": "^3.1.1",
|
|
58
|
-
"jsencrypt": "^3.
|
|
56
|
+
"jsencrypt": "^3.3.1",
|
|
59
57
|
"jsonp": "^0.2.1",
|
|
60
58
|
"jsonschema": "^1.4.0",
|
|
61
59
|
"ketcher-react": "2.7.2",
|
|
@@ -64,11 +62,31 @@
|
|
|
64
62
|
"loadable-components": "^2.2.3",
|
|
65
63
|
"lodash": "^4.17.21",
|
|
66
64
|
"miew": "^0.9.0",
|
|
67
|
-
"moment": "^2.22.2",
|
|
68
65
|
"picomatch": "^2.3.1",
|
|
69
66
|
"process": "^0.11.10",
|
|
70
67
|
"prop-types": "^15.8.1",
|
|
68
|
+
"react": "^18.2.0",
|
|
69
|
+
"react-app-polyfill": "^0.1.3",
|
|
70
|
+
"react-color": "^2.19.3",
|
|
71
|
+
"react-copy-to-clipboard": "^5.0.1",
|
|
72
|
+
"react-custom-scrollbars": "^4.2.1",
|
|
73
|
+
"react-dev-utils": "^6.1.1",
|
|
74
|
+
"react-dnd": "^16.0.1",
|
|
75
|
+
"react-dnd-html5-backend": "^16.0.1",
|
|
76
|
+
"react-document-title": "^2.0.3",
|
|
77
|
+
"react-dom": "^18.2.0",
|
|
78
|
+
"react-draft-wysiwyg": "^1.14.7",
|
|
79
|
+
"react-error-overlay": "^6.0.10",
|
|
80
|
+
"react-file-viewer": "^1.2.1",
|
|
81
|
+
"react-highlight-words": "^0.16.0",
|
|
82
|
+
"react-load-script": "^0.0.6",
|
|
83
|
+
"react-loadable": "^5.5.0",
|
|
71
84
|
"react-markdown": "^8.0.4",
|
|
85
|
+
"react-router-dom": "^4.3.1",
|
|
86
|
+
"react-signature-canvas": "^1.0.5",
|
|
87
|
+
"react-sortable-hoc": "^2.0.0",
|
|
88
|
+
"react-transition-group": "^4.4.2",
|
|
89
|
+
"react-virtualized": "^9.22.3",
|
|
72
90
|
"reconnecting-websocket": "^4.4.0",
|
|
73
91
|
"redux": "^4.0.1",
|
|
74
92
|
"redux-devtools-extension": "^2.13.5",
|
|
@@ -79,15 +97,11 @@
|
|
|
79
97
|
"superagent": "^4.0.0",
|
|
80
98
|
"superagent-jsonp": "^0.2.1",
|
|
81
99
|
"three": "^0.134.0",
|
|
82
|
-
"typescript": "^4.5.4",
|
|
83
100
|
"url": "^0.11.0",
|
|
84
101
|
"url-loader": "^4.1.1",
|
|
85
102
|
"use-resize-observer": "^7.0.0",
|
|
86
103
|
"validate": "^5.2.0",
|
|
87
|
-
"
|
|
88
|
-
"webpack-node-externals": "^3.0.0",
|
|
89
|
-
"yargs": "^13.2.4",
|
|
90
|
-
"yarn": "^1.22.17"
|
|
104
|
+
"yargs": "^13.2.4"
|
|
91
105
|
},
|
|
92
106
|
"engines": {
|
|
93
107
|
"node": ">=14"
|
|
@@ -162,39 +176,23 @@
|
|
|
162
176
|
"pnp-webpack-plugin": "^1.7.0",
|
|
163
177
|
"postcss-loader": "^6.2.1",
|
|
164
178
|
"postcss-scss": "^3.0.5",
|
|
165
|
-
"react": "^17.0.2",
|
|
166
|
-
"react-app-polyfill": "^0.1.3",
|
|
167
|
-
"react-color": "^2.19.3",
|
|
168
|
-
"react-copy-to-clipboard": "^5.0.1",
|
|
169
|
-
"react-custom-scrollbars": "^4.2.1",
|
|
170
|
-
"react-dev-utils": "^6.1.1",
|
|
171
|
-
"react-dnd": "^7.4.5",
|
|
172
|
-
"react-dnd-html5-backend": "^7.4.4",
|
|
173
|
-
"react-document-title": "^2.0.3",
|
|
174
|
-
"react-dom": "17.0.0",
|
|
175
|
-
"react-draft-wysiwyg": "^1.14.7",
|
|
176
|
-
"react-error-overlay": "^6.0.10",
|
|
177
|
-
"react-file-viewer": "^1.2.1",
|
|
178
|
-
"react-highlight-words": "^0.16.0",
|
|
179
|
-
"react-load-script": "^0.0.6",
|
|
180
|
-
"react-loadable": "^5.5.0",
|
|
181
|
-
"react-router-dom": "^4.3.1",
|
|
182
|
-
"react-signature-canvas": "^1.0.5",
|
|
183
|
-
"react-sortable-hoc": "^2.0.0",
|
|
184
|
-
"react-transition-group": "^4.4.2",
|
|
185
|
-
"react-virtualized": "^9.22.3",
|
|
186
179
|
"rimraf": "^3.0.2",
|
|
187
180
|
"style-loader": "^3.3.1",
|
|
188
181
|
"ts-loader": "^9.2.6",
|
|
182
|
+
"typescript": "4.5.4",
|
|
189
183
|
"webpack": "^5.75.0",
|
|
184
|
+
"webpack-bundle-analyzer": "^4.5.0",
|
|
190
185
|
"webpack-cli": "^4.9.1",
|
|
191
186
|
"webpack-dev-middleware": "^5.3.0",
|
|
192
187
|
"webpack-dev-server": "^4.7.3",
|
|
193
188
|
"webpack-manifest-plugin": "^4.0.2",
|
|
194
189
|
"webpack-merge": "^5.8.0",
|
|
195
|
-
"
|
|
190
|
+
"webpack-node-externals": "^3.0.0",
|
|
191
|
+
"workbox-webpack-plugin": "^6.4.2",
|
|
192
|
+
"yarn": "^1.22.17"
|
|
196
193
|
},
|
|
197
194
|
"peerDependencies": {
|
|
195
|
+
"antd": ">=5.0.0",
|
|
198
196
|
"react": ">=17.0.0",
|
|
199
197
|
"react-dom": ">=17.0.0"
|
|
200
198
|
}
|
|
@@ -4,11 +4,11 @@ import {Button, Checkbox as AntdCheckbox, Popconfirm, Popover,Tooltip} from 'ant
|
|
|
4
4
|
import './index.css'
|
|
5
5
|
import {ActionConfig, Comparator, DtmplData} from "../../tmpl/interface";
|
|
6
6
|
import {FormInstance} from "antd/lib/form/hooks/useForm";
|
|
7
|
-
import {ButtonType} from "antd/lib/button/button";
|
|
8
7
|
import FieldsEditCard from "../../detail/edit/fields-edit-card"
|
|
9
8
|
import {SizeType} from "antd/lib/config-provider/SizeContext";
|
|
10
9
|
import ActionUtils from './utils';
|
|
11
10
|
import Icon from '../../icon';
|
|
11
|
+
import {ButtonType} from "antd/lib/button";
|
|
12
12
|
|
|
13
13
|
const CheckboxGroup = AntdCheckbox.Group;
|
|
14
14
|
export type ActionButtonIconType = 'icon' | 'icon-title' | 'title'
|
|
@@ -29,7 +29,7 @@ interface ActionProps {
|
|
|
29
29
|
};
|
|
30
30
|
|
|
31
31
|
interface ActionState {
|
|
32
|
-
|
|
32
|
+
popoverOpen: boolean,
|
|
33
33
|
|
|
34
34
|
};
|
|
35
35
|
|
|
@@ -43,7 +43,7 @@ export default class Action extends React.PureComponent<ActionProps, ActionState
|
|
|
43
43
|
}
|
|
44
44
|
|
|
45
45
|
state = {
|
|
46
|
-
|
|
46
|
+
popoverOpen: false,
|
|
47
47
|
}
|
|
48
48
|
|
|
49
49
|
componentDidMount() {
|
|
@@ -105,13 +105,13 @@ export default class Action extends React.PureComponent<ActionProps, ActionState
|
|
|
105
105
|
console.log('action form value:', value);
|
|
106
106
|
const {actionConfig, doAction, data, disabled, buttonType} = this.props;
|
|
107
107
|
this.setState({
|
|
108
|
-
|
|
108
|
+
popoverOpen: false,
|
|
109
109
|
})
|
|
110
110
|
doAction(actionConfig.id, this.getCodes(), value);
|
|
111
111
|
}
|
|
112
112
|
onCancel = () => {
|
|
113
113
|
this.setState({
|
|
114
|
-
|
|
114
|
+
popoverOpen: false,
|
|
115
115
|
})
|
|
116
116
|
}
|
|
117
117
|
onValuesChange = (value: object) => {
|
|
@@ -136,7 +136,7 @@ export default class Action extends React.PureComponent<ActionProps, ActionState
|
|
|
136
136
|
|
|
137
137
|
|
|
138
138
|
formButton = () => {
|
|
139
|
-
const {
|
|
139
|
+
const {popoverOpen} = this.state;
|
|
140
140
|
const {actionConfig, doAction, data, disabled, buttonType,hiddenType, buttonSize} = this.props;
|
|
141
141
|
let disabled_ = disabled;
|
|
142
142
|
if (!this.isShow()) {
|
|
@@ -146,12 +146,12 @@ export default class Action extends React.PureComponent<ActionProps, ActionState
|
|
|
146
146
|
disabled_ = true;
|
|
147
147
|
}
|
|
148
148
|
}
|
|
149
|
-
return <Popover placement="leftBottom"
|
|
149
|
+
return <Popover placement="leftBottom" open={popoverOpen} trigger="click" content={
|
|
150
150
|
<FieldsEditCard okDanger={actionConfig.beforeExeConfirm == 'danger'} needConfirm={true} title={actionConfig.title} onCancel={() => this.onCancel()} fields={actionConfig.writes}
|
|
151
151
|
value={this.getValue()} onOk={this.onOk}
|
|
152
152
|
onValuesChange={this.onValuesChange}/>}>
|
|
153
153
|
<Button danger={actionConfig.beforeExeConfirm == 'danger'} type={this.getButtonType()} block={this.blockButton()} size={buttonSize}
|
|
154
|
-
onClick={() => this.setState({
|
|
154
|
+
onClick={() => this.setState({popoverOpen: !popoverOpen})}
|
|
155
155
|
disabled={disabled_} >{this.getTitle()}</Button>
|
|
156
156
|
</Popover>
|
|
157
157
|
}
|
|
@@ -15,7 +15,7 @@ interface ChemStrucProps extends VEControlProps {
|
|
|
15
15
|
}
|
|
16
16
|
|
|
17
17
|
interface ChemStrucState {
|
|
18
|
-
|
|
18
|
+
modalOpen: boolean,
|
|
19
19
|
molFileLoaded: boolean,
|
|
20
20
|
}
|
|
21
21
|
|
|
@@ -26,7 +26,7 @@ export default class ChemStruc extends React.PureComponent<ChemStrucProps, ChemS
|
|
|
26
26
|
}
|
|
27
27
|
|
|
28
28
|
state = {
|
|
29
|
-
|
|
29
|
+
modalOpen: false,
|
|
30
30
|
molFileLoaded: false,
|
|
31
31
|
}
|
|
32
32
|
|
|
@@ -75,7 +75,7 @@ export default class ChemStruc extends React.PureComponent<ChemStrucProps, ChemS
|
|
|
75
75
|
//console.log('ket value:', value);
|
|
76
76
|
this.triggerChange(value);
|
|
77
77
|
this.setState({
|
|
78
|
-
|
|
78
|
+
modalOpen: false,
|
|
79
79
|
})
|
|
80
80
|
}
|
|
81
81
|
|
|
@@ -90,12 +90,12 @@ export default class ChemStruc extends React.PureComponent<ChemStrucProps, ChemS
|
|
|
90
90
|
showView = async () => {
|
|
91
91
|
await this.loadData();
|
|
92
92
|
this.setState({
|
|
93
|
-
|
|
93
|
+
modalOpen: true
|
|
94
94
|
})
|
|
95
95
|
}
|
|
96
96
|
onCancel = () => {
|
|
97
97
|
this.setState({
|
|
98
|
-
|
|
98
|
+
modalOpen: false,
|
|
99
99
|
})
|
|
100
100
|
}
|
|
101
101
|
|
|
@@ -111,7 +111,7 @@ export default class ChemStruc extends React.PureComponent<ChemStrucProps, ChemS
|
|
|
111
111
|
</Button>
|
|
112
112
|
<Modal
|
|
113
113
|
closable={false}
|
|
114
|
-
|
|
114
|
+
open={this.state.modalOpen}
|
|
115
115
|
forceRender={true}
|
|
116
116
|
centered
|
|
117
117
|
style={{maxWidth: 'calc(100vw - 62px)', maxHeight: 'calc(100vw - 50px)'}}
|
|
@@ -1,28 +1,28 @@
|
|
|
1
|
-
body {
|
|
2
|
-
margin: 0;
|
|
3
|
-
padding: 0;
|
|
4
|
-
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
|
|
5
|
-
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
|
|
6
|
-
sans-serif;
|
|
7
|
-
-webkit-font-smoothing: antialiased;
|
|
8
|
-
-moz-osx-font-smoothing: grayscale;
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
.chemstruc-edit-upload{
|
|
12
|
-
width: 230px;
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
.ant-upload-list-picture-card-container,
|
|
16
|
-
.ant-upload-select-picture-card{
|
|
17
|
-
width: 66px!important;
|
|
18
|
-
height:66px!important;
|
|
19
|
-
}
|
|
20
|
-
/*控制ketcher的选择工具栏的显示层级,modal为1000,所以此处为1020*/
|
|
21
|
-
.ToolbarMultiToolItem-module_portal__yDg5_{
|
|
22
|
-
z-index: 1020!important;
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
code {
|
|
26
|
-
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
|
|
27
|
-
monospace;
|
|
28
|
-
}
|
|
1
|
+
body {
|
|
2
|
+
margin: 0;
|
|
3
|
+
padding: 0;
|
|
4
|
+
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
|
|
5
|
+
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
|
|
6
|
+
sans-serif;
|
|
7
|
+
-webkit-font-smoothing: antialiased;
|
|
8
|
+
-moz-osx-font-smoothing: grayscale;
|
|
9
|
+
}
|
|
10
|
+
|
|
11
|
+
.chemstruc-edit-upload{
|
|
12
|
+
width: 230px;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
.ant-upload-list-picture-card-container,
|
|
16
|
+
.ant-upload-select-picture-card{
|
|
17
|
+
width: 66px!important;
|
|
18
|
+
height:66px!important;
|
|
19
|
+
}
|
|
20
|
+
/*控制ketcher的选择工具栏的显示层级,modal为1000,所以此处为1020*/
|
|
21
|
+
.ToolbarMultiToolItem-module_portal__yDg5_{
|
|
22
|
+
z-index: 1020!important;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
code {
|
|
26
|
+
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
|
|
27
|
+
monospace;
|
|
28
|
+
}
|
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
|
-
import {
|
|
2
|
+
import { Button, Card, Popover, Space} from "antd";
|
|
3
3
|
import {CloseOutlined,CloseCircleOutlined} from '@ant-design/icons'
|
|
4
4
|
import {VEControlProps} from "../../tmpl/interface";
|
|
5
5
|
import './index.css'
|
|
6
|
-
import FormItemGroup from "../../form/form-Item-group";
|
|
7
6
|
import Swatches from 'react-color'
|
|
8
7
|
|
|
9
|
-
const {TextArea} = Input;
|
|
10
|
-
|
|
11
8
|
interface PickerProps extends VEControlProps {
|
|
12
9
|
|
|
13
10
|
}
|
|
@@ -52,7 +49,7 @@ export default class CollapseCard extends React.PureComponent<PickerProps, Picke
|
|
|
52
49
|
const {value,viewOrEdit, ...other } = this.props;
|
|
53
50
|
|
|
54
51
|
return (viewOrEdit=='view'? <div className={ 'color' } style={{background:value}}>{value}</div> :
|
|
55
|
-
<Popover
|
|
52
|
+
<Popover open={displayColorPicker}
|
|
56
53
|
content={
|
|
57
54
|
<Card
|
|
58
55
|
style={{width: 320}}
|
|
@@ -65,7 +65,7 @@ class CquickButton extends React.PureComponent<CquickButtonProps, CquickButtonSt
|
|
|
65
65
|
}}>{outlinedMap[cQueryConfig.title]?outlinedMap[cQueryConfig.title]:cQueryConfig.title}</Button>}
|
|
66
66
|
{!showDraw?null:
|
|
67
67
|
cQueryConfig.type=='edit'?
|
|
68
|
-
<DtmplEditPage pageType={pageType}
|
|
68
|
+
<DtmplEditPage pageType={pageType} open={showDraw} onCancel={()=>{
|
|
69
69
|
this.setState({
|
|
70
70
|
showDraw:false,
|
|
71
71
|
})}}
|
|
@@ -79,7 +79,7 @@ class CquickButton extends React.PureComponent<CquickButtonProps, CquickButtonSt
|
|
|
79
79
|
closable={true}
|
|
80
80
|
mask={false}
|
|
81
81
|
onClose={this.closeDrawer}
|
|
82
|
-
|
|
82
|
+
open={showDraw}
|
|
83
83
|
width={'calc(100% - 280px)'}
|
|
84
84
|
style={{
|
|
85
85
|
maxWidth: 1960,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
2
|
import {DatePicker as AntdDatePicker,TimePicker} from "antd";
|
|
3
|
-
import
|
|
4
|
-
import type {
|
|
3
|
+
import dayjs from "dayjs";
|
|
4
|
+
import type { Dayjs } from "dayjs";
|
|
5
5
|
import {FieldConfig,EControlProps} from "../../tmpl/interface";
|
|
6
6
|
import Units from "../../units";
|
|
7
7
|
import type { RangePickerProps } from 'antd/es/date-picker';
|
|
@@ -18,15 +18,15 @@ const DatePicker: React.FC<DataPickerProps> = (props) => {
|
|
|
18
18
|
|
|
19
19
|
const {id,value:propsValue, itemType, fieldConfig, onChange,style,min,max} = props;
|
|
20
20
|
let value=propsValue;
|
|
21
|
-
let format = Units.
|
|
21
|
+
let format = Units.getDayjsFormat(itemType);
|
|
22
22
|
|
|
23
|
-
const changeValue = (value:
|
|
23
|
+
const changeValue = (value:Dayjs) => {
|
|
24
24
|
if (onChange) {
|
|
25
25
|
onChange(value?value.format(format):undefined);
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
|
|
29
|
-
const changeRangeValue = (value:
|
|
29
|
+
const changeRangeValue = (value:Dayjs[]) => {
|
|
30
30
|
if (onChange) {
|
|
31
31
|
if(!value){
|
|
32
32
|
onChange(value);
|
|
@@ -37,18 +37,18 @@ const DatePicker: React.FC<DataPickerProps> = (props) => {
|
|
|
37
37
|
}
|
|
38
38
|
|
|
39
39
|
const disabledDate: RangePickerProps['disabledDate'] = current => {
|
|
40
|
-
// console.log('current',
|
|
41
|
-
return current && ( (max &&
|
|
40
|
+
// console.log('current',dayjs(min,format).format(format));
|
|
41
|
+
return current && ( (max && dayjs(current.format(format),format) > dayjs(max,format)) || (min && dayjs(current.format(format),format) <dayjs(min,format)));
|
|
42
42
|
};
|
|
43
43
|
|
|
44
44
|
let entryControl = undefined;
|
|
45
45
|
let picker:"date" | "time" | "year" | "month" | "week" | "quarter"="date";
|
|
46
|
-
let
|
|
46
|
+
let dayjsValue;
|
|
47
47
|
switch (itemType) {
|
|
48
48
|
case 'date-YY':
|
|
49
49
|
case 'date-M1':
|
|
50
50
|
case 'date':
|
|
51
|
-
|
|
51
|
+
dayjsValue = value ? dayjs(value, format) : undefined;
|
|
52
52
|
picker = itemType == 'date-YY' ? 'year' : itemType == 'date-M1' ? "month" : "date"
|
|
53
53
|
// @ts-ignore
|
|
54
54
|
entryControl = <AntdDatePicker
|
|
@@ -57,7 +57,7 @@ const DatePicker: React.FC<DataPickerProps> = (props) => {
|
|
|
57
57
|
picker={picker}
|
|
58
58
|
format={format}
|
|
59
59
|
disabledDate={disabledDate}
|
|
60
|
-
value={
|
|
60
|
+
value={dayjsValue}
|
|
61
61
|
disabled={fieldConfig.disabled}
|
|
62
62
|
onChange={changeValue}
|
|
63
63
|
/>;
|
|
@@ -65,7 +65,7 @@ const DatePicker: React.FC<DataPickerProps> = (props) => {
|
|
|
65
65
|
case 'datetime-HH':
|
|
66
66
|
case 'datetime-mm':
|
|
67
67
|
case 'datetime':
|
|
68
|
-
|
|
68
|
+
dayjsValue = value ? dayjs(value, format) : undefined;
|
|
69
69
|
entryControl = <AntdDatePicker
|
|
70
70
|
id={id}
|
|
71
71
|
style={{...style}}
|
|
@@ -73,7 +73,7 @@ const DatePicker: React.FC<DataPickerProps> = (props) => {
|
|
|
73
73
|
showTime={{format: Units.getDateTimeFormat(itemType)}}
|
|
74
74
|
picker='date'
|
|
75
75
|
format={format}
|
|
76
|
-
value={
|
|
76
|
+
value={dayjsValue}
|
|
77
77
|
disabled={fieldConfig.disabled}
|
|
78
78
|
onChange={changeValue}
|
|
79
79
|
/>;
|
|
@@ -83,14 +83,14 @@ const DatePicker: React.FC<DataPickerProps> = (props) => {
|
|
|
83
83
|
case 'daterange':
|
|
84
84
|
let v1 = value && value.indexOf("~") > 0 ? value.split("~")[0] : undefined
|
|
85
85
|
let v2 = value && value.indexOf("~") > 0 ? value.split("~")[1] : undefined
|
|
86
|
-
|
|
86
|
+
dayjsValue = [v1 ? dayjs(v1, format) : undefined, v2 ? dayjs(v2, format) : undefined];
|
|
87
87
|
picker = itemType == 'daterange-YY' ? 'year' : itemType == 'daterange-M1' ? "month" : "date"
|
|
88
88
|
// @ts-ignore
|
|
89
89
|
entryControl = <RangePicker id={id} picker={picker}
|
|
90
90
|
style={{...style}}
|
|
91
91
|
format={format}
|
|
92
92
|
disabledDate={disabledDate}
|
|
93
|
-
value={
|
|
93
|
+
value={dayjsValue}
|
|
94
94
|
disabled={fieldConfig.disabled}
|
|
95
95
|
onChange={changeRangeValue}/>;
|
|
96
96
|
break;
|
|
@@ -99,11 +99,11 @@ const DatePicker: React.FC<DataPickerProps> = (props) => {
|
|
|
99
99
|
case 'datetimerange':
|
|
100
100
|
const v3 = value && value.indexOf("~") > 0 ? value.split("~")[0] : undefined
|
|
101
101
|
const v4 = value && value.indexOf("~") > 0 ? value.split("~")[1] : undefined
|
|
102
|
-
|
|
102
|
+
dayjsValue = [v3 ? dayjs(v3, format) : undefined, v4 ? dayjs(v4, format) : undefined];
|
|
103
103
|
entryControl = <RangePicker id={id} showTime={{format: Units.getDateTimeFormat(itemType)}}
|
|
104
104
|
format={format}
|
|
105
105
|
style={{...style}}
|
|
106
|
-
value={
|
|
106
|
+
value={dayjsValue}
|
|
107
107
|
disabledDate={disabledDate}
|
|
108
108
|
disabled={fieldConfig.disabled}
|
|
109
109
|
onChange={changeRangeValue}/>;
|
|
@@ -111,9 +111,9 @@ const DatePicker: React.FC<DataPickerProps> = (props) => {
|
|
|
111
111
|
case 'time-HH':
|
|
112
112
|
case 'time-mm':
|
|
113
113
|
case 'time':
|
|
114
|
-
|
|
114
|
+
dayjsValue = value ? dayjs(value, format) : undefined;
|
|
115
115
|
entryControl =
|
|
116
|
-
<TimePicker id={id} value={
|
|
116
|
+
<TimePicker id={id} value={dayjsValue}
|
|
117
117
|
style={{...style}}
|
|
118
118
|
disabled={fieldConfig.disabled} onChange={changeValue}
|
|
119
119
|
format={format}/>;
|
|
@@ -123,8 +123,8 @@ const DatePicker: React.FC<DataPickerProps> = (props) => {
|
|
|
123
123
|
case 'timerange':
|
|
124
124
|
const v5 = value && value.indexOf("~") > 0 ? value.split("~")[0] : undefined
|
|
125
125
|
const v6 = value && value.indexOf("~") > 0 ? value.split("~")[1] : undefined
|
|
126
|
-
|
|
127
|
-
entryControl = <TimePicker.RangePicker id={id} value={
|
|
126
|
+
dayjsValue = [v5 ? dayjs(v5, format) : undefined, v6 ? dayjs(v6, format) : undefined];
|
|
127
|
+
entryControl = <TimePicker.RangePicker id={id} value={dayjsValue}
|
|
128
128
|
style={{...style}}
|
|
129
129
|
disabled={fieldConfig.disabled}
|
|
130
130
|
onChange={changeRangeValue} format={format}/>;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
.entity-select-popover{
|
|
2
|
-
/*padding: 4px;*/
|
|
3
|
-
}
|
|
4
|
-
.entity-select-popover .ant-popover-inner-content {
|
|
5
|
-
padding: 4px;
|
|
6
|
-
}
|
|
1
|
+
.entity-select-popover{
|
|
2
|
+
/*padding: 4px;*/
|
|
3
|
+
}
|
|
4
|
+
.entity-select-popover .ant-popover-inner-content {
|
|
5
|
+
padding: 4px;
|
|
6
|
+
}
|
|
@@ -17,7 +17,7 @@ interface DrawerFileViewProps {
|
|
|
17
17
|
};
|
|
18
18
|
|
|
19
19
|
interface DrawerFileViewState {
|
|
20
|
-
|
|
20
|
+
drawerOpen: boolean,
|
|
21
21
|
|
|
22
22
|
};
|
|
23
23
|
export default class DrawerFileView extends React.PureComponent<DrawerFileViewProps, DrawerFileViewState> {
|
|
@@ -25,7 +25,7 @@ export default class DrawerFileView extends React.PureComponent<DrawerFileViewPr
|
|
|
25
25
|
downloadAble:false,
|
|
26
26
|
}
|
|
27
27
|
state = {
|
|
28
|
-
|
|
28
|
+
drawerOpen: false
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
onError(e) {
|
|
@@ -33,26 +33,26 @@ export default class DrawerFileView extends React.PureComponent<DrawerFileViewPr
|
|
|
33
33
|
}
|
|
34
34
|
|
|
35
35
|
onClose = () => {
|
|
36
|
-
this.setState({
|
|
36
|
+
this.setState({drawerOpen: false})
|
|
37
37
|
}
|
|
38
38
|
|
|
39
39
|
render() {
|
|
40
40
|
const {file,downloadAble} = this.props;
|
|
41
|
-
const {
|
|
41
|
+
const {drawerOpen} = this.state;
|
|
42
42
|
return <span className='labelcss'>
|
|
43
43
|
<Button type={'link'} onClick={() => {
|
|
44
|
-
this.setState({
|
|
44
|
+
this.setState({drawerOpen: true})
|
|
45
45
|
}} size="small">{file.base.fileName}</Button>
|
|
46
46
|
{downloadAble? <Button type={'text'} onClick={async () => {
|
|
47
47
|
await HCService.download(file.base.path);
|
|
48
48
|
}} size="small"><DownloadOutlined/></Button>:null}
|
|
49
|
-
{
|
|
49
|
+
{drawerOpen ? <Drawer
|
|
50
50
|
title={file.base.fileName}
|
|
51
51
|
placement={'left'}
|
|
52
52
|
closable={false}
|
|
53
53
|
onClose={this.onClose}
|
|
54
54
|
width={'1200px'}
|
|
55
|
-
|
|
55
|
+
open={drawerOpen}
|
|
56
56
|
extra={
|
|
57
57
|
<Space>
|
|
58
58
|
{downloadAble? <Button onClick={async () => {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
.ant-popover-inner-content {
|
|
3
|
-
padding: 4px;
|
|
4
|
-
}
|
|
1
|
+
|
|
2
|
+
.ant-popover-inner-content {
|
|
3
|
+
padding: 4px;
|
|
4
|
+
}
|