aldehyde 0.0.11 → 0.1.2

package/src/aldehyde/chart/antd/PieChart1.tsx

@@ -0,0 +1,55 @@
+import React, { useState, useEffect } from 'react';
+import { Pie } from '@ant-design/charts';
+
+const DemoPie: React.FunctionComponent = () => {
+    var data = [
+        {
+            type: '分类一',
+            value: 27,
+        },
+        {
+            type: '分类二',
+            value: 25,
+        },
+        {
+            type: '分类三',
+            value: 18,
+        },
+        {
+            type: '分类四',
+            value: 15,
+        },
+        {
+            type: '分类五',
+            value: 10,
+        },
+        {
+            type: '其他',
+            value: 5,
+        },
+    ];
+    var config = {
+        appendPadding: 10,
+        data: data,
+        angleField: 'value',
+        colorField: 'type',
+        radius: 0.5,
+        label: {
+            type: 'inner',
+            offset: '-30%',
+            content: function content(_ref) {
+                var percent = _ref.percent;
+                let a=percent * 100+"";
+                return ''.concat(a, '%');
+            },
+            style: {
+                fontSize: 14,
+                textAlign: 'center',
+            },
+        },
+        interactions: [{ type: 'element-active' }],
+    };
+    return <Pie {...config} />;
+};
+
+export default DemoPie;

package/src/{components → aldehyde}/controls/cquery/cquick-button.tsx

@@ -20,6 +20,7 @@ import {
     CopyOutlined
 } from '@ant-design/icons';
 
+import {CUSTOM_PAGE_MAP} from '../../../custom-page/CustomPageRouter'
 import DtmplPage from '../../module/dtmpl-page'
 import ModalDtmplEdit from "../../detail/edit/modal-dtmpl-edit";
 
@@ -103,7 +104,7 @@ class CquickButton extends React.PureComponent<CquickButtonProps, CquickButtonSt
                                 </Space>
                             }
                         >
-                            {
+                            {cQueryConfig.path?  React.createElement(CUSTOM_PAGE_MAP[cQueryConfig.path]):
                                 <LtmplPage  sourceId={cQueryConfig.id} mainCode={mcode}></LtmplPage>
                             }
                         </Drawer>

package/src/{components → aldehyde}/detail/button/submit-button-bar.tsx

@@ -1,6 +1,6 @@
 import React, {RefObject} from 'react'
 import './index.css'
-import {ActionConfig, ButtonName, DtmplConfig, DtmplData, TmplBase} from "../../tmpl/interface";
+import {ActionConfig, ButtonName, DtmplConfig, DtmplData, TmplBase} from "../../../aldehyde/tmpl/interface";
 import {Affix, Button, Popconfirm, Popover} from "antd";
 import {LeftOutlined, SaveOutlined} from '@ant-design/icons';
 import Action from "../../controls/action";

package/src/{components → aldehyde}/detail/edit/dtmpl-edit.tsx

@@ -9,7 +9,7 @@ import '../dtmpl.css'
 import SubmitButtonBar from "../button/submit-button-bar";
 import Units from '../../units';
 import HcserviceV3 from "../../tmpl/hcservice-v3";
-import  CqueryButtonBar from  "../button/cquery-button-bar"
+import  CqueryButtonBar from "../button/cquery-button-bar"
 
 interface DtmplEditProps extends DtmplBaseProps {
     goBackToLtmpl: () => void,

package/src/{components → aldehyde}/detail/view/act-dtmpl-view.tsx

@@ -8,7 +8,6 @@ import '../dtmpl.css';
 import SnapshotTimeline from "./snapshot-timeline";
 import DtmplView from "./dtmpl-view";
 import Units from '../../units'
-import ActionUtils from "../../controls/action/utils";
 
 export interface ActDtmplViewProps extends DtmplBaseProps {
     versionId?: number;

package/src/{components → aldehyde}/detail/view/dtmpl-view.tsx

@@ -6,7 +6,7 @@ import FieldViewGroup from './field-view-group';
 import HcserviceV3 from "../../tmpl/hcservice-v3";
 import RightBar from "../rightbar";
 import '../dtmpl.css';
-import {HolderOutlined}  from '@ant-design/icons';
+import {}  from '@ant-design/icons';
 import Units from '../../units';
 import CollapseCard from "../../controls/collapse-card";
 import CqueryButtonBar from "../button/cquery-button-bar";

package/src/{components → aldehyde}/detail/view/field-view-group.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import {Col,Row,Descriptions} from 'antd';
 import {FieldConfig, FieldGroupConfig} from "../../tmpl/interface";
-import ViewControl from './../../controls/view-control';
+import ViewControl from '../../controls/view-control';
 
 
 interface FieldViewGroupProps {

package/src/{components → aldehyde}/form/dtmpl-form.tsx

@@ -6,7 +6,7 @@ import FormItemGroup from "./form-Item-group";
 import {FormInstance} from "antd/lib/form/hooks/useForm";
 import {ReloadOutlined} from '@ant-design/icons';
 import FieldViewGroup from "../detail/view/field-view-group";
-import RelationTable from "./../table/relation-table";
+import RelationTable from "../table/relation-table";
 import './dtmpl-form.css';
 import CollapseCard from "../controls/collapse-card";
 

package/src/{components → aldehyde}/form/form-Item-group.tsx

@@ -3,7 +3,7 @@ import {Col, Form, Row} from 'antd'
 import 'moment/locale/zh-cn';
 import {FieldConfig, FieldGroupConfig} from "../tmpl/interface";
 import EntryControl from "../controls/entry-control";
-import Units from './../units'
+import Units from '../units'
 
 
 

package/src/aldehyde/index.tsx

@@ -0,0 +1,27 @@
+import ActTable  from './table/act-table';
+import SelectTable  from './table/select-table';
+import Loginit from './login/login';
+import DtmplRoute from './routable/dtmpl-route';
+import ImportRoute from './routable/import-route';
+import LtmplRoute from "./routable/ltmpl-route";
+import DtmplPage from './module/dtmpl-page';
+import LtmplPage from './module/ltmpl-page';
+import Menu2layers from './layout/menu/menu-2layers';
+import Block from './layout/menu/block';
+import UserBar from './layout/menu/user-bar';
+import ResetPassword from "./layout/menu/reset-password";
+import Footer from './layout/footer';
+import EntryControl from './controls/entry-control';
+import ViewControl from "./controls/view-control";
+import ProgramConfig from './units';
+import HydrocarbonService from "./tmpl/hcservice-v3";
+import QuickEntrance from './welcome/quick-entrance'
+import Workbench from './welcome/workbench';
+import PopoverEntitySelect from "./controls/entity-select/popover-entity-select";
+import DatePicker from "./controls/date-picker";
+import ModalDtmplEdit from "./detail/edit/modal-dtmpl-edit";
+import {RouterCompProps} from "./tmpl/interface";
+export {ActTable,SelectTable,Loginit,DtmplRoute,ImportRoute,LtmplRoute,DtmplPage,LtmplPage,Menu2layers,Block,UserBar,
+    ResetPassword,Footer,EntryControl,ViewControl,ProgramConfig,HydrocarbonService,QuickEntrance,Workbench,PopoverEntitySelect
+,DatePicker,ModalDtmplEdit,RouterCompProps}
+

package/src/{components → aldehyde}/layout/MainPage.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import {FormInstance, Layout} from 'antd'
-import Footer from './footer';
+import Footer from './footer/index';
 import {BlockMenu} from "../tmpl/interface";
 import Header from './header';
 import SideBar from './sidebar';

package/src/{components → aldehyde}/layout/header/index.tsx

@@ -1,7 +1,6 @@
 import React from 'react'
 import {Col, Layout, Row} from 'antd'
 import {MenuFoldOutlined, MenuUnfoldOutlined} from '@ant-design/icons';
-import 'antd/dist/antd.css';
 import "./index.css"
 import Block, {BlockProps} from "../menu/block";
 import L2MenuMessageBar from '../menu/l2menu-message-bar';

package/src/{components → aldehyde}/layout/menu/block.tsx

@@ -2,15 +2,7 @@ import React from "react";
 import {Badge, Col, Dropdown, Menu, Row} from 'antd';
 import {BlockMenu} from "../../tmpl/interface";
 import {NavLink, withRouter} from 'react-router-dom';
-import {
-    AppstoreTwoTone,
-    FormOutlined,
-    LogoutOutlined,
-    MenuFoldOutlined,
-    MenuUnfoldOutlined,
-    MessageTwoTone,
-    UserOutlined
-} from '@ant-design/icons';
+import {} from '@ant-design/icons';
 import MenuRender from './menu-render';
 
 

package/src/{components → aldehyde}/layout/menu/l2menu-message-bar.tsx

@@ -5,7 +5,7 @@ import 'antd/dist/antd.css';
 import {Level2Menu} from "../../tmpl/interface";
 import HcserviceV3 from '../../tmpl/hcservice-v3'
 import {NavLink} from 'react-router-dom';
-import HCDataSource from './../../tmpl/hc-data-source'
+import HCDataSource from '../../tmpl/hc-data-source'
 import Units from "../../units";
 interface L2MenuMessageBarProps {
 

package/src/{components → aldehyde}/layout/menu/l2menu-quick-bar.tsx

@@ -4,8 +4,8 @@ import {MessageTwoTone,AppstoreOutlined} from '@ant-design/icons';
 import 'antd/dist/antd.css';
 import {Level2Menu} from "../../tmpl/interface";
 // import HcserviceV3 from '../../tmpl/hcservice-v3'
-import HCDataSource from './../../tmpl/hc-data-source'
-import LtmplPage from "./../../module/ltmpl-page";
+import HCDataSource from '../../tmpl/hc-data-source'
+import LtmplPage from "../../module/ltmpl-page";
 
 interface L2MenuQuickBarProps {
 

package/src/{components → aldehyde}/layout/menu/userinfo-bar.tsx

@@ -4,9 +4,9 @@ import {MessageTwoTone,AppstoreOutlined} from '@ant-design/icons';
 import 'antd/dist/antd.css';
 import {Level2Menu} from "../../tmpl/interface";
 // import HcserviceV3 from '../../tmpl/hcservice-v3'
-import HCDataSource from './../../tmpl/hc-data-source'
+import HCDataSource from '../../tmpl/hc-data-source'
 import {UserOutlined,LogoutOutlined,ClearOutlined,KeyOutlined,SolutionOutlined} from '@ant-design/icons';
-import DtmplPage from "./../../module/dtmpl-page";
+import DtmplPage from "../../module/dtmpl-page";
 import HcserviceV3 from "../../tmpl/hcservice-v3";
 
 interface UserInfoBarProps {

package/src/aldehyde/login/index.css

@@ -0,0 +1,15 @@
+
+.login{
+	position: relative;
+	height:calc(100vh);
+	background: #001529
+}
+.login form{
+	background: #fff;
+	position: absolute;
+	top:50%;
+	left:50%;
+	transform: translate(-50%,-50%);
+	padding:30px 20px;
+	border-radius: 5px
+}

package/src/{components → aldehyde/login}/login.js

@@ -1,7 +1,8 @@
 import React from 'react'
+import './index.css'
 import {Button, Col, Form, Image, Input, message, Row} from 'antd'
 import {LockOutlined, SafetyCertificateOutlined, UserOutlined} from '@ant-design/icons';
-import HCserviceV3 from "./tmpl/hcservice-v3"
+import HCserviceV3 from "../tmpl/hcservice-v3"
 
 
 export default class Loginit extends React.Component {