aldehyde 0.0.10 → 0.1.1

package/src/aldehyde/controls/chemstruc/index.css

@@ -0,0 +1,28 @@
+body {
+  margin: 0;
+  padding: 0;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
+    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
+    sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.chemstruc-edit-upload{
+  width: 230px;
+}
+
+.ant-upload-list-picture-card-container,
+.ant-upload-select-picture-card{
+  width: 66px!important;
+  height:66px!important;
+}
+/*控制ketcher的选择工具栏的显示层级，modal为1000，所以此处为1020*/
+.ToolbarMultiToolItem-module_portal__yDg5_{
+  z-index: 1020!important;
+}
+
+code {
+  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
+    monospace;
+}

package/src/aldehyde/controls/collapse-card/index.css

@@ -0,0 +1,9 @@
+
+.collapse .ant-card-body {
+    padding:0px
+}
+
+.ant-card-head-title button{
+    font-size: 16px;
+    padding:0px;
+}

package/src/aldehyde/controls/color-picker/index.css

@@ -0,0 +1,27 @@
+
+.color {
+    width: 108px;
+    height: 24px;
+    border-radius: 2px;
+    display: inline-block;
+    /*background: `rgba(${ this.state.color.r }, ${ this.state.color.g }, ${ this.state.color.b }, ${ this.state.color.a })`,*/
+}
+.swatch {
+    padding: 5px;
+    background: #fff;
+    border-radius: 1px;
+    box-shadow: 0 0 0 1px rgba(0,0,0,.1);
+    display: inline-block;
+    cursor: pointer;
+}
+.popover{
+    position: absolute;
+    z-index: 2;
+}
+.cover{
+    position: fixed;
+    top: 0px;
+    right: 0px;
+    bottom: 0px;
+    left: 0px;
+}

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/aldehyde/controls/entity-select/index.css

@@ -0,0 +1,6 @@
+.entity-select-popover{
+  /*padding: 4px;*/
+}
+.entity-select-popover .ant-popover-inner-content {
+  padding: 4px;
+}

package/src/aldehyde/controls/password-setter/index.css

@@ -0,0 +1,3 @@
+.setPass .ant-form-item{
+    margin-bottom: 0;
+}

package/src/aldehyde/controls/relation-existion/index.css

@@ -0,0 +1,4 @@
+
+.ant-popover-inner-content {
+  padding: 4px;
+}

package/src/aldehyde/controls/rfield/index.css

@@ -0,0 +1,4 @@
+
+.buttons {
+  max-width: 300px;
+}

package/src/{components → 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 "../../tmpl/interface";
+import {ActionConfig, ButtonName, CQueryConfig, DtmplConfig, DtmplData, TmplBase} from "../../../aldehyde/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/button/index.css

@@ -0,0 +1,43 @@
+.submitButtonBar{
+    background: #fff;
+    /*position: absolute;*/
+    /*right:10px;*/
+    /*top:80px;*/
+    border:1px solid #e8e8e8;
+    border-radius: 4px;
+    box-shadow: 2px 2px 10px rgba(0,0,0,.2);
+    max-height:158px;
+    /*min-height:80px;*/
+    overflow:auto;
+    width:100px;
+}
+.submitButtonBar::-webkit-scrollbar {
+    display: none;
+}
+.submitButtonBar ul{
+    padding:0;
+    margin:0;
+}
+.submitButtonBar li{
+    list-style-type: none;
+    padding:4px;
+    margin:0;
+    text-align: left;
+    white-space: nowrap;
+    overflow: hidden;
+}
+/*.rightBar li:hover{*/
+/*    background: #cfe3f5;*/
+/*}*/
+
+.btns button{
+    margin-right: 10px
+}
+
+.cquickTextButton {
+    cursor:pointer;
+}
+
+.cquickTextButton:hover{
+    color: #1890ff;
+}

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/aldehyde/detail/dtmpl.css

@@ -0,0 +1,53 @@
+/*.labelcss label{*/
+/*    display:table-cell!important;*/
+/*    vertical-align: middle;*/
+/*    width:120px;*/
+/*}*/
+
+.downEditPic{
+    display:inline-block;
+}
+.downEditPic a{
+    visibility: hidden;
+    color:#1890ff;
+    cursor: pointer;
+}
+.downEditPic:hover a{
+    visibility:visible;
+}
+.editPic .ant-upload-list{
+    width:150px
+}
+.buttonGroup{
+    position: fixed;
+    width:100px;
+    bottom: 30px;
+    right: 20px;
+    z-index: 99;
+}
+
+.buttonGroup button{
+    margin-bottom: 10px;
+}
+
+.detailPage h3{
+    font-size: 18px;
+}
+.detailPage.showRightNav .ant-card{
+	min-width: 740px;
+    max-width: 1440px;
+	width:90%
+}
+
+.detailPage.noRightNav .ant-card{
+    min-width: 740px;
+    width:100%
+}
+
+.actionbtn button{
+    margin-right: 5px;
+}
+
+.detailPage .pad{
+    margin-right: 100px;
+}

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

@@ -7,9 +7,9 @@ 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 '../../units';
-import HcserviceV3 from "../../tmpl/hcservice-v3";
-import  CqueryButtonBar from  "../button/cquery-button-bar"
+import Units from '../../../aldehyde/units';
+import HcserviceV3 from "../../../aldehyde/tmpl/hcservice-v3";
+import  CqueryButtonBar from "../button/cquery-button-bar"
 
 interface DtmplEditProps extends DtmplBaseProps {
     goBackToLtmpl: () => void,

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

@@ -0,0 +1,35 @@
+.rightBar{
+    background: #fff;
+    /*position: absolute;*/
+    /*right:10px;*/
+    /*top:80px;*/
+    border:1px solid #e8e8e8;
+    border-radius: 4px;
+    box-shadow: 2px 2px 10px rgba(0,0,0,.2);
+    height:200px;
+    /*max-height:181px;*/
+    /*min-height:80px;*/
+    min-width: 96px;
+    overflow:auto;
+}
+.rightBar::-webkit-scrollbar {
+    display: none;
+}
+.rightBar ul{
+    padding:0;
+    margin:0;
+}
+.rightBar li{
+    list-style-type: none;
+    cursor: pointer;
+    padding:3px 7px;
+    width:95px;
+    text-align: center;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    text-align: left;
+    overflow: hidden;
+}
+.rightBar li:hover{
+    background: #cfe3f5;
+}

package/src/{components → aldehyde}/detail/rightbar/index.tsx

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

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

@@ -7,7 +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 '../../units'
+import Units from '../../../aldehyde/units'
 import ActionUtils from "../../controls/action/utils";
 
 export interface ActDtmplViewProps extends DtmplBaseProps {

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

@@ -7,7 +7,7 @@ import HcserviceV3 from "../../tmpl/hcservice-v3";
 import RightBar from "../rightbar";
 import '../dtmpl.css';
 import {HolderOutlined}  from '@ant-design/icons';
-import Units from '../../units';
+import Units from '../../../aldehyde/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}/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 "../../tmpl/interface";
-import Units from '../../units';
+import {DtmplConfig, SourceName} from "../../../aldehyde/tmpl/interface";
+import Units from '../../../aldehyde/units';
 import DtmplView from "./dtmpl-view";
 
 export interface SnapshotTimelineProps {

package/src/aldehyde/exportor/export-frame.css

@@ -0,0 +1,3 @@
+.exportFrame .ant-divider-horizontal{
+    margin:12px 0;
+}

package/src/aldehyde/form/dtmpl-form.css

@@ -0,0 +1,4 @@
+
+.pageHeader .ant-card-body{
+    padding:0px 24px 0px 24px;
+}

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/form/index.css

@@ -0,0 +1,13 @@
+
+.downAvatar,.infoStyle{
+    width:220px;
+    display:inline-block;
+}
+.downAvatar a,.deleAvatar{
+    visibility: hidden;
+    color:#1890ff;
+    cursor: pointer;
+}
+.downAvatar:hover a,.downAvatar:hover .deleAvatar{
+    visibility:visible;
+}

package/src/aldehyde/import/index.css

@@ -0,0 +1,54 @@
+.importBtns button{
+    margin:15px 0 10px 0
+}
+.importList .ant-spin-container{
+    height:300px;
+    overflow: auto
+}
+.ant-list-item-content p{
+    margin-bottom: 0;
+}
+.listHeader h4{
+    display: inline;
+}
+.listHeader .checks{
+    float:right;
+    position: relative;
+    padding-right: 62px
+}
+.listHeader .btns{
+    position: absolute;
+    right:-22px;
+    top:0;
+}
+.infoColor{
+    color:black;
+}
+.infoColor .ant-checkbox-checked .ant-checkbox-inner{
+    background-color:black;
+    border-color: black;
+}
+.sucColor{
+    color:green;
+}
+.sucColor .ant-checkbox-checked .ant-checkbox-inner{
+    background-color:green;
+    border-color: green;
+}
+.errorColor{
+    color:red;
+}
+.errorColor .ant-checkbox-checked .ant-checkbox-inner{
+    background-color:red;
+    border-color: red;
+}
+.warnColor{
+    color:rgb(250, 225, 4);
+}
+.warnColor .ant-checkbox-checked .ant-checkbox-inner{
+    background-color:rgb(250, 225, 4);
+    border-color: rgb(250, 225, 4);
+}
+.importData h3{
+    font-size: 18px
+}

package/src/aldehyde/import/template.css

@@ -0,0 +1,51 @@
+.modelList {
+    margin-bottom:15px;
+    cursor: pointer;
+    width:200px;
+}
+.modelList:hover{
+    color:#1890ff
+}
+.modelList p{
+    margin-bottom: 4px;
+    line-height: 1.3;
+}
+.modelList p.tit{
+    font-weight: bold;
+    font-size: 15px
+}
+.modelList span{
+    display: inline-block;
+    width:40px;
+    height:40px;
+    border-radius: 50%;
+    line-height:45px;
+    text-align: center;
+    float: left;
+    margin-right:10px;
+    align-self: center;
+    background:#1890ff;
+}
+.modelList span.light{
+    background:red;
+    color:#fff;
+}
+.selectModal{
+    height:400px
+}
+.selectModal .table{
+    width:50%;
+    float: left;
+    overflow-y:auto;
+    max-height:300px;
+}
+.ant-collapse{
+    width:45%;
+    float: right;
+}
+.selectModal .ant-tag{
+    margin-bottom: 4px
+}
+.borderTag{
+    border:1px solid #ccc!important;
+}

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";
+
+export {ActTable,SelectTable,Loginit,DtmplRoute,ImportRoute,LtmplRoute,DtmplPage,LtmplPage,Menu2layers,Block,UserBar,
+    ResetPassword,Footer,EntryControl,ViewControl,ProgramConfig,HydrocarbonService,QuickEntrance,Workbench,PopoverEntitySelect
+,DatePicker,ModalDtmplEdit}
+

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/aldehyde/layout/footer/index.css

@@ -0,0 +1,6 @@
+.footer{
+    text-align: center;
+    height:40px;
+    line-height: 40px;
+    color:#333;
+}