aldehyde 0.0.2 → 0.0.5

package/package.json

@@ -1,13 +1,18 @@
 {
   "name": "aldehyde",
-  "version": "0.0.2",
+  "version": "0.0.5",
   "author": "cosmicparticle",
-  "main": "dist/aldehyde.js",
+  "main": "src/index.tsx",
+  "module": "es/index.js",
+  "typings": "lib/index.d.ts",
   "files": [
+    "src"
+  ],
+  "sideEffects": [
     "dist/*",
-    "src/*",
-    "*.json",
-    "*.js"
+    "es/**/style/*",
+    "lib/**/style/*",
+    "*.less"
   ],
   "homepage": "./",
   "dependencies": {
@@ -88,6 +93,7 @@
     "superagent-jsonp": "^0.2.1",
     "three": "^0.134.0",
     "typescript": "^4.5.4",
+
     "url": "^0.11.0",
     "url-loader": "^4.1.1",
     "use-resize-observer": "^7.0.0",
@@ -99,7 +105,8 @@
   "scripts": {
     "build": "cross-env NODE_ENV=production webpack --config config/webpack.prod.js",
     "dev": "cross-env NODE_ENV=development webpack server --config config/webpack.dev.js",
-    "package": "cross-env NODE_ENV=development webpack  --config config/webpack.package.js"
+    "package": "cross-env NODE_ENV=development webpack  --config config/webpack.package.js",
+    "tsc": "tsc"
   },
   "engines": {
     "node": ">=14"
@@ -119,17 +126,27 @@
   },
   "babel": {
     "presets": [
-      "@babel/preset-env",
+      "react-app",
       "@babel/preset-react",
-      "react-app"
+      "@babel/preset-env"
     ],
     "plugins": [
       "@babel/plugin-syntax-dynamic-import",
-      "@loadable/babel-plugin"
+      "@loadable/babel-plugin",
+      [
+        "import",
+        {
+          "libraryName": "antd",
+          "libraryDirectory": "lib",
+          "style": "css"
+        }
+      ]
     ]
   },
   "devDependencies": {
     "@babel/core": "^7.17.10",
+    "@babel/plugin-proposal-class-properties": "^7.16.7",
+    "@babel/plugin-proposal-object-rest-spread": "^7.17.3",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "^7.17.10",
     "@babel/preset-react": "^7.16.7",
@@ -187,6 +204,7 @@
     "webpack-manifest-plugin": "^4.0.2",
     "webpack-merge": "^5.8.0",
     "webpack-node-externals": "^3.0.0",
-    "workbox-webpack-plugin": "^6.4.2"
+    "workbox-webpack-plugin": "^6.4.2",
+    "typescript-plugin-css-modules": "^3.4.0"
   }
 }

package/src/components/chart/antd/PieChart1.js

@@ -1,7 +1,7 @@
-import React, { useState, useEffect } from 'react';
+import React from 'react';
 import { Pie } from '@ant-design/charts';
 
-const DemoPie: React.FunctionComponent = () => {
+const DemoPie = () => {
     var data = [
         {
             type: '分类一',

package/src/components/controls/cquery/cquick-button.tsx

@@ -85,7 +85,7 @@ class CquickButton extends React.PureComponent<CquickButtonProps, CquickButtonSt
                             })}}
                              sourceId={cQueryConfig.id}
                              code={mcode}
-                             onOk={this.closeDrawer}> </ModalDtmplEdit>:
+                             onOk={this.closeDrawer} />:
                         <Drawer
                             placement={'left'}
                             title="关联查询"

package/src/components/controls/date-picker/index.tsx

@@ -56,7 +56,7 @@ const DatePicker: React.FC<DataPickerProps> = (props) => {
         case 'date-M1':
         case 'date':
             momentValue = value ? moment(value, format) : undefined;
-            let picker = itemType == 'date-YY' ? 'year' : itemType == 'date-M1' ? "month" : "date"
+            let picker:"date" | "time" | "year" | "month" | "week" | "quarter" = itemType == 'date-YY' ? 'year' : itemType == 'date-M1' ? "month" : "date"
             // @ts-ignore
             entryControl = <AntdDatePicker
                 id={id}

package/src/components/detail/edit/dtmpl-edit.tsx

@@ -211,7 +211,7 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
                     goEdit={this.goEdit}
                     goAdd={this.goAdd}
                     jumpTypes={dtmplConfig.saveJumpTo}
-                > </PostResult>
+                />
             </div>)
     }
 

package/src/components/detail/edit/modal-row-edit.tsx

@@ -65,7 +65,7 @@ export default class ModalRowEdit extends React.PureComponent<ModalRowEditorProp
         >
             <FieldGroupForm fieldGroupConfig={fieldGroupConfig} formRef={this.formRef}
                             onFinish={onOk}
-                            dtmplData={dtmplData}> </FieldGroupForm>
+                            dtmplData={dtmplData} />
         </Modal>
     }
 

package/src/components/detail/edit/row-edit-card.tsx

@@ -118,7 +118,7 @@ export default class RowEditCard extends React.PureComponent<RowEditCardProps, R
         >
             <FieldGroupForm fieldGroupConfig={fieldGroupConfig} formRef={this.formRef}
                             onFinish={(value)=>onOk(value,!isAdded)}
-                            dtmplData={dtmplData}> </FieldGroupForm>
+                            dtmplData={dtmplData} />
         </Card>
     }
 

package/src/components/detail/view/modal-dtmpl-view.tsx

@@ -49,7 +49,7 @@ export default class ModalDtmplView extends React.PureComponent<ModalDtmplViewPr
                     取 消
                 </Button>]}
         >
-            {code?<ActDtmplView rightBarPositionRight={30} sourceId={sourceId}  code={code} > </ActDtmplView>:""}
+            {code?<ActDtmplView rightBarPositionRight={30} sourceId={sourceId}  code={code} />:""}
         </Modal>
     }
 

package/src/components/module/dtmpl-page.tsx

@@ -61,7 +61,7 @@ class DtmplPage extends React.PureComponent<DtmplPageProps, DtmplPageState> {
                         })}}
                                     sourceId={sourceId}
                                     code={code}
-                                    onOk={this.handleDtmplEdit}> </ModalDtmplEdit>
+                                    onOk={this.handleDtmplEdit} />
               </>
     }
 }

package/src/components/table/column/column-selector.tsx

@@ -23,7 +23,7 @@ const SortableCheckbox = SortableElement(({value, index,disabledColIds}) => <Col
     <Checkbox disabled={disabledColIds.includes(value.id)} value={value.id}><DragHandle/> {value.title}</Checkbox>
 </Col>);
 const DragHandle = SortableHandle(() => <MenuOutlined style={{cursor: 'grab', color: '#999'}}/>);
-const SortableGroupContainer = SortableContainer(({items, selected, onChange,disabledColIds}) => {
+const SortableGroupContainer = SortableContainer(({disabledColIds,items, selected, onChange}) => {
     return <Checkbox.Group value={selected} onChange={onChange}>
         <Row style={{width: '148px'}}>
             {items.map((value, index) => (

package/src/components/table/relation-table.tsx

@@ -578,7 +578,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                         <ModalDtmplEdit visible={showDtmplEdit} onCancel={this.hiddenEntityEdit}
                                         sourceId={fieldGroupConfig.id}
                                         code={selectedCode}
-                                        onOk={selectedCode ? this.handleDtmplEdit : this.handleDtmplAdd}> </ModalDtmplEdit>
+                                        onOk={selectedCode ? this.handleDtmplEdit : this.handleDtmplAdd} />
                         : ""}
                     {/*{buttons.includes('rowEdit') || buttons.includes('rowAdd') ?*/}
                     {/*    <ModalRowEdit visible={showRowEdit} onCancel={this.hiddenRowEdit}*/}

package/src/components/welcome/HCWelcome.js

@@ -15,136 +15,136 @@ import Development from '../../../public/development.png';
 export default class HCWelcome extends React.Component {
     state = {}
 
-    intervals: any[] = [];
+    intervals = [];
 
     async componentDidMount() {
-        let l2MenuCharts = await HcserviceV3.requestSimpleCharts();
-        let piecharts = [];
-        for (const item of l2MenuCharts) {
-            let data = await HcserviceV3.requestSimpleChartsEntities( item.id);
-            if (data) {
-                piecharts.push(<Col span={12}> <AntdPieChart data={data} key={item.id}></AntdPieChart></Col>)
-            }
-        }
-
-        var chartDom = document.getElementById('echart1');
-        var myChart = Echarts.init(chartDom);
-        var option;
-
-        option = {
-            title: {
-                text: 'Line'
-            },
-            tooltip: {
-                trigger: 'axis'
-            },
-            legend: {
-                data: ['Email', 'Union Ads', 'Video Ads', 'Direct', 'Search Engine']
-            },
-            grid: {
-                left: '3%',
-                right: '4%',
-                bottom: '3%',
-                containLabel: true
-            },
-            toolbox: {
-                feature: {
-                    saveAsImage: {}
-                }
-            },
-            xAxis: {
-                type: 'category',
-                boundaryGap: false,
-                data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-            },
-            yAxis: {
-                type: 'value'
-            },
-            series: [
-                {
-                    name: 'Email',
-                    type: 'line',
-                    stack: 'Total',
-                    data: [120, 132, 101, 134, 90, 230, 210]
-                },
-                {
-                    name: 'Union Ads',
-                    type: 'line',
-                    stack: 'Total',
-                    data: [220, 182, 191, 234, 290, 330, 310]
-                },
-                {
-                    name: 'Video Ads',
-                    type: 'line',
-                    stack: 'Total',
-                    data: [150, 232, 201, 154, 190, 330, 410]
-                },
-                {
-                    name: 'Direct',
-                    type: 'line',
-                    stack: 'Total',
-                    data: [320, 332, 301, 334, 390, 330, 320]
-                },
-                {
-                    name: 'Search Engine',
-                    type: 'line',
-                    stack: 'Total',
-                    data: [820, 932, 901, 934, 1290, 1330, 1320]
-                }
-            ]
-        };
-
-        option && myChart.setOption(option);
-
-        var chartDom = document.getElementById('echart2');
-        var myChart = Echarts.init(chartDom);
-        var option;
-
-        option = {
-            legend: {
-                top: 'bottom'
-            },
-            toolbox: {
-                show: true,
-                feature: {
-                    mark: { show: true },
-                    dataView: { show: true, readOnly: false },
-                    restore: { show: true },
-                    saveAsImage: { show: true }
-                }
-            },
-            series: [
-                {
-                    name: 'Nightingale Chart',
-                    type: 'pie',
-                    radius: [16, 80],
-                    center: ['50%', '50%'],
-                    roseType: 'area',
-                    itemStyle: {
-                        borderRadius: 8
-                    },
-                    data: [
-                        { value: 40, name: 'rose 1' },
-                        { value: 38, name: 'rose 2' },
-                        { value: 32, name: 'rose 3' },
-                        { value: 30, name: 'rose 4' },
-                        { value: 28, name: 'rose 5' },
-                        { value: 26, name: 'rose 6' },
-                        { value: 22, name: 'rose 7' },
-                        { value: 18, name: 'rose 8' }
-                    ]
-                }
-            ]
-        };
-
-        option && myChart.setOption(option);
-
-        this.setState({
-            piecharts
-        })
+        // let l2MenuCharts = await HcserviceV3.requestSimpleCharts();
+        // let piecharts = [];
+        // for (const item of l2MenuCharts) {
+        //     let data = await HcserviceV3.requestSimpleChartsEntities( item.id);
+        //     if (data) {
+        //         piecharts.push(<Col span={12}> <AntdPieChart data={data} key={item.id}></AntdPieChart></Col>)
+        //     }
+        // }
+        //
+        // var chartDom = document.getElementById('echart1');
+        // var myChart = Echarts.init(chartDom);
+        // var option;
+        //
+        // option = {
+        //     title: {
+        //         text: 'Line'
+        //     },
+        //     tooltip: {
+        //         trigger: 'axis'
+        //     },
+        //     legend: {
+        //         data: ['Email', 'Union Ads', 'Video Ads', 'Direct', 'Search Engine']
+        //     },
+        //     grid: {
+        //         left: '3%',
+        //         right: '4%',
+        //         bottom: '3%',
+        //         containLabel: true
+        //     },
+        //     toolbox: {
+        //         feature: {
+        //             saveAsImage: {}
+        //         }
+        //     },
+        //     xAxis: {
+        //         type: 'category',
+        //         boundaryGap: false,
+        //         data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+        //     },
+        //     yAxis: {
+        //         type: 'value'
+        //     },
+        //     series: [
+        //         {
+        //             name: 'Email',
+        //             type: 'line',
+        //             stack: 'Total',
+        //             data: [120, 132, 101, 134, 90, 230, 210]
+        //         },
+        //         {
+        //             name: 'Union Ads',
+        //             type: 'line',
+        //             stack: 'Total',
+        //             data: [220, 182, 191, 234, 290, 330, 310]
+        //         },
+        //         {
+        //             name: 'Video Ads',
+        //             type: 'line',
+        //             stack: 'Total',
+        //             data: [150, 232, 201, 154, 190, 330, 410]
+        //         },
+        //         {
+        //             name: 'Direct',
+        //             type: 'line',
+        //             stack: 'Total',
+        //             data: [320, 332, 301, 334, 390, 330, 320]
+        //         },
+        //         {
+        //             name: 'Search Engine',
+        //             type: 'line',
+        //             stack: 'Total',
+        //             data: [820, 932, 901, 934, 1290, 1330, 1320]
+        //         }
+        //     ]
+        // };
+        //
+        // option && myChart.setOption(option);
+        //
+        // var chartDom = document.getElementById('echart2');
+        // var myChart = Echarts.init(chartDom);
+        // var option;
+        //
+        // option = {
+        //     legend: {
+        //         top: 'bottom'
+        //     },
+        //     toolbox: {
+        //         show: true,
+        //         feature: {
+        //             mark: { show: true },
+        //             dataView: { show: true, readOnly: false },
+        //             restore: { show: true },
+        //             saveAsImage: { show: true }
+        //         }
+        //     },
+        //     series: [
+        //         {
+        //             name: 'Nightingale Chart',
+        //             type: 'pie',
+        //             radius: [16, 80],
+        //             center: ['50%', '50%'],
+        //             roseType: 'area',
+        //             itemStyle: {
+        //                 borderRadius: 8
+        //             },
+        //             data: [
+        //                 { value: 40, name: 'rose 1' },
+        //                 { value: 38, name: 'rose 2' },
+        //                 { value: 32, name: 'rose 3' },
+        //                 { value: 30, name: 'rose 4' },
+        //                 { value: 28, name: 'rose 5' },
+        //                 { value: 26, name: 'rose 6' },
+        //                 { value: 22, name: 'rose 7' },
+        //                 { value: 18, name: 'rose 8' }
+        //             ]
+        //         }
+        //     ]
+        // };
+        //
+        // option && myChart.setOption(option);
+        //
+        // this.setState({
+        //     piecharts
+        // })
     }
 
-    componentWillUnmount(): void {
+    componentWillUnmount() {
         if (this.intervals.length > 0) {
             for (let i of this.intervals) {
                 clearInterval(i);

package/src/components/welcome/workbench.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import {Button, Card, Space, Statistic,CardProps} from 'antd'
-import {LikeOutlined,RightCircleOutlined,HeartOutlined,RocketOutlined,RocketTwoTone } from '@ant-design/icons';
+import {RocketTwoTone } from '@ant-design/icons';
 import 'antd/dist/antd.css';
 import HcserviceV3 from "../tmpl/hcservice-v3";
 import HCDataSource from '../tmpl/hc-data-source'