aldehyde 0.1.3 → 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.3",
+  "version": "0.1.4",
   "author": "cosmicparticle",
   "main": "lib/index.js",
   "module": "src/aldehyde/index.txs",
@@ -21,7 +21,7 @@
     "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 && rimraf dist",
-    "tsc": "yarn clean-lib && yarn tsc && yarn copy-files",
+    "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/"
   },
   "homepage": "./",

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/index.tsx

@@ -21,9 +21,6 @@ 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";
-import "antd/dist/antd.css"
-import "../style/common.css"
-import "../style/coverstyle.css"
 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/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;
     },