aldehyde 0.1.16 → 0.1.19

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];
     },
@@ -299,7 +318,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/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}
-            />
-        )
-    }
-}