aldehyde 0.1.17 → 0.1.20

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

@@ -14,7 +14,7 @@ import SupportInputTypes from '../tmpl/control-type-supportor';
 import TableUnits from "./table-util";
 import ViewControl from "../controls/view-control";
 import ModalDtmplView from '../detail/view/modal-dtmpl-view';
-import ModalDtmplEdit from '../detail/edit/modal-dtmpl-edit'
+import DtmplEditPage from '../detail/edit/dtmpl-edit-page'
 import ModelSelectTable from './modal-select-table';
 import HcserviceV3 from "../tmpl/hcservice-v3";
 import CollapseCard from '../controls/collapse-card'
@@ -41,6 +41,7 @@ interface RelationTableStat {
     showRowEdit: boolean,
     selectedDtmplData: DtmplData,
     filterStr: string,
+    pageSize:number,
 };
 
 
@@ -55,6 +56,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
         showRowEdit: false,
         selectedDtmplData: undefined,
         filterStr: undefined,
+        pageSize:10,
         // columns:[],
         // dataSource:[],
         // current:1,
@@ -306,7 +308,11 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
         })
     }
 
-    tabChange = () => {
+    tabChange = (pagination) => {
+        console.log('pagination',pagination);
+        this.setState({
+            pageSize:pagination.pageSize,
+        })
 
     }
 
@@ -446,6 +452,9 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
             datas.unshift(dtmplData);
         }
         onChange(fieldGroupConfig, datas);
+
+        console.log("handleRowEdit data:",datas);
+
         if (isAdd) {
             message.success('已添加');
         } else {
@@ -525,11 +534,11 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
     render() {
 
         const {fieldGroupConfig, value, parentId, loading, initCollapse} = this.props;
-        const {selectedCode, showDtmplView, showSelectTable, showDtmplEdit, tableLoading, showRowEdit, selectedDtmplData} = this.state;
+        const {pageSize,selectedCode, showDtmplView, showSelectTable, showDtmplEdit, tableLoading, showRowEdit, selectedDtmplData} = this.state;
 
         const {buttons} = fieldGroupConfig;
         let page = {
-            pageSize: 10,
+            pageSize: pageSize,
             hideOnSinglePage: true,
             defaultCurrent: 1,
             total: value ? value.length : undefined,
@@ -575,10 +584,10 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                                         sourceId={fieldGroupConfig.id}
                                         code={selectedCode}> </ModalDtmplView> : ""}
                     {buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd') ?
-                        <ModalDtmplEdit visible={showDtmplEdit} onCancel={this.hiddenEntityEdit}
-                                        sourceId={fieldGroupConfig.id}
-                                        code={selectedCode}
-                                        onOk={selectedCode ? this.handleDtmplEdit : this.handleDtmplAdd} />
+                        <DtmplEditPage visible={showDtmplEdit} onCancel={this.hiddenEntityEdit}
+                                       sourceId={fieldGroupConfig.id}
+                                       code={selectedCode}
+                                       onOk={selectedCode ? this.handleDtmplEdit : this.handleDtmplAdd} />
                         : ""}
                     {/*{buttons.includes('rowEdit') || buttons.includes('rowAdd') ?*/}
                     {/*    <ModalRowEdit visible={showRowEdit} onCancel={this.hiddenRowEdit}*/}

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

@@ -1,5 +1,6 @@
 import {ColumnConfig, EnumItem, FieldBase, FieldConfig} from "./interface";
 import HCDataSource from "./hc-data-source";
+import {ProgramConfig} from "../index";
 
 const SupportInputTypes:Set<string>=new Set<string>();
 SupportInputTypes.add('date-YY');
@@ -61,12 +62,17 @@ SupportInputTypes.add('modal-entity-select');
 SupportInputTypes.add('color');
 
 SupportInputTypes.add('hidden');
+SupportInputTypes.add('lab-tree-select');
 function ControlTypeSupportor(){
 
 }
 ControlTypeSupportor.isSupport=function(type:string):boolean {
     if(type){
-        return SupportInputTypes.has(type);
+        if(ProgramConfig.getCustomViewControl(type)){
+            return true;
+        }else{
+            return SupportInputTypes.has(type);
+        }
     }else{
         return false;
     }

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) {
     //     //先从当前状态从中找，没有的才去查
     //     //后续可以放在缓存里，但需要一些策略和技巧
@@ -110,7 +124,7 @@ export default class HcserviceV3 {
         return res;
     }
 
-    static async requestLtmplQueryKey(sourceId, condition) {
+    static async requestLtmplQueryKey(sourceId, condition?) {
         console.log('condition:',condition);
         let url = `/v3/ltmpl/query/key`
         let res = await Super.super({
@@ -121,6 +135,17 @@ export default class HcserviceV3 {
         return res;
     }
 
+    static async requestLtmplQueryTop(sourceId, condition) {
+        console.log('condition:',condition);
+        let url = `/v3/ltmpl/top-data`
+        let res = await Super.super({
+            url: url,
+            method: 'GET',
+            query: {...condition,sourceId}
+        });
+        return res;
+    }
+
     static async requestSelectedData(sourceId, codes) {
         if (!codes) {
             message.warn("没有选择实体")
@@ -257,6 +282,8 @@ export default class HcserviceV3 {
         return res;
     }
 
+
+
     static async requestLtmplCount(sourceId) {
 
         let url = `/v3/ltmpl/data/count`;
@@ -291,6 +318,8 @@ export default class HcserviceV3 {
     //     return criterias;
     // }
 
+
+
     static async requestQueryData(queryKey:string, pageInfo:PageInfo) {
         let res = await Super.super({
             url: `/v3/ltmpl/query/data`,

package/src/aldehyde/tmpl/interface.tsx

@@ -13,7 +13,7 @@ export type StatColType = 'fact' | 'dimension';
 export type ActTableViewModel = 'table' | 'verticalList' | 'horizontalList';
 
 export type ControlHolderType= 'table' | 'descriptions'
-
+export type PageType='modal'|'drawer';
 export interface TmplBase {
     id: string;
     title: string;
@@ -42,6 +42,7 @@ export interface CQueryConfig extends OrderableTmplBase {
 
 export interface ActionConfig extends OrderableTmplBase {
     multible: boolean,
+    icon:string,
     beforeExeConfirm:string,
     preposes:FieldConfig[],
     writes:FieldConfig[],
@@ -121,8 +122,8 @@ export type Comparator = 'equal' | 'unequal' | 'includeOne' |  'exclude' | 'noLe
 
 export interface FieldConfig extends FieldBase {
     disabled?: boolean;
-    max?: number;
-    min?: number;
+    max?: string;
+    min?: string;
     buttons?: ButtonName[];
     rules?: FileRule[];
 
@@ -168,16 +169,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'
@@ -227,6 +231,8 @@ export interface QueryData {
 
 export interface EControlProps extends ControlBaseProps {
     onChange?: (value: any) => void;
+    min?:string;
+    max?:string;
 }
 
 export interface VEControlProps extends EControlProps {

package/src/aldehyde/tmpl/tmpl-config-analysis.tsx

@@ -86,10 +86,10 @@ TmplConfigAnalysis.currentL1 =  function ( config: string,format:string) {
                    break;
            }
            if(symbol=="-"){
-               //console.log("moment().subtract(n,momentUnit)",moment().subtract(n,momentUnit));
+              // console.log("moment().subtract(n,momentUnit)",moment().subtract(n,momentUnit).format(format));
               return moment().subtract(n,momentUnit).format(format);
            }else{
-               //console.log("moment().add(n,momentUnit)",moment().add(n,momentUnit));
+              // console.log("moment().add(n,momentUnit)",moment().add(n,momentUnit).format(format));
               return moment().add(n,momentUnit).format(format);
            }
        }

package/src/aldehyde/units/index.tsx

@@ -20,6 +20,14 @@ const CUSTOM_PAGE_MAP = {
 
 }
 
+const CUSTOM_VIEW_CONTROL_MAP = {
+
+}
+
+const CUSTOM_EDIT_CONTROL_MAP = {
+
+}
+
 //加载本地配置
 Axios.create().get('programConfig.json').then((result) => {
     window.localStorage['programName'] = result.data.programName
@@ -33,9 +41,20 @@ Axios.create().get('programConfig.json').then((result) => {
 });
 
 export default {
-    setCustomPage(key:string,name:string){
+    setCustomPage(key:string,name:object){
         CUSTOM_PAGE_MAP[key]=name;
     },
+    setCustomControl(key:string,view:object,edit:object){
+        CUSTOM_VIEW_CONTROL_MAP[key]=view;
+        CUSTOM_EDIT_CONTROL_MAP[key]=edit;
+    },
+    getCustomViewControl(key:string){
+       return  CUSTOM_VIEW_CONTROL_MAP[key];
+
+    },
+    getCustomEditControl(key:string){
+        return CUSTOM_EDIT_CONTROL_MAP[key];
+    },
     getCustomPage(key:string){
        return CUSTOM_PAGE_MAP[key];
     },

package/lib/detail/edit/modal-dtmpl-edit.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"modal-dtmpl-edit.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/edit/modal-dtmpl-edit.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAS,YAAY,EAAoB,MAAM,MAAM,CAAA;AAC5D,OAAO,EAAC,cAAc,EAAE,WAAW,EAAE,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAO5E,UAAU,gBAAiB,SAAQ,cAAc;IAC7C,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,QAAQ,EAAE,MAAM,IAAI,CAAC;CAExB;AAED,UAAU,gBAAgB;IACtB,EAAE,EAAC,MAAM,CAAC;IACV,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAC,MAAM,CAAC;IACd,SAAS,EAAC,SAAS,CAAC;CACvB;AAED,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,KAAK,CAAC,aAAa,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAC/F,OAAO,qCAAmC;IAC1C,aAAa,SAAqB;IAClC,gBAAgB,MAAW;IAC3B,WAAW,mBAIV;IACD,MAAM,CAAC,YAAY;;;;;;;;;;MASlB;IACD,KAAK;;;;;;MAMJ;IAEK,iBAAiB;IAKjB,kBAAkB,CAAC,SAAS,KAAA;IAUlC,oBAAoB,IAAI,IAAI;IAM5B,cAAc,sBA0Bb;IAED,QAAQ,gBAAsB,WAAW,mBA2BxC;IAED,cAAc,aAIb;IAED,QAAQ,cAAe,MAAM,UAAQ,MAAM,EAAE,WAAS,MAAM,UAY3D;IAED,SAAS,cAoBR;IAED,MAAM;CAyBT"}

package/lib/detail/edit/modal-dtmpl-edit.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"modal-dtmpl-edit.js","sourceRoot":"","sources":["../../../../../src/aldehyde/detail/edit/modal-dtmpl-edit.tsx"],"names":[],"mappings":"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"}

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}
-            />
-        )
-    }
-}