aldehyde 0.1.80 → 0.1.82

package/src/aldehyde/controls/upload/index.tsx

@@ -86,7 +86,7 @@ export default class Upload extends React.PureComponent<UploadProps, UploadState
                     uid: '-1',
                     name: value_1.base.fileName,
                     status: 'done',
-                    url: Units.api()+'/v3/files'+value_1.base.path+`?@token=${Units.getLocalStorge("hydrocarbonToken")}&disposition=attachment`,
+                    url: Units.api()+'/v3/files'+value_1.base.path+`?@token=${Units.getLocalStorge("hydrocarbonToken")}&@programToken=${Units.programCode()}&disposition=attachment`,
                 })
             }else if(value_1.valid=='new'){
                 fileList.push({

package/src/aldehyde/controls/view-control.tsx

@@ -14,6 +14,7 @@ import Progress from './progress'
 import ColorPicker from "./color-picker";
 import EllipsisText from './text/ellipsis-text'
 import {ProgramConfig} from "../index";
+import SqlCodeEditor from "./code-editor/sql-code-editor";
 //import ChemStruc from "./chemstruc/graph";
 // import HtmlEditor from "../HtmlEditor/tinymce";
 const Loading = <Spin tip="Loading...">
@@ -145,6 +146,9 @@ function renderControl(fieldConfig: FieldConfig, fieldValue: any,pHolderType:Con
             viewControl = <ChemStruc  {...controlProps}></ChemStruc>
             //viewControl = unSupportControl
             break;
+        case 'sql-code-editor':
+            viewControl = <SqlCodeEditor viewOrEdit={'view'} {...controlProps}></SqlCodeEditor>
+            break;
         case 'relselect':
         case 'refselect':
         case 'entity-select':
@@ -160,6 +164,9 @@ function renderControl(fieldConfig: FieldConfig, fieldValue: any,pHolderType:Con
         case 'color':
             viewControl = <ColorPicker {...controlProps}></ColorPicker>
             break;
+        case 'url':
+            viewControl = <a target={"_blank"} href={value}>网址</a>
+            break;
         case 'hidden'://
             viewControl = <Input
                 type="hidden"

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

@@ -135,7 +135,7 @@ export default class ExportFrame extends React.PureComponent<ExportFrameProps, E
         const {title}=this.props;
         const {exportId}=this.state;
         const hydrocarbonToken=Units.getLocalStorge("hydrocarbonToken")
-        Units.downloadFile(Units.joinPath(Units.api(),`/v3/exporter/excel?exportId=${exportId}&@token=${hydrocarbonToken}`),title)
+        Units.downloadFile(Units.joinPath(Units.api(),`/v3/exporter/excel?exportId=${exportId}&@token=${hydrocarbonToken}&@programToken=${Units.programCode()}`),title)
     }
 
     handleCancel=()=>{

package/src/aldehyde/index.tsx

@@ -40,6 +40,8 @@ const SelectTable = loadable(() =>
 //import Loginit from './login/login';
 const Loginit = loadable(() =>
     import("./login/login"), {fallback: Loading});
+const ContextSetter = loadable(() =>
+    import("./login/context-setter"), {fallback: Loading});
 //import DtmplRoute from './routable/dtmpl-route';
 const DtmplRoute = loadable(() =>
     import("./routable/dtmpl-route"), {fallback: Loading});
@@ -91,5 +93,5 @@ const DtmplEditPage = loadable(() =>
 
 export {ActTable,SelectTable,Loginit,DtmplRoute,ImportRoute,LtmplRoute,DtmplViewPage,LtmplPage,Menu2layers,Block,UserBar,
     ResetPassword,Footer,EntryControl,ViewControl,ProgramConfig,HydrocarbonService,QuickEntrance,Workbench,PopoverEntitySelect,DtmplEditCard
-,DatePicker,DtmplEditPage,TmplInterface,TmplDataSource,Superagent,DtmplEdit,HCWelcome,MainPage,ExcelImportRoute,CustomPageRouter,HCCustomPageRouter,L2MenuMessageBar,L2MenuQuickBar,}
+,DatePicker,DtmplEditPage,TmplInterface,TmplDataSource,Superagent,DtmplEdit,HCWelcome,MainPage,ExcelImportRoute,CustomPageRouter,HCCustomPageRouter,L2MenuMessageBar,L2MenuQuickBar,ContextSetter,}
 

package/src/aldehyde/layout/menu/user-bar.tsx

@@ -1,11 +1,12 @@
 import React from 'react'
-import {Dropdown, Menu,Tooltip,Avatar} from 'antd';
-import {UserOutlined,LogoutOutlined,ClearOutlined} from '@ant-design/icons';
+import {Avatar, Button, Descriptions, Dropdown, Menu, Popover, Tooltip,Row,Col} from 'antd';
+import {ClearOutlined, LogoutOutlined, UserOutlined,ProfileOutlined} from '@ant-design/icons';
 import {UserInfo} from "../../tmpl/interface";
 import HcserviceV3 from '../../tmpl/hcservice-v3';
 import HCDataSource from "../../tmpl/hc-data-source";
 import UserInfoBar from "./userinfo-bar"
 import ResetPassword from "./reset-password";
+
 //const confirm = Modal.confirm;
 
 interface UserBarProps {
@@ -13,51 +14,75 @@ interface UserBarProps {
 }
 
 
-interface UserBarState extends UserInfo{
+interface UserBarState extends UserInfo {
 
 }
 
 
 class UserBar extends React.PureComponent<UserBarProps, UserBarState> {
-    state={
-       id:undefined,
-       name:undefined,
-        roles:[],
+    state = {
+        id: undefined,
+        name: undefined,
+        roles: [],
+        context: undefined,
     }
 
     async componentDidMount() {
         let userInfo = await HcserviceV3.getUser();
+        //查询 上下文配置信息
+        let context = await HcserviceV3.getContextSourceValue();
+       // console.log('context', context);
         this.setState({
+            context,
             ...userInfo
         });
     }
 
-    cleanCache=()=>{
-        let {roles}=this.state;
+    cleanCache = () => {
+        let {roles} = this.state;
         let loading = document.getElementById('ajaxLoading');
         loading.style.display = "block";
         HCDataSource.clear(roles);
         loading.style.display = "none";
     }
 
+    getContext = () => {
+        let {context} = this.state;
+        if (context) {
+            console.log('context', context);
+            return <>
+                {context.map((c)=>{
+                    return <Row><Col>{c.label} : {c.content}</Col></Row>
+            })}
+            </>
+        }
+        return "无"
+
+    }
+    toSetContext=()=>{
+        window.location.hash = "#/context-setter";
+    }
 
     render() {
-        const {name} = this.state;
+        const {name, context} = this.state;
 
         const menu = (
-            <Menu style={{minWidth:'100px'}}>
+            <Menu style={{minWidth: '100px'}}>
                 <Menu.Item>
-                        <UserInfoBar />
+                    <UserInfoBar/>
                 </Menu.Item>
+                {context && context.length>0 ? <Menu.Item>
+                        <span onClick={this.toSetContext} ><ProfileOutlined />全局配置</span>
+                </Menu.Item> : null}
                 <Menu.Item>
                     <ResetPassword></ResetPassword>
                 </Menu.Item>
                 <Menu.Item>
-                    <span onClick={this.cleanCache}><ClearOutlined />清空缓存</span>
+                    <span onClick={this.cleanCache}><ClearOutlined/>清空缓存</span>
                 </Menu.Item>
                 <Menu.Item>
-                        <span onClick={HcserviceV3.logout}><LogoutOutlined/>退出登录</span>
-                 </Menu.Item>
+                    <span onClick={HcserviceV3.logout}><LogoutOutlined/>退出登录</span>
+                </Menu.Item>
             </Menu>
         );
         return (
@@ -70,7 +95,7 @@ class UserBar extends React.PureComponent<UserBarProps, UserBarState> {
                         {/*</Tooltip>*/}
                         {/*<UserOutlined/>*/}
                         <Tooltip placement="left" title={name}>
-                            <Avatar className={'loginAvatar'}  icon={ <UserOutlined/>} size="large" >
+                            <Avatar className={'loginAvatar'} icon={<UserOutlined/>} size="large">
                                 {/*{name ?name.substring(0,1).toUpperCase():null}*/}
                             </Avatar>
                             {/*<span>{name && name.length>=8?name.substring(0,5)+'...':name}</span>*/}

package/src/aldehyde/login/context-setter.tsx

@@ -0,0 +1,124 @@
+import React from 'react'
+// import StatActTable from '../table/stat-act-table'
+import {Button, Col, Form, FormInstance, Modal, Row} from "antd";
+import EntryControl from "../controls/entry-control";
+import HCserviceV3 from "../tmpl/hcservice-v3";
+
+//以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
+
+export interface ContextSetterProps {
+    // match:any,
+};
+
+export interface ContextSetterState {
+    loading:boolean,
+    config: object,
+    context:object,
+};
+
+class LtmplPage extends React.PureComponent<ContextSetterProps, ContextSetterState> {
+
+    state = {
+        loading:false,
+        config: null,
+        context:null,
+    }
+    formRef = React.createRef<FormInstance>();
+    static defaultProps = {}
+
+    async componentDidMount() {
+        let config = await HCserviceV3.getContextSourceConfig();
+        let context = await HCserviceV3.getContextSourceValue();
+        debugger
+        if (!config || config.length==0) {
+            config = []
+            window.location.hash = "#/home";
+            return;
+        }
+        this.setState({
+            config,
+            context,
+            loading: false
+        })
+    }
+
+    async componentDidUpdate(prevProps) {
+
+    }
+
+    handleSubmit =async () => {
+        this.setState({
+            loading: true
+        })
+        let { config} = this.state
+
+        await this.formRef.current.validateFields().then(async (values) => {
+                let json = {}
+                config.forEach((c) => {
+                    json[c.id] = values[c.id];
+                })
+                let res = await HCserviceV3.setContext(json);
+                // if (res.status === 'error') {
+                //     await this.getKaptchaToken();
+                // }
+            }
+        ).catch(errorInfo => {
+        })
+        this.setState({
+            loading: false
+        })
+    }
+
+
+    render() {
+
+        const {config,loading,context}=this.state;
+        return <Modal title="全局配置" closable={false} open={true} footer={[]}>
+            <Row  justify="center" align="middle" >
+                <Col>
+                    <Form style={{width: 350}} ref={this.formRef}
+                          name="normal_login"
+                          className="login-form"
+                          initialValues={{remember: true}}
+                    >
+                        {config ? config.map((c) => {
+                            let initialValue=null;
+                            if(context ){
+                                context.forEach((con)=>{
+                                    if(con.moduleName== c.moduleName){
+                                        initialValue=con.selectedValues;
+                                    }
+                                })
+                            }
+                            return <Form.Item
+                                name={c.id} initialValue={initialValue} rules={[{required: true, message: '请选择' + c.title}]}
+                            >
+                                <EntryControl id={'14'}
+                                              fieldConfig={{
+                                                  id: c.groupId,
+                                                  title: c.title,
+                                                  controlType: 'entity-select',
+                                                  max: "1",
+                                                  required: true,
+                                                  suppleOptions: c.canNotSet ? [{code: 'all', title: '不设置'}] : undefined
+                                              }}
+                                />
+                            </Form.Item>
+                        }) : null}
+                        <Form.Item>
+                            <Button type="primary" style={{width: '100%'}} loading={loading} onClick={this.handleSubmit}
+                                    className="login-form-button">
+                                确 定
+                            </Button>
+                        </Form.Item>
+                    </Form>
+                </Col>
+            </Row>
+        </Modal>
+
+
+    }
+}
+
+export default LtmplPage;
+

package/src/aldehyde/login/login-context.js

@@ -0,0 +1,175 @@
+import React from 'react'
+import './index.css'
+import {Button, Col, Form, Input, Row} from 'antd'
+import {LockOutlined, SafetyCertificateOutlined, UserOutlined} from '@ant-design/icons';
+import HCserviceV3 from "../tmpl/hcservice-v3"
+import EntryControl from "../controls/entry-control";
+
+export default class Loginit extends React.Component {
+    state = {
+        username: "",
+        password: "",
+        loading: true,
+        needKaptcha: false,
+        kaptchaImg: null,
+        kaptchaToken: null,
+        config: null,
+    }
+    formRef = React.createRef();
+
+    componentDidMount = async () => {
+        if (this.props && this.props.match && this.props.match.params) {
+            const {programCode} = this.props.match.params;
+            if (programCode) {
+                window.localStorage['programCode'] = programCode;
+            }
+        }
+        let pubkey = await HCserviceV3.getRasPubkey();
+        let config = await HCserviceV3.getContextSourceConfig();
+        if (!config) {
+            config = []
+        }
+        this.setState({
+            config,
+            pubkey,
+            loading: false
+        })
+
+    }
+
+    getKaptchaToken = async () => {
+        let res = await HCserviceV3.getKaptchaToken();
+        if (res) {
+            let kaptchaImg = `data:image/png;base64,${res.img}`;
+            this.setState({
+                kaptchaImg,
+                kaptchaToken: res.kaptchaToken,
+                needKaptcha: true
+            })
+        }
+    }
+
+    handleSubmit = async () => {
+
+        this.setState({
+            loading: true
+        })
+        let {kaptchaToken, pubkey, config} = this.state
+
+        await this.formRef.current.validateFields().then(async (values) => {
+
+                let json = {username: values.username, password: values.password}
+                config.forEach((c) => {
+                    json[c.id] = values[c.id];
+                })
+
+                let res = await HCserviceV3.login(json, kaptchaToken, values.kaptchaText, pubkey);
+                if (res.status === 'error') {
+                    //message.info(res.message);
+                    await this.getKaptchaToken();
+                }
+            }
+        ).catch(errorInfo => {
+        })
+        this.setState({
+            loading: false
+        })
+    }
+
+    handleKeyDown = (event) => { //按下enter键，触发login事件
+        switch (event.keyCode) {
+            case 13:
+                this.handleSubmit();
+                break;
+            default:
+                break;
+        }
+    }
+
+    changeKaptcha = async (event) => { //切换验证码
+        await this.getKaptchaToken();
+    }
+
+    componentDidMount() {
+        window.removeEventListener('keydown', this.handleKeyDown)
+    }
+
+    render() {
+        const {username, password, loading, needKaptcha, kaptchaImg, config} = this.state
+
+        return (<Row type="flex" justify="center" align="middle" className="login">
+                <Col>
+                    <Form style={{width: 350}} ref={this.formRef}
+                          name="normal_login"
+                          className="login-form"
+                          initialValues={{remember: true}}
+                    ><h3>欢迎登录</h3>
+                        {
+                            config ? config.map((c) => {
+                                return <Form.Item
+                                    name={c.id} rules={[{required: true, message: '请选择' + c.title}]}
+                                >
+                                    <EntryControl id={'14'}
+                                    fieldConfig={{
+                                    id: c.groupId,
+                                    title: c.title,
+                                    controlType: 'entity-select',
+                                    max: "1",
+                                    required: true,
+                                    suppleOptions: c.canNotSet ? [{code: 'all', title: '不设置'}] : undefined
+                                }}
+                                />
+                            </Form.Item>
+                            }) : null
+                        }
+                        {config ? <>
+                            <Form.Item
+                                name="username"
+                                rules={[{required: true, message: '请输入用户名!'}, {max: 20, min: 0, message: '输入0-20个字符'},]}
+                            >
+                                <Input prefix={<UserOutlined className="site-form-item-icon"/>} placeholder="用户名"
+                                />
+                            </Form.Item>
+                            <Form.Item
+                                name="password"
+                                rules={[{required: true, message: '请输入密码!'}]}
+                            >
+                                <Input.Password
+                                    placeholder="密码"
+                                    onKeyDown={this.handleKeyDown}
+                                    prefix={<LockOutlined className="site-form-item-icon"/>}
+                                />
+                            </Form.Item></> : null}
+                        {
+                            needKaptcha ? <Row gutter={8}>
+                                <Col span={12}>
+                                    <Form.Item
+                                        name="kaptchaText"
+                                        rules={[{required: true, message: '请输入验证码!'}]}
+                                    >
+                                        <Input prefix={<SafetyCertificateOutlined className="site-form-item-icon"/>}
+                                               placeholder="验证码"
+                                               onKeyDown={this.handleKeyDown}
+                                        />
+                                    </Form.Item>
+                                </Col>
+                                <Col span={12}>
+                                    <img style={{"cursor": "pointer"}} height={30} width={90} title={'点击刷新'}
+                                         onClick={this.changeKaptcha}
+                                         src={kaptchaImg}></img>
+                                </Col>
+                            </Row> : ""
+                        }
+                        <Form.Item>
+                            <Button type="primary" style={{width: '100%'}} loading={loading} onClick={this.handleSubmit}
+                                    className="login-form-button">
+                                登录
+                            </Button>
+                        </Form.Item>
+                    </Form>
+                </Col>
+            </Row>
+        )
+    }
+
+}

package/src/aldehyde/login/login.js

@@ -1,6 +1,6 @@
 import React from 'react'
 import './index.css'
-import {Button, Col, Form, Image, Input, message, Row} from 'antd'
+import {Button, Col, Form, Input, Row} from 'antd'
 import {LockOutlined, SafetyCertificateOutlined, UserOutlined} from '@ant-design/icons';
 import HCserviceV3 from "../tmpl/hcservice-v3"
 
@@ -9,17 +9,17 @@ export default class Loginit extends React.Component {
         username: "",
         password: "",
         loading: true,
-        needKaptcha:false,
-        kaptchaImg:null,
-        kaptchaToken:null
+        needKaptcha: false,
+        kaptchaImg: null,
+        kaptchaToken: null,
     }
     formRef = React.createRef();
 
-    componentDidMount=async ()=> {
-        if(this.props && this.props.match &&  this.props.match.params){
+    componentDidMount = async () => {
+        if (this.props && this.props.match && this.props.match.params) {
             const {programCode} = this.props.match.params;
-            if(programCode){
-                window.localStorage['programCode']=programCode;
+            if (programCode) {
+                window.localStorage['programCode'] = programCode;
             }
         }
         let pubkey = await HCserviceV3.getRasPubkey();
@@ -30,16 +30,16 @@ export default class Loginit extends React.Component {
 
     }
 
-    getKaptchaToken=async ()=>{
-       let res= await HCserviceV3.getKaptchaToken();
-       if(res){
-           let  kaptchaImg=`data:image/png;base64,${res.img}`;
-           this.setState({
-               kaptchaImg,
-               kaptchaToken:res.kaptchaToken,
-               needKaptcha:true
-           })
-       }
+    getKaptchaToken = async () => {
+        let res = await HCserviceV3.getKaptchaToken();
+        if (res) {
+            let kaptchaImg = `data:image/png;base64,${res.img}`;
+            this.setState({
+                kaptchaImg,
+                kaptchaToken: res.kaptchaToken,
+                needKaptcha: true
+            })
+        }
     }
 
     handleSubmit = async () => {
@@ -47,10 +47,12 @@ export default class Loginit extends React.Component {
         this.setState({
             loading: true
         })
-        let {kaptchaToken,pubkey}=this.state
+        let {kaptchaToken, pubkey} = this.state
 
         await this.formRef.current.validateFields().then(async (values) => {
-                let res = await HCserviceV3.login(values.username, values.password,kaptchaToken,values.kaptchaText,pubkey);
+
+                let json = {username: values.username, password: values.password}
+                let res = await HCserviceV3.login(json, kaptchaToken, values.kaptchaText, pubkey);
                 if (res.status === 'error') {
                     //message.info(res.message);
                     await this.getKaptchaToken();
@@ -73,8 +75,8 @@ export default class Loginit extends React.Component {
         }
     }
 
-    changeKaptcha =async  (event) => { //切换验证码
-        await  this.getKaptchaToken();
+    changeKaptcha = async (event) => { //切换验证码
+        await this.getKaptchaToken();
     }
 
     componentDidMount() {
@@ -82,7 +84,7 @@ export default class Loginit extends React.Component {
     }
 
     render() {
-        const {username, password, loading,needKaptcha,kaptchaImg} = this.state
+        const {username, password, loading, needKaptcha, kaptchaImg, config} = this.state
 
         return (<Row type="flex" justify="center" align="middle" className="login">
                 <Col>
@@ -91,25 +93,26 @@ export default class Loginit extends React.Component {
                           className="login-form"
                           initialValues={{remember: true}}
                     ><h3>欢迎登录</h3>
-                        <Form.Item
-                            name="username"
-                            rules={[{required: true, message: '请输入用户名!'}, {max: 20, min: 0, message: '输入0-20个字符'},]}
-                        >
-                            <Input prefix={<UserOutlined className="site-form-item-icon"/>} placeholder="用户名"
-                            />
-                        </Form.Item>
-                        <Form.Item
-                            name="password"
-                            rules={[{required: true, message: '请输入密码!'}]}
-                        >
-                            <Input.Password
-                                            placeholder="密码"
-                                            onKeyDown={this.handleKeyDown}
-                                            prefix={<LockOutlined className="site-form-item-icon"/>}
-                            />
-                        </Form.Item>
+                        <>
+                            <Form.Item
+                                name="username"
+                                rules={[{required: true, message: '请输入用户名!'}, {max: 20, min: 0, message: '输入0-20个字符'},]}
+                            >
+                                <Input prefix={<UserOutlined className="site-form-item-icon"/>} placeholder="用户名"
+                                />
+                            </Form.Item>
+                            <Form.Item
+                                name="password"
+                                rules={[{required: true, message: '请输入密码!'}]}
+                            >
+                                <Input.Password
+                                    placeholder="密码"
+                                    onKeyDown={this.handleKeyDown}
+                                    prefix={<LockOutlined className="site-form-item-icon"/>}
+                                />
+                            </Form.Item></>
                         {
-                            needKaptcha?<Row gutter={8} >
+                            needKaptcha ? <Row gutter={8}>
                                 <Col span={12}>
                                     <Form.Item
                                         name="kaptchaText"
@@ -122,10 +125,11 @@ export default class Loginit extends React.Component {
                                     </Form.Item>
                                 </Col>
                                 <Col span={12}>
-                                    <img style={{"cursor":"pointer"}}  height={30} width={90}  title={'点击刷新'} onClick={this.changeKaptcha}
-                                           src={kaptchaImg}></img>
+                                    <img style={{"cursor": "pointer"}} height={30} width={90} title={'点击刷新'}
+                                         onClick={this.changeKaptcha}
+                                         src={kaptchaImg}></img>
                                 </Col>
-                            </Row>:""
+                            </Row> : ""
                         }
                         <Form.Item>
                             <Button type="primary" style={{width: '100%'}} loading={loading} onClick={this.handleSubmit}

package/src/aldehyde/module/ltmpl-page.tsx

@@ -6,7 +6,6 @@ import ActTable,{Mode} from '../table/act-table'
 import HCDataSource from "../tmpl/hc-data-source";
 import ModalDtmplView from "../detail/view/modal-dtmpl-view";
 import DtmplEditPage from "../detail/edit/dtmpl-edit-page";
-import HcserviceV3 from "../tmpl/hcservice-v3";
 import {Button, Drawer, Space} from "antd";
 
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。

package/src/aldehyde/tmpl/control-type-supportor.tsx

@@ -62,7 +62,7 @@ SupportInputTypes.add('entity-select');
 SupportInputTypes.add('table-entity-select');
 SupportInputTypes.add('modal-entity-select');
 SupportInputTypes.add('color');
-
+SupportInputTypes.add('url');
 SupportInputTypes.add('hidden');
 SupportInputTypes.add('lab-tree-select');
 function ControlTypeSupportor(){