aldehyde 0.0.10 → 0.1.1

package/src/aldehyde/layout/header/index.css

@@ -0,0 +1,86 @@
+.header-top{
+    min-height:50px;
+    line-height: 55px;
+    text-align:left;
+    color:#333;
+    background: #fff;
+    font-size: 16px;
+    border-bottom: 1px solid #40a9ff;
+}
+
+.header-col{
+    z-index:1000
+}
+.ant-dropdown-menu-item, .ant-dropdown-menu-submenu-title{
+    font-size: 14px!important;
+    text-align: center;
+}
+.message-bar{
+    float:right;
+    min-width:50px;
+    width:auto;
+    text-align:center;
+    cursor: pointer;
+}
+.message-bar:hover{
+    background: #4a5f74;
+    color:#fff;
+    border-radius: 30px;
+}
+.message-bar-avatar{
+    background-color: #fff;
+    color:#1890ff;
+}
+.message-bar-avatar:hover{
+    background: #4a5f74;
+    color:#fff;
+}
+.userLogin{
+    float:right;
+    min-width:80px;
+    width:auto;
+    text-align:center;
+    cursor: pointer;
+}
+.userLogin i{
+    font-size: 24px!important;
+}
+.userLogin:hover{
+    background: #4a5f74;
+    color:#fff;
+}
+.ant-dropdown-menu-item:hover, .ant-dropdown-menu-submenu-title:hover{
+    color:#1890FF;
+}
+.dropdown-link{
+    display: inline-block;
+    margin:0 10px;
+}
+.header-block{
+    float: left;
+    /*padding-left: 10px;*/
+    padding-top: 2px;
+}
+.header-block:hover{
+    padding-top: 0px;
+    border-bottom-style: solid;
+    border-bottom-width:2px;
+    border-bottom-color:#1E90FF ;
+}
+.header-top .active{
+    background: #1E90FF;
+}
+.header-top .active>a {
+    color: #fcfcfc;
+}
+
+.trigger {
+    padding: 0 12px;
+    cursor: pointer;
+    transition: color 0.3s;
+    font-size: 20px;
+}
+
+.trigger:hover {
+    color: #1890ff;
+}

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

@@ -0,0 +1,26 @@
+.logo{
+	line-height: 38px;
+	height: 42px;
+	margin: 16px;
+	background: rgba(255, 255, 255, 0.3);
+}
+.logo h1{
+	font-size: 20px;
+	color:#fff;
+	display: inline-block;
+	text-align: center;
+	vertical-align: middle;
+	width:100%;
+	margin:0;
+}
+.logonly{
+	border-radius: 4px;
+	line-height: 38px;
+	height: 42px;
+	margin: 16px;
+	background: rgba(255, 255, 255, 0.8);
+}
+.ant-menu-inline-collapsed{
+	width: 50px!important;
+}
+

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 {

package/src/aldehyde/module/criteria-page.tsx1

@@ -0,0 +1,175 @@
+import React from 'react'
+import {DtmplData, LtmplConfigRes} from '../tmpl/interface';
+import Units from "../units";
+import ActTable from '../table/act-table'
+// import StatActTable from '../table/stat-act-table'
+import HCDataSource from "../tmpl/hc-data-source";
+import ModalDtmplView from "../detail/view/modal-dtmpl-view";
+import ModalDtmplEdit from "../detail/edit/modal-dtmpl-edit";
+import HcserviceV3 from "../tmpl/hcservice-v3";
+
+//以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
+
+export interface CriteriaPageProps  {
+
+};
+
+export interface CriteriaPageState  {
+
+};
+
+class CriteriaPage extends React.PureComponent<CriteriaPageProps, CriteriaPageState> {
+
+    state = {
+        ltmplConfigRes: undefined,
+        criteriaData:undefined,
+        showDtmplView:false,
+        showDtmplEdit:false,
+        selectedCode:undefined,
+    }
+
+    async componentDidMount() {
+        this.loadLtmplConfig();
+    }
+
+    async componentDidUpdate(prevProps) {
+        const { sourceId,mainCode} = this.props;
+        if(!prevProps || prevProps.sourceId!=sourceId){
+            this.loadLtmplConfig();
+        }else if(mainCode && prevProps.mainCode!=mainCode){//此处处理有效，但不高效
+            this.loadLtmplConfig();
+        }
+    }
+
+    loadLtmplConfig = async () => {
+        const {sourceId} = this.props;
+        let ltmplConfigRes:LtmplConfigRes = await HCDataSource.requestLtmplConfig(sourceId);
+        let criteriaData;
+        //提取 过滤条件的默认值
+        if(ltmplConfigRes){
+           let defaultCriteriaValue=ltmplConfigRes.ltmplConfig.defaultCriteriaValue;
+           if(defaultCriteriaValue){
+               criteriaData=this.toCriteriaData(defaultCriteriaValue);
+           }
+        }
+        this.setState({
+            ltmplConfigRes,criteriaData
+        })
+    }
+    toCriteriaData =  (values:object) => {
+       let  criteriaData={};
+        if(values){
+            for (let key in values) {
+                criteriaData[key]=Units.configParamTrans(values[key]);
+            }
+        }
+        criteriaData['sequence']=Units.getRandomNum(6);
+        return criteriaData;
+    }
+
+
+    // async componentDidUpdate(prevProps) {
+    //     const {location} = this.props;
+    //     const { sourceId} = this.props.match.params;
+    //     let { sourceId: preSourceId} = prevProps.match.params;
+    //     let {location: preLocation} = prevProps;
+    //
+    //     if ( !sourceId ||
+    //         ( !preSourceId && this.state.ltmplConfigRes)
+    //         || (location.pathname == preLocation.pathname && location.search == preLocation.search)
+    //     ) {
+    //         return;
+    //     }
+    //     this.loadData();
+    // }
+
+    showView = (code: string) => {
+        // const { sourceId} = this.props.match.params;
+        // this.onRoute(`/${sourceId}/detail-view?code=${code}&menuId=${this.getMenuId()}`);
+        this.setState({
+            selectedCode:code,
+            showDtmplView:true,
+        })
+    }
+
+    doEdit = (code: string,mode:string) => {
+        this.setState({
+            selectedCode:code,
+            showDtmplEdit:true,
+        })
+    }
+
+
+
+    doCreate = () => {
+        this.setState({
+            selectedCode:null,
+            showDtmplEdit:true,
+        })
+    }
+
+    doSearch = (params_) => {
+        const { sourceId,mainCode} = this.props;
+        //const oldfliter = history.location.search.slice(1);
+
+        let params = {...params_}
+        //追加过滤条件，hiddenColIds，innerQueryKey
+        if (mainCode) {
+            params['mainCode'] = mainCode;
+        }
+        params['sourceId'] = sourceId;
+       // const criteriaData = Units.transQueryParamsToStr(params);
+       // let flag = true;
+        //if (newfliter && oldfliter != newfliter) { //查询条件更新时
+        this.setState({
+            criteriaData:this.toCriteriaData(params)
+        });
+
+    }
+
+    handleDtmplEdit =  (code: string) => {
+        this.doSearch(this.state.criteriaData);
+        this.setState({
+            showDtmplEdit:false,
+        })
+    }
+
+
+    render() {
+        const {ltmplConfigRes,criteriaData,showDtmplView,selectedCode,showDtmplEdit} = this.state;
+        const { sourceId,mainCode} = this.props;
+
+        if (!ltmplConfigRes) {
+            return <></>;
+        } else {
+            const {buttons}=ltmplConfigRes.ltmplConfig
+            return <>
+                <ActTable  mainCode={mainCode} showView={this.showView}
+                             doSearch={this.doSearch} doEdit={this.doEdit} doCreate={this.doCreate}
+                             sourceId={sourceId} criteriaData={criteriaData}
+                             ltmplConfig={ltmplConfigRes.ltmplConfig}/>
+                {buttons.includes('detail') ?
+                    <ModalDtmplView visible={showDtmplView} onCancel={()=>{
+                    this.setState({
+                        showDtmplView:false,
+                    })}
+                    }
+                                    sourceId={sourceId}
+                                    code={selectedCode}> </ModalDtmplView> : ""}
+                {buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd') ?
+                    <ModalDtmplEdit visible={showDtmplEdit} onCancel={()=>{
+                        this.setState({
+                            showDtmplEdit:false,
+                        })}}
+                        sourceId={sourceId}
+                                    code={selectedCode}
+                                    onOk={this.handleDtmplEdit} />
+                    : ""}
+              </>
+        }
+
+    }
+}
+
+export default CriteriaPage;
+

package/src/{components → aldehyde}/module/ltmpl-page.tsx

@@ -169,7 +169,7 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
                         })}}
                         sourceId={sourceId}
                                     code={selectedCode}
-                                    onOk={this.handleDtmplEdit} />
+                                    onOk={this.handleDtmplEdit}  />
                     : ""}
               </>
         }

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

@@ -81,7 +81,7 @@ class DtmplRoute extends React.PureComponent<DtmplRouteProps, DtmplRoutePropsSta
         let versionId=params['versionId'];
         if(location.pathname.endsWith("detail-view")){
             return (
-                <ActDtmplView goDtmpl={this.goDtmpl} sourceId={sourceId}  versionId={versionId} code={this.getCode()} mainCode={this.getMainCode()}></ActDtmplView>
+                <ActDtmplView goDtmpl={this.goDtmpl} sourceId={sourceId}  versionId={versionId} code={this.getCode()} mainCode={this.getMainCode()}  />
             );
         }else{
             return (

package/src/{components → aldehyde}/routable/import-route.tsx

@@ -5,11 +5,11 @@ import ExcelImport from '../import/excel-import'
 export interface ImportRouteProps extends RouterCompProps {
 
 };
-interface ImportRoutePropsStat{
+interface ImportRouteStat{
 
 }
 
-class ExcelImportRoute extends React.PureComponent<ImportRouteProps, ImportRoutePropsStat> {
+class ExcelImportRoute extends React.PureComponent<ImportRouteProps, ImportRouteStat> {
 
     state = {}
 

package/src/{components → 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 "../form/criteria-form";
+import CriteriaForm from "../../aldehyde/form/criteria-form";
 import ViewControl from "../controls/view-control";
 import Units from "../units";
 import ColumnSelector from './column/column-selector';
-import ExportFrame from '../exportor/export-frame';
+import ExportFrame from '../../aldehyde/exportor/export-frame';
 import {SortableHandle} from 'react-sortable-hoc';
 import L2ActTable from "./l2-act-table";
 import StatViewL2Chart from '../chart/statview-l2-chart'

package/src/{components → aldehyde}/table/column/column-selector.tsx

@@ -19,11 +19,24 @@ interface ColumnSelectorStat {
 
 };
 
-const SortableCheckbox = SortableElement(({value, index,disabledColIds}) => <Col key={index}  span={24}>
+interface SortableElementProps {
+    index:number,
+    value:string,
+    disabledColIds:string[]
+};
+
+interface SortableContainerProps {
+    selected:string[],
+    items:ColumnConfig[],
+    disabledColIds:string[],
+    onChange:(checkedValues:[])=>void
+};
+
+const SortableCheckbox = SortableElement<SortableElementProps>(({value, index,disabledColIds}) => <Col key={index}  span={24}>
     <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(({disabledColIds,items, selected, onChange}) => {
+const SortableGroupContainer = SortableContainer<SortableContainerProps>(({items, selected, onChange,disabledColIds}) => {
     return <Checkbox.Group value={selected} onChange={onChange}>
         <Row style={{width: '148px'}}>
             {items.map((value, index) => (

package/src/aldehyde/table/column/index.css

@@ -0,0 +1,14 @@
+
+.row-dragging {
+    background: #fafafa;
+    border: 1px solid #ccc;
+    z-index: 1031;
+}
+
+.row-dragging div {
+    padding: 14px;
+}
+
+.row-dragging .drag-visible {
+    visibility: visible;
+}

package/src/aldehyde/table/index.css

@@ -0,0 +1,45 @@
+.editTableList .ant-upload-list-picture .ant-upload-list-item{
+    width:110px;
+}
+.SearchForm{
+    padding: 8px;
+    background:#fff;
+    box-shadow:0 0 5px rgb(187, 182, 182);
+    border-radius: 3px
+}
+.actTable button {
+    margin-right: 5px
+}
+.actTable a{
+    margin-right: 5px
+}
+.actTable h3{
+    font-size: 18px
+}
+
+.row-dragging {
+    background: #fafafa;
+    border: 1px solid #ccc;
+    z-index: 9999;
+}
+
+.row-dragging td {
+    padding: 14px;
+}
+
+.row-dragging .drag-visible {
+    visibility: visible;
+}
+
+.opsColumn {
+    min-width: 80px;
+}
+
+/*.collapse .ant-card-body {*/
+/*    padding:0px*/
+/*}*/
+
+/*.ant-card-head-title button{*/
+/*    font-size: 16px;*/
+/*    padding:0px;*/
+/*}*/

package/src/{components → 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 "../form/criteria-form";
+import CriteriaForm from "../../aldehyde/form/criteria-form";
 import ViewControl from "../controls/view-control";
 import SelectedRowsCard from './selected-rows-card'
 

package/src/aldehyde/table/pagination.css

@@ -0,0 +1,15 @@
+.seeTotal{
+    margin-right:20px;
+    text-decoration:underline;
+    cursor:pointer
+}
+.sewTotal{
+    margin-right:20px;
+    text-decoration:none;
+    cursor:auto;
+}
+.Pagination{
+    display:flex;
+    align-items: center;
+    margin-top:10px;
+}

package/src/{components → 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 "../form/criteria-form";
+import CriteriaForm from "../../aldehyde/form/criteria-form";
 import ViewControl from "../controls/view-control";
 
 interface SelectTableProps {

package/src/{components → 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 "../../form/form-Item-group";
+import FormItemGroup from "../../../aldehyde/form/form-Item-group";
 import HcserviceV3 from "../../tmpl/hcservice-v3";
 interface RestatProps {
     onfinish: () => void;

package/src/{components → aldehyde}/tmpl/hc-data-source.tsx

@@ -7,7 +7,7 @@ import {
     LtmplConfig, LtmplConfigRes,
     SelectConfig,
     SourceName,Level2Menu
-} from "../tmpl/interface";
+} from "./interface";
 import HcserviceV3 from './hcservice-v3';
 import ControlTypeSupportor from './control-type-supportor'
 import {message} from "antd";