aldehyde 0.1.1 → 0.1.4

package/lib/login/index.css

@@ -1,4 +1,3 @@
-
 .login{
 	position: relative;
 	height:calc(100vh);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aldehyde",
-  "version": "0.1.1",
+  "version": "0.1.4",
   "author": "cosmicparticle",
   "main": "lib/index.js",
   "module": "src/aldehyde/index.txs",
@@ -20,7 +20,7 @@
     "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-npm": "yarn tsc  && yarn build",
-    "clean-lib": "rimraf lib && rimraf templib",
+    "clean-lib": "rimraf lib && rimraf templib && rimraf dist",
     "tsc": "yarn clean-lib && tsc && yarn copy-files",
     "copy-files": "copyfiles -u 2 templib/aldehyde/**/* src/aldehyde/**/*.html src/aldehyde/**/*.css src/aldehyde/**/*.png lib/"
   },

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

@@ -3,25 +3,10 @@ import {Drawer, Space,Button,ButtonProps} from 'antd'
 import {CQueryConfig} from "../../tmpl/interface";
 import LtmplPage from "./../../module/ltmpl-page";
 import {
-    AlignLeftOutlined,
-    CalculatorOutlined,
-    DownloadOutlined,
     EditOutlined,
-    EyeInvisibleOutlined,
-    EyeOutlined,
-    FundOutlined,
-    LineChartOutlined,
-    MenuOutlined,
-    PlusOutlined,
-    ReloadOutlined,
-    RetweetOutlined,
-    TableOutlined,
-    UploadOutlined,
-    CopyOutlined
 } from '@ant-design/icons';
 
-import {CUSTOM_PAGE_MAP} from '../../../custom-page/CustomPageRouter'
-import DtmplPage from '../../module/dtmpl-page'
+import Units from '../../units'
 import ModalDtmplEdit from "../../detail/edit/modal-dtmpl-edit";
 
 interface CquickButtonProps extends ButtonProps{
@@ -104,7 +89,7 @@ class CquickButton extends React.PureComponent<CquickButtonProps, CquickButtonSt
                                 </Space>
                             }
                         >
-                            {cQueryConfig.path?  React.createElement(CUSTOM_PAGE_MAP[cQueryConfig.path]):
+                            {cQueryConfig.path?  React.createElement(Units.getCustomPage(cQueryConfig.path)):
                                 <LtmplPage  sourceId={cQueryConfig.id} mainCode={mcode}></LtmplPage>
                             }
                         </Drawer>

package/src/aldehyde/detail/button/cquery-button-bar.tsx

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

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

@@ -7,8 +7,8 @@ import {DtmplBaseProps, DtmplConfig, DtmplData,AddOrUpdate} from "../../tmpl/int
 import HCDataSource from "../../tmpl/hc-data-source";
 import '../dtmpl.css'
 import SubmitButtonBar from "../button/submit-button-bar";
-import Units from '../../../aldehyde/units';
-import HcserviceV3 from "../../../aldehyde/tmpl/hcservice-v3";
+import Units from '../../units';
+import HcserviceV3 from "../../tmpl/hcservice-v3";
 import  CqueryButtonBar from "../button/cquery-button-bar"
 
 interface DtmplEditProps extends DtmplBaseProps {

package/src/aldehyde/detail/rightbar/index.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import './index.css'
-import {DtmplConfig, TmplBase} from "../../../aldehyde/tmpl/interface";
+import {DtmplConfig, TmplBase} from "../../tmpl/interface";
 import {Affix, Button} from "antd";
 
 interface RightBarProps {

package/src/aldehyde/detail/view/act-dtmpl-view.tsx

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

package/src/aldehyde/detail/view/dtmpl-view.tsx

@@ -6,8 +6,8 @@ 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 Units from '../../../aldehyde/units';
+import {}  from '@ant-design/icons';
+import Units from '../../units';
 import CollapseCard from "../../controls/collapse-card";
 import CqueryButtonBar from "../button/cquery-button-bar";
 

package/src/aldehyde/detail/view/snapshot-timeline.tsx

@@ -2,8 +2,8 @@ import React from 'react'
 import {Button, Drawer, Timeline} from 'antd'
 import HcserviceV3 from "../../tmpl/hcservice-v3";
 import '../dtmpl.css';
-import {DtmplConfig, SourceName} from "../../../aldehyde/tmpl/interface";
-import Units from '../../../aldehyde/units';
+import {DtmplConfig, SourceName} from "../../tmpl/interface";
+import Units from '../../units';
 import DtmplView from "./dtmpl-view";
 
 export interface SnapshotTimelineProps {

package/src/aldehyde/index.tsx

@@ -20,8 +20,8 @@ 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}
+,DatePicker,ModalDtmplEdit,RouterCompProps}
 

package/src/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/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/aldehyde/login/index.css

@@ -1,4 +1,3 @@
-
 .login{
 	position: relative;
 	height:calc(100vh);

package/src/aldehyde/login/login.js

@@ -4,7 +4,6 @@ import {Button, Col, Form, Image, Input, message, Row} from 'antd'
 import {LockOutlined, SafetyCertificateOutlined, UserOutlined} from '@ant-design/icons';
 import HCserviceV3 from "../tmpl/hcservice-v3"
 
-
 export default class Loginit extends React.Component {
     state = {
         username: "",

package/src/aldehyde/table/act-table.tsx

@@ -32,11 +32,11 @@ import TableUnits from "./table-util";
 import SupportInputTypes from '../tmpl/control-type-supportor';
 import HcserviceV3 from "../tmpl/hcservice-v3";
 import QueryTable from './query-table';
-import CriteriaForm from "../../aldehyde/form/criteria-form";
+import CriteriaForm from "./../form/criteria-form";
 import ViewControl from "../controls/view-control";
 import Units from "../units";
 import ColumnSelector from './column/column-selector';
-import ExportFrame from '../../aldehyde/exportor/export-frame';
+import ExportFrame from '../exportor/export-frame';
 import {SortableHandle} from 'react-sortable-hoc';
 import L2ActTable from "./l2-act-table";
 import StatViewL2Chart from '../chart/statview-l2-chart'

package/src/aldehyde/table/modal-select-table.tsx

@@ -7,7 +7,7 @@ import SupportInputTypes from '../tmpl/control-type-supportor';
 import HCDataSource from '../tmpl/hc-data-source';
 import HcserviceV3 from "../tmpl/hcservice-v3";
 import QueryTable from './query-table';
-import CriteriaForm from "../../aldehyde/form/criteria-form";
+import CriteriaForm from "../form/criteria-form";
 import ViewControl from "../controls/view-control";
 import SelectedRowsCard from './selected-rows-card'
 

package/src/aldehyde/table/select-table.tsx

@@ -6,7 +6,7 @@ import SupportInputTypes from '../tmpl/control-type-supportor';
 import HCDataSource from '../tmpl/hc-data-source';
 import HcserviceV3 from "../tmpl/hcservice-v3";
 import QueryTable from './query-table';
-import CriteriaForm from "../../aldehyde/form/criteria-form";
+import CriteriaForm from "../form/criteria-form";
 import ViewControl from "../controls/view-control";
 
 interface SelectTableProps {

package/src/aldehyde/table/stat/restat.tsx

@@ -3,7 +3,7 @@ import {Button, Card, Form as AntdForm, FormInstance, Popconfirm, Popover, Space
 import {CalculatorOutlined, CloseOutlined} from "@ant-design/icons"
 import {FieldConfig,} from "../../tmpl/interface";
 import '../pagination.css';
-import FormItemGroup from "../../../aldehyde/form/form-Item-group";
+import FormItemGroup from "../../form/form-Item-group";
 import HcserviceV3 from "../../tmpl/hcservice-v3";
 interface RestatProps {
     onfinish: () => void;

package/src/aldehyde/units/index.tsx

@@ -6,6 +6,10 @@ import {EnumItem} from "../tmpl/interface";
 import HCDataSource from "../tmpl/hc-data-source";
 import moment from "moment";
 import TmplConfigAnalysis from "../tmpl/tmpl-config-analysis";
+import DefCustomPage from "../../custom-page/DefCustomPage";
+import LabsOverview from "../../labs/labs/overview";
+import LabsCourses from "../../labs/course/courses";
+import LabWelcome from "../../labs/LabWelcome";
 
 const Option = Select.Option;
 
@@ -16,6 +20,10 @@ let programName_sub = undefined;
 let programName_NavLeft = undefined;
 let storageKeyPrefix = undefined;
 
+const CUSTOM_PAGE_MAP = {
+    '/def'  : DefCustomPage,
+}
+
 //加载本地配置
 Axios.create().get('programConfig.json').then((result) => {
     window.localStorage['programName'] = result.data.programName
@@ -29,6 +37,12 @@ Axios.create().get('programConfig.json').then((result) => {
 });
 
 export default {
+    setCustomPage(key:string,name:string){
+        CUSTOM_PAGE_MAP[key]=name;
+    },
+    getCustomPage(key:string){
+       return CUSTOM_PAGE_MAP[key];
+    },
     setHydrocarbonServer(url:String){
         api=url;
     },