aldehyde 0.1.13 → 0.1.18

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/src/aldehyde/units/index.tsx

@@ -299,7 +299,12 @@ export default {
         }
         return obj;
     },
-
+    isConfigDefaultValue(defaultValue){
+        if(!defaultValue){
+            return false;
+        }
+        return defaultValue.startsWith("$$current");
+    },
     configParamTrans(value:string){
         if(value && value.startsWith &&  value.startsWith("$$current")){
             return TmplConfigAnalysis.current(value);

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