aldehyde 0.1.17 → 0.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aldehyde",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "author": "cosmicparticle",
   "main": "lib/index.js",
   "module": "src/aldehyde/index.txs",

package/src/aldehyde/controls/auto-complete/index.tsx

@@ -1,7 +1,6 @@
 import React from 'react'
 import {AutoComplete as AntdAutoComplete, Input} from "antd";
 import {EControlProps} from "../../tmpl/interface";
-import Units from "../../units";
 import HCDataSource from "../../tmpl/hc-data-source";
 
 const {TextArea} = Input;

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

@@ -0,0 +1,114 @@
+import React from 'react'
+import {ButtonProps, Cascader as AntdCascader} from 'antd'
+import { EControlProps, EnumItem} from "../../tmpl/interface";
+import HCDataSource from "../../tmpl/hc-data-source";
+
+interface CascaderProps extends EControlProps{
+
+    baseValue?:string[],//baseValue 指定后不能修改
+
+}
+
+interface CascaderState {
+    options:object[]
+}
+
+export default class Cascader extends React.PureComponent<CascaderProps, CascaderState> {
+
+    static defaultProps={
+        baseValue:[],//['level1','level2']
+    }
+
+    state={
+        options:[],
+    }
+
+    async componentDidMount() {
+      let options=  await this.getOptions();
+      this.setState({
+          options
+      })
+    }
+
+
+    handleChange=(value)=>{
+        const { onChange } = this.props
+        let res=undefined
+        console.log('Cascader',value);
+        if(value){
+            res=value.join("->")
+            console.log("value.join(\"->\")",res)
+        }
+        if (onChange) {
+            onChange(res);
+        }
+    }
+
+    getOptions=async ()=>{
+        const { fieldConfig,baseValue }=this.props
+       let options= await HCDataSource.getOptions(fieldConfig.mstrucId);
+		const ops=[]
+        let newOptions=[];
+
+		let nextOptions=options;
+		let currentOptions=newOptions;
+        //先根据 baseValue 过滤一层
+        if(baseValue.length>0){
+            baseValue.map((v,i)=>{
+                if(i>0){
+                    currentOptions[0].subOptions=[];
+                    currentOptions= currentOptions[0].subOptions;
+                }
+                if(nextOptions){
+                    for(let option of nextOptions){
+                        if(option.title==v){
+                            currentOptions.push({...option});
+                            nextOptions=option.subOptions;
+                        }
+                    }
+                }
+            })
+
+        }else{
+            newOptions=options;
+        }
+
+
+        this.buildOptions(newOptions,ops);
+
+
+
+		return ops;
+    }
+
+    buildOptions=(options:EnumItem[],ops:object[])=>{
+        options.forEach((item)=>{
+            const op={}
+            op["value"]=item.title
+            op["label"]=item.title
+            op["key"]=item.id
+            ops.push(op);
+            if(item.subOptions){
+                let children=[];
+                op['children']=children;
+                this.buildOptions(item.subOptions,children);
+            }else{
+                op["isLeaf"]= true;
+            }
+        })
+    }
+
+    render(){
+        const {options}=this.state;
+        const { fieldConfig,onChange,value,...other}=this.props
+        return (
+            <AntdCascader
+                displayRender={label=>label.join('->')}
+                options={options}
+                value={value?value.split('->'):undefined}
+                onChange={this.handleChange}
+                {...other}
+            />
+        )
+    }
+}

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

@@ -5,13 +5,14 @@ import LtmplPage from "./../../module/ltmpl-page";
 import {
     EditOutlined,
 } from '@ant-design/icons';
-
 import Units from '../../units'
 import ModalDtmplEdit from "../../detail/edit/modal-dtmpl-edit";
-
+import DtmplEdit from "../../detail/edit/dtmpl-edit";
+export type PageType='modal'|'drawer'
 interface CquickButtonProps extends ButtonProps{
     mainCode:string;
     cQueryConfig:CQueryConfig;
+    pageType:PageType;
 }
 
 interface CquickButtonState {
@@ -29,7 +30,9 @@ class CquickButton extends React.PureComponent<CquickButtonProps, CquickButtonSt
     }
 
 
-
+    static defaultProps={
+        pageType:'modal'
+    }
 
     showDraw=(currentId:string)=>{
         // console.log("点击了L2MenuQuickBar",currentId);
@@ -47,9 +50,8 @@ class CquickButton extends React.PureComponent<CquickButtonProps, CquickButtonSt
 
 
     render() {
-        const {cQueryConfig,mainCode,type,...button}=this.props;
+        const {cQueryConfig,mainCode,type,pageType,...button}=this.props;
         const {showDraw,} = this.state;
-
         console.log("cQuery mainCode",mainCode);
        let mcode=mainCode && mainCode.indexOf("@R@")>0?mainCode.split("@R@")[0]:mainCode;
         return (
@@ -65,13 +67,34 @@ class CquickButton extends React.PureComponent<CquickButtonProps, CquickButtonSt
                 }}>{outlinedMap[cQueryConfig.title]?outlinedMap[cQueryConfig.title]:cQueryConfig.title}</Button>}
                 {!showDraw?null:
                     cQueryConfig.type=='edit'?
-                        <ModalDtmplEdit visible={showDraw} onCancel={()=>{
+                        pageType=='modal'? <ModalDtmplEdit visible={showDraw} onCancel={()=>{
                             this.setState({
                                 showDraw:false,
                             })}}
                              sourceId={cQueryConfig.id}
                              code={mcode}
                              onOk={this.closeDrawer} />:
+                            <Drawer
+                                placement={'left'}
+                                closable={true}
+                                mask={false}
+                                onClose={this.closeDrawer}
+                                visible={showDraw}
+                                width={'calc(100% - 280px)'}
+                                style={{
+                                    maxWidth: 1960,
+                                    overflowY:'hidden',
+                                }}
+                                extra={
+                                    <Space>
+                                        <Button  onClick={this.closeDrawer}>关闭</Button>
+                                    </Space>
+                                }
+                            >
+
+                                <DtmplEdit  sourceId={cQueryConfig.id} code={mcode}   ></DtmplEdit>
+                            </Drawer>
+                            :
                         <Drawer
                             placement={'left'}
                             title="关联查询"
@@ -94,8 +117,7 @@ class CquickButton extends React.PureComponent<CquickButtonProps, CquickButtonSt
                             }
                         </Drawer>
                 }
-
-            </>
+                </>
         );
     }
 }

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

@@ -12,7 +12,7 @@ import loadable from "@loadable/component";
 import HCDataSource from "../tmpl/hc-data-source";
 import Upload from '../controls/upload';
 import Progress from './progress'
-
+import Cascader from './cascader'
 import EntitySelect from "./entity-select/entity-select";
 import PopoverEntitySelect from './entity-select/popover-entity-select'
 import ColorPicker from './color-picker'
@@ -183,7 +183,7 @@ function renderControl(id:any,fieldConfig: FieldConfig, fieldValue: any, onChang
             entryControl = <AutoComplete {...controlProps} />
             break;
         case 'caselect':
-            entryControl = unSupportControl;
+            entryControl =<Cascader {...controlProps}></Cascader>;
             break;
         case 'relation':
             entryControl = unSupportControl;

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

@@ -126,7 +126,7 @@ function renderControl(fieldConfig: FieldConfig, fieldValue: any,pHolderType:Con
             viewControl = unSupportControl;
             break;
         case 'caselect':
-            viewControl = unSupportControl;
+            viewControl = <span className="infoStyle">{value}</span>;
             break;
         case 'relation':
             viewControl = unSupportControl

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

@@ -104,8 +104,11 @@ class SubmitButtonBar extends React.PureComponent<SubmitButtonProps, SubmitButto
 
 
         return (
-            <Affix style={{position: 'absolute', right: 10, maxHeight: 100}}
-                   offsetBottom={this.calcOffsetBottom(buttons, actions)}>
+            <Affix
+                //style={{position: 'absolute', right: 10, maxHeight: 100}}
+                   // offsetBottom={this.calcOffsetBottom(buttons, actions)}>
+                   style={{position: 'absolute',bottom:60,right: 15,}}  offsetBottom={this.calcOffsetBottom(buttons, actions)}
+            >
                 <div className={'submitButtonBar'} >
                     <ul>
                         {buttons.includes('dtmplSave') ? <li key={100}>

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

@@ -12,8 +12,8 @@ import HcserviceV3 from "../../tmpl/hcservice-v3";
 import  CqueryButtonBar from "../button/cquery-button-bar"
 
 interface DtmplEditProps extends DtmplBaseProps {
-    goBackToLtmpl: () => void,
-    addOrUpdate:AddOrUpdate,
+    goBackToLtmpl?: () => void,
+    addOrUpdate?:AddOrUpdate,
 }
 
 interface DtmplEditState {

package/src/aldehyde/index.tsx

@@ -4,7 +4,8 @@ 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 DtmplViewPage from './module/dtmpl-view-page';
+import DtmplEdit from './detail/edit/dtmpl-edit';
 import LtmplPage from './module/ltmpl-page';
 import Menu2layers from './layout/menu/menu-2layers';
 import Block from './layout/menu/block';
@@ -24,7 +25,7 @@ import TmplDataSource from './tmpl/hc-data-source';
 import * as TmplInterface from './tmpl/interface';
 import Superagent from './tmpl/superagent';
 
-export {ActTable,SelectTable,Loginit,DtmplRoute,ImportRoute,LtmplRoute,DtmplPage,LtmplPage,Menu2layers,Block,UserBar,
+export {ActTable,SelectTable,Loginit,DtmplRoute,ImportRoute,LtmplRoute,DtmplViewPage,LtmplPage,Menu2layers,Block,UserBar,
     ResetPassword,Footer,EntryControl,ViewControl,ProgramConfig,HydrocarbonService,QuickEntrance,Workbench,PopoverEntitySelect
-,DatePicker,ModalDtmplEdit,TmplInterface,TmplDataSource,Superagent}
+,DatePicker,ModalDtmplEdit,TmplInterface,TmplDataSource,Superagent,DtmplEdit}
 

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

@@ -1,7 +1,7 @@
 import React from 'react'
 import { Drawer, Space,Button} from 'antd'
 import {SolutionOutlined} from '@ant-design/icons';
-import DtmplPage from "../../module/dtmpl-page";
+import DtmplViewPage from "../../module/dtmpl-view-page";
 
 interface UserInfoBarProps {
 
@@ -54,7 +54,7 @@ class UserInfoBar extends React.PureComponent<UserInfoBarProps, UserInfoBarState
                         </Space>
                     }
                 >
-                   <DtmplPage sourceId={'0'} code={"userCode"}></DtmplPage>
+                   <DtmplViewPage sourceId={'0'} code={"userCode"}></DtmplViewPage>
                 </Drawer>
             </>
         );

package/src/aldehyde/module/{dtmpl-page.tsx → dtmpl-view-page.tsx}

@@ -1,27 +1,20 @@
 import React from 'react'
-import {DtmplConfig, 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";
 import ActDtmplView from "../detail/view/act-dtmpl-view";
 
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
 
-export interface DtmplPageProps  {
+export interface DtmplViewPageProps  {
     sourceId?:string,
     code?:string;
     mainCode?:string;
 };
 
-export interface DtmplPageState  {
+export interface DtmplViewPageState  {
     showDtmplEdit:boolean;
 };
 
-class DtmplPage extends React.PureComponent<DtmplPageProps, DtmplPageState> {
+class DtmplViewPage extends React.PureComponent<DtmplViewPageProps, DtmplViewPageState> {
 
     state = {
         showDtmplEdit:false,
@@ -66,5 +59,5 @@ class DtmplPage extends React.PureComponent<DtmplPageProps, DtmplPageState> {
     }
 }
 
-export default DtmplPage;
+export default DtmplViewPage;
 

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

@@ -287,9 +287,9 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
                                 //                onClick={() => this.doRowCQuery(cQuery.id, record.code)}
                                 // >{cQuery.title}</Button>;
                                 console.log("record record",record);
-                                return <CquickButton key={cquery.id} size={"small"}
+                                return <CquickButton key={cquery.id} size={"small"}  pageType={'drawer'}
                                     // onClick={() => doCQuery(cquery.id)}
-                                                     disabled={false} cQueryConfig={cquery} mainCode={cquery.mainCodeColId?record[cquery.mainCodeColId]:record.code}/>
+                                                     cQueryConfig={cquery} mainCode={cquery.mainCodeColId?record[cquery.mainCodeColId]:record.code}/>
                             }) : ""}
                         </Space>);
             } else {

package/src/aldehyde/tmpl/hc-data-source.tsx

@@ -2,8 +2,8 @@ import {
     BlockMenu,
     DtmplConfig,
     EnumItem,
-    FieldBase, LtmplConfigRes,
-    SelectConfig, Level2Menu
+    FieldBase, LtmplConfigRes,ActionConfig,
+    SelectConfig, Level2Menu,LtmplConfig
 } from "./interface";
 import HcserviceV3 from './hcservice-v3';
 import ControlTypeSupportor from './control-type-supportor'
@@ -13,7 +13,8 @@ const blocksCache: BlockMenu[] = [];
 const quickEntranceCache: Level2Menu[] = [];
 const messageCache: Level2Menu[] = [];
 const workbenchCache: Level2Menu[] = [];
-const enumMap: Map<string, EnumItem[]> = new Map<string, EnumItem[]>();
+const enumMap: Map<string, EnumItem[]> = new Map<string, EnumItem[]>();//key mstrucId
+const optionsMap: Map<string, EnumItem[]> = new Map<string, EnumItem[]>();//key mstrucId
 const selectConfigMap: Map<string, SelectConfig> = new Map<string, SelectConfig>();
 const ltmplConfigMap: Map<string, LtmplConfigRes> = new Map<string, LtmplConfigRes>();
 const l2LtmplConfigMap: Map<string, LtmplConfigRes> = new Map<string, LtmplConfigRes>();
@@ -35,6 +36,19 @@ function findUnloadEnumMstrucIdOfFields(fields:FieldBase[]) {
     return mstrucIdArray;
 }
 
+function findUnloadEnumMstrucIdOfActions(actions:ActionConfig[]) {
+    const mstrucIds = [];
+    if (actions) {
+        actions.forEach((item) => {
+            let subs= findUnloadEnumMstrucIdOfFields(item.writes);
+            concat(mstrucIds,subs);
+            subs= findUnloadEnumMstrucIdOfFields(item.preposes);
+            concat(mstrucIds,subs);
+        });
+    }
+    return mstrucIds;
+}
+
 async function loadEnumOfDtmplConfig(selectConfig:DtmplConfig){
     const mstrucIds = [];
     if(selectConfig.groups){
@@ -43,6 +57,8 @@ async function loadEnumOfDtmplConfig(selectConfig:DtmplConfig){
             concat(mstrucIds,subs);
         })
     }
+    let subs= findUnloadEnumMstrucIdOfActions(selectConfig.actions);
+    concat(mstrucIds,subs);
     await loadEnum(mstrucIds);
 }
 
@@ -57,12 +73,29 @@ function concat(mstrucIds,sub){
     return mstrucIds;
 }
 
-async function loadEnumOfSelectConfig(selectConfig:SelectConfig){
+async function loadEnumOfSelectConfig(selectConfig:SelectConfig  ){
+    const mstrucIds = [];
+    let subs= findUnloadEnumMstrucIdOfFields(selectConfig.columns);
+    concat(mstrucIds,subs);
+    subs= findUnloadEnumMstrucIdOfFields(selectConfig.criterias);
+    concat(mstrucIds,subs);
+    await loadEnum(mstrucIds);
+}
+
+async function loadEnumOfLtmplConfig(selectConfig: LtmplConfig ){
     const mstrucIds = [];
    let subs= findUnloadEnumMstrucIdOfFields(selectConfig.columns);
     concat(mstrucIds,subs);
     subs= findUnloadEnumMstrucIdOfFields(selectConfig.criterias);
     concat(mstrucIds,subs);
+    subs= findUnloadEnumMstrucIdOfFields(selectConfig.drillingParams);
+    concat(mstrucIds,subs);
+    subs= findUnloadEnumMstrucIdOfFields(selectConfig.reStatParams);
+    concat(mstrucIds,subs);
+    subs= findUnloadEnumMstrucIdOfActions(selectConfig.actions);
+    concat(mstrucIds,subs);
+    subs= findUnloadEnumMstrucIdOfActions(selectConfig.rowActions);
+    concat(mstrucIds,subs);
     await loadEnum(mstrucIds);
 }
 async function loadEnum(mstrucIds:string[]){
@@ -79,16 +112,35 @@ async function loadEnum(mstrucIds:string[]){
 }
 
 
+
+
 function HCDataSource() {
 
 }
 
+HCDataSource.getOptions = async function (mstrucId:string){
+    if(!mstrucId){
+        return null;
+    }
+    if( !optionsMap.has(mstrucId)){
+        let reqOptions=  await HcserviceV3.requestOptions(mstrucId);
+        for(let option of reqOptions){
+            if(option['css']){
+                option['color']=option['css'].color;
+            }
+        }
+        optionsMap.set(mstrucId,reqOptions);
+    }
+
+    return optionsMap.get(mstrucId);
+}
+
 HCDataSource.requestLtmplConfig = async function ( sourceId: string) {
     if (!ltmplConfigMap.has(sourceId)) {
         ltmplConfigMap.set(sourceId, await HcserviceV3.requestLtmplConfig(sourceId));
         //加载枚举
         let res:LtmplConfigRes=ltmplConfigMap.get(sourceId);
-        await loadEnumOfSelectConfig(res.ltmplConfig);
+        await loadEnumOfLtmplConfig(res.ltmplConfig);
     }
     return ltmplConfigMap.get(sourceId);
 };
@@ -97,7 +149,7 @@ HCDataSource.requestL2LtmplConfig = async function (sourceId: string) {
         l2LtmplConfigMap.set(sourceId, await HcserviceV3.requestL2LtmplConfig(sourceId));
         //加载枚举
         let res:LtmplConfigRes=l2LtmplConfigMap.get(sourceId);
-        await loadEnumOfSelectConfig(res.ltmplConfig);
+        await loadEnumOfLtmplConfig(res.ltmplConfig);
     }
     return l2LtmplConfigMap.get(sourceId);
 };
@@ -218,6 +270,7 @@ HCDataSource.clearOnly =async function () {
     dtmplConfigMap.clear();
     selectConfigMap.clear();
     l2LtmplConfigMap.clear();
+    optionsMap.clear();
     blocksCache.splice(0,blocksCache.length);
     quickEntranceCache.splice(0,quickEntranceCache.length);
     messageCache.splice(0,quickEntranceCache.length);

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -21,6 +21,20 @@ export default class HcserviceV3 {
         }
     }
 
+    static async requestOptions(mstrucId) { //有下拉菜单时，请求下拉选项操作
+        if (mstrucId) {
+            let res = await Super.super({
+                url: `/v3/enum`,
+                query: {
+                    mstrucId
+                },
+            });
+            return res.options;
+        } else {
+            return {};
+        }
+    }
+
     // static async requestSelect(requestedMap, selectMSFieldIdArray) {
     //     //先从当前状态从中找，没有的才去查
     //     //后续可以放在缓存里，但需要一些策略和技巧

package/src/aldehyde/tmpl/interface.tsx

@@ -168,16 +168,19 @@ export interface LtmplConfig extends SelectConfig {
     cQuerys?:CQueryConfig[];
     rowCQuerys?:CQueryConfig[];
     chartType?: ChartType[];
-    reStatParams?: CriteriaConfig[];
     editAction:ActionConfig;
+    reStatParams?: CriteriaConfig[];
+
     drillingParams?: CriteriaConfig[];
 }
 
 export interface EnumItem {
     title: string;
     value: string;
+    id:string;
     color: string;
     order:string;
+    subOptions?:EnumItem[]
 }
 
 export type EditStatus ='new'|'changed'|'persisted'

package/lib/module/dtmpl-page.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"dtmpl-page.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/module/dtmpl-page.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAazB,MAAM,WAAW,cAAc;IAC3B,QAAQ,CAAC,EAAC,MAAM,CAAC;IACjB,IAAI,CAAC,EAAC,MAAM,CAAC;IACb,QAAQ,CAAC,EAAC,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC3B,aAAa,EAAC,OAAO,CAAC;CACzB;AAED,cAAM,SAAU,SAAQ,KAAK,CAAC,aAAa,CAAC,cAAc,EAAE,cAAc,CAAC;IAEvE,KAAK;;MAEJ;IAaD,OAAO,aAIN;IAED,eAAe,SAAW,MAAM,UAI/B;IAED,MAAM;CAcT;AAED,eAAe,SAAS,CAAC"}

package/lib/module/dtmpl-page.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"dtmpl-page.js","sourceRoot":"","sources":["../../../../src/aldehyde/module/dtmpl-page.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAE7D,OAAO,YAAY,MAAM,+BAA+B,CAAC;AAQxD,CAAC;AAID,CAAC;AAEF,MAAM,SAAU,SAAQ,KAAK,CAAC,aAA6C;IAA3E;;QAEI,UAAK,GAAG;YACJ,aAAa,EAAC,KAAK;SACtB,CAAA;QAED,8BAA8B;QAC9B,8BAA8B;QAC9B,IAAI;QACJ,EAAE;QACF,wCAAwC;QACxC,sCAAsC;QACtC,sDAAsD;QACtD,kCAAkC;QAClC,QAAQ;QACR,IAAI;QAEJ,YAAO,GAAC,GAAE,EAAE;YACR,IAAI,CAAC,QAAQ,CAAC;gBACV,aAAa,EAAC,IAAI;aACrB,CAAC,CAAA;QACN,CAAC,CAAA;QAED,oBAAe,GAAI,CAAC,IAAY,EAAE,EAAE;YAChC,IAAI,CAAC,QAAQ,CAAC;gBACV,aAAa,EAAC,KAAK;aACtB,CAAC,CAAA;QACN,CAAC,CAAA;IAgBL,CAAC;IAdG,MAAM;QACF,MAAM,EAAC,aAAa,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QACnC,MAAM,EAAE,QAAQ,EAAC,IAAI,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QACzC,OAAO;YACH,oBAAC,YAAY,IAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,GAAiB;YACpG,oBAAC,cAAc,IAAC,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAE,EAAE;oBAClD,IAAI,CAAC,QAAQ,CAAC;wBACV,aAAa,EAAC,KAAK;qBACtB,CAAC,CAAA;gBAAA,CAAC,EACS,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,IAAI,CAAC,eAAe,GAAI,CACjD,CAAA;IACb,CAAC;CACJ;AAED,eAAe,SAAS,CAAC"}

package/src/aldehyde/controls/cascader/index.js

@@ -1,97 +0,0 @@
-import React from 'react'
-import Super from "../../tmpl/superagent"
-import {Cascader as AntdCascader} from 'antd'
-
-export default class Cascader extends React.Component{
-
-    state={
-        options:[]
-    }
-    handleChange=(value)=>{
-        let res=""
-        res=value.join("->")
-        console.log(res)
-        this.triggerChange(res)
-    }
-    triggerChange = (changedValue) => {
-        const { onChange } = this.props
-        if (onChange) {
-          onChange(changedValue);
-        }
-      }
-    requestLinkage=(optionKey)=>{ //第一级联动
-        const optGroupId=optionKey.split("@")[0]
-        const time=optionKey.split("@")[1]
-        Super.super({
-			url:`/meta/dict/cas_ops/${optGroupId}`,
-		}).then((res)=>{
-			const ops=[]
-            res.options.forEach((item)=>{
-                const op={}
-                op["value"]=item.title
-                op["label"]=item.title
-                op["key"]=item.id
-                op["isLeaf"]= false
-                ops.push(op)
-            })
-            this.setState({
-                options:ops,
-                time
-            })
-		})
-    }
-    loadData = (selectedOptions) => { //子集联动
-        const targetOption = selectedOptions[selectedOptions.length - 1]
-        targetOption.loading = true
-        this.setState({
-            time:this.state.time-1
-        })
-        if(selectedOptions && this.state.time>=1){
-            let id="";
-            selectedOptions.forEach((item)=>{
-                id=item.key
-            })
-            Super.super({
-                url:`v2/meta/dict/cas_ops/${id}`,
-            }).then((res)=>{
-                const ops=[]
-                const time=this.state.time
-                res.options.forEach((item)=>{
-                    let op={}
-                    op["value"]=item.title
-                    op["label"]=item.title
-                    op["key"]=item.id
-                    if(time===1){
-                        op["isLeaf"]= true
-                    }else{
-                        op["isLeaf"]= false
-                    }
-                    ops.push(op)
-                })
-                setTimeout(() => {
-                    targetOption.loading = false;
-                    targetOption.children =ops
-                    this.setState({
-                        options: [...this.state.options],
-                    });
-                }, 300);
-            })
-        }       
-      }
-    
-    render(){
-        const { optionGroupKey,fieldName }=this.props
-        return (
-            <AntdCascader
-                onClick={()=>this.requestLinkage(optionGroupKey)}
-                placeholder={`请选择${fieldName}`}
-                style={{width:220}}
-                options={this.state.options}
-                loadData={this.loadData}
-                displayRender={label=>label.join('->')}
-                getPopupContainer={trigger => trigger.parentNode}
-                onChange={this.handleChange}
-            />
-        )
-    }
-}