aldehyde 0.1.17 → 0.1.20

package/lib/controls/action/index.d.ts

@@ -4,6 +4,7 @@ import './index.css';
 import { ActionConfig, DtmplData } from "../../tmpl/interface";
 import { FormInstance } from "antd/lib/form/hooks/useForm";
 import { SizeType } from "antd/lib/config-provider/SizeContext";
+export declare type ActionButtonIconType = 'icon' | 'icon-title' | 'title';
 export declare type ActionButtonType = 'primary-block' | 'dashed' | 'primary';
 export declare type ActionButtonHiddenType = 'hidden' | 'disabled';
 interface ActionProps {
@@ -16,6 +17,7 @@ interface ActionProps {
     buttonType?: ActionButtonType;
     hiddenType?: ActionButtonHiddenType;
     buttonSize?: SizeType;
+    iconType: ActionButtonIconType;
 }
 interface ActionState {
     popoverVisible: boolean;
@@ -25,6 +27,7 @@ export default class Action extends React.PureComponent<ActionProps, ActionState
         buttonType: string;
         hiddenType: string;
         buttonSize: any;
+        iconType: string;
     };
     state: {
         popoverVisible: boolean;
@@ -39,6 +42,7 @@ export default class Action extends React.PureComponent<ActionProps, ActionState
     getButtonType: () => "primary" | "dashed";
     blockButton: () => boolean;
     formButton: () => JSX.Element;
+    getTitle: () => string | JSX.Element;
     getCodes: () => any[];
     withoutFormButton: () => JSX.Element;
     render(): JSX.Element;

package/lib/controls/action/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAC,SAAS,EAAC,MAAM,OAAO,CAAA;AAE/B,OAAO,aAAa,CAAA;AACpB,OAAO,EAAC,YAAY,EAAc,SAAS,EAAC,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAGzD,OAAO,EAAC,QAAQ,EAAC,MAAM,sCAAsC,CAAC;AAK9D,oBAAa,gBAAgB,GAAG,eAAe,GAAG,QAAQ,GAAG,SAAS,CAAA;AACtE,oBAAa,sBAAsB,GAAG,QAAQ,GAAG,UAAU,CAAA;AAE3D,UAAU,WAAW;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,IAAI,CAAC,EAAE,SAAS,EAAE,GAAE,MAAM,EAAE,CAAC;IAC7B,OAAO,CAAC,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IAClC,QAAQ,EAAE,CAAC,MAAM,KAAA,EAAE,KAAK,KAAA,EAAE,MAAM,KAAA,KAAK,IAAI,CAAC;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,UAAU,CAAC,EAAE,sBAAsB,CAAC;IACpC,UAAU,CAAC,EAAE,QAAQ,CAAC;CACzB;AAED,UAAU,WAAW;IACjB,cAAc,EAAE,OAAO,CAAC;CAE3B;AAED,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,KAAK,CAAC,aAAa,CAAC,WAAW,EAAE,WAAW,CAAC;IAE7E,MAAM,CAAC,YAAY;;;;MAIlB;IAED,KAAK;;MAEJ;IAED,iBAAiB;IAKjB,kBAAkB,CAAC,SAAS,KAAA;IAQ5B,MAAM,gBAGL;IAGD,QAAQ,WAmCP;IACD,IAAI,UAAW,MAAM,UAOpB;IACD,QAAQ,aAIP;IACD,cAAc,UAAW,MAAM,UAK9B;IAGD,aAAa,6BAIZ;IAED,WAAW,QAAO,OAAO,CAIxB;IAGD,UAAU,oBAmBT;IAGD,QAAQ,cAaP;IAED,iBAAiB,oBA8ChB;IAED,MAAM;CAQT"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAC,SAAS,EAAC,MAAM,OAAO,CAAA;AAE/B,OAAO,aAAa,CAAA;AACpB,OAAO,EAAC,YAAY,EAAc,SAAS,EAAC,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAC,YAAY,EAAC,MAAM,6BAA6B,CAAC;AAGzD,OAAO,EAAC,QAAQ,EAAC,MAAM,sCAAsC,CAAC;AAK9D,oBAAa,oBAAoB,GAAG,MAAM,GAAG,YAAY,GAAG,OAAO,CAAA;AACnE,oBAAa,gBAAgB,GAAG,eAAe,GAAG,QAAQ,GAAG,SAAS,CAAA;AACtE,oBAAa,sBAAsB,GAAG,QAAQ,GAAG,UAAU,CAAA;AAE3D,UAAU,WAAW;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,IAAI,CAAC,EAAE,SAAS,EAAE,GAAE,MAAM,EAAE,CAAC;IAC7B,OAAO,CAAC,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;IAClC,QAAQ,EAAE,CAAC,MAAM,KAAA,EAAE,KAAK,KAAA,EAAE,MAAM,KAAA,KAAK,IAAI,CAAC;IAC1C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,UAAU,CAAC,EAAE,sBAAsB,CAAC;IACpC,UAAU,CAAC,EAAE,QAAQ,CAAC;IACtB,QAAQ,EAAC,oBAAoB,CAAC;CACjC;AAED,UAAU,WAAW;IACjB,cAAc,EAAE,OAAO,CAAC;CAE3B;AAED,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,KAAK,CAAC,aAAa,CAAC,WAAW,EAAE,WAAW,CAAC;IAE7E,MAAM,CAAC,YAAY;;;;;MAKlB;IAED,KAAK;;MAEJ;IAED,iBAAiB;IAKjB,kBAAkB,CAAC,SAAS,KAAA;IAQ5B,MAAM,gBAGL;IAGD,QAAQ,WAmCP;IACD,IAAI,UAAW,MAAM,UAOpB;IACD,QAAQ,aAIP;IACD,cAAc,UAAW,MAAM,UAK9B;IAGD,aAAa,6BAIZ;IAED,WAAW,QAAO,OAAO,CAIxB;IAGD,UAAU,oBAmBT;IAED,QAAQ,6BAaP;IAGD,QAAQ,cAaP;IAED,iBAAiB,oBA8ChB;IAED,MAAM;CAQT"}

package/lib/controls/action/index.js

@@ -1,8 +1,9 @@
 import * as React from 'react';
-import { Button, Checkbox as AntdCheckbox, Popconfirm, Popover, } from 'antd';
+import { Button, Checkbox as AntdCheckbox, Popconfirm, Popover, Tooltip } from 'antd';
 import './index.css';
 import FieldsEditCard from "../../detail/edit/fields-edit-card";
 import ActionUtils from './utils';
+import Icon from '../../icon';
 const CheckboxGroup = AntdCheckbox.Group;
 ;
 ;
@@ -98,7 +99,28 @@ export default class Action extends React.PureComponent {
                 }
             }
             return React.createElement(Popover, { placement: "leftBottom", visible: popoverVisible, trigger: "click", content: React.createElement(FieldsEditCard, { okDanger: actionConfig.beforeExeConfirm == 'danger', needConfirm: true, title: actionConfig.title, onCancel: () => this.onCancel(), fields: actionConfig.writes, value: this.getValue(), onOk: this.onOk, onValuesChange: this.onValuesChange }) },
-                React.createElement(Button, { danger: actionConfig.beforeExeConfirm == 'danger', type: this.getButtonType(), block: this.blockButton(), size: buttonSize, onClick: () => this.setState({ popoverVisible: !popoverVisible }), disabled: disabled_ }, actionConfig.title));
+                React.createElement(Button, { danger: actionConfig.beforeExeConfirm == 'danger', type: this.getButtonType(), block: this.blockButton(), size: buttonSize, onClick: () => this.setState({ popoverVisible: !popoverVisible }), disabled: disabled_ }, this.getTitle()));
+        };
+        this.getTitle = () => {
+            const { actionConfig, iconType } = this.props;
+            if (actionConfig.icon) {
+                if (iconType == 'icon-title') {
+                    return React.createElement(React.Fragment, null,
+                        React.createElement(Icon, { type: actionConfig.icon }),
+                        actionConfig.title);
+                }
+                else if (iconType == 'icon') {
+                    return React.createElement(Tooltip, { placement: "top", title: actionConfig.title },
+                        React.createElement(Icon, { type: actionConfig.icon }),
+                        '');
+                }
+                else {
+                    return actionConfig.title;
+                }
+            }
+            else {
+                return actionConfig.title;
+            }
         };
         this.getCodes = () => {
             const { data, } = this.props;
@@ -132,13 +154,13 @@ export default class Action extends React.PureComponent {
                 React.createElement(Popconfirm, { key: actionConfig.id, placement: "rightBottom", title: `确定要执行【${actionConfig.title}】吗？`, onConfirm: () => {
                         doAction(actionConfig.id, codes, {});
                     }, disabled: disabled_, okText: "\u786E\u5B9A", cancelText: "\u53D6\u6D88" },
-                    React.createElement(Button, { size: buttonSize, type: bType, block: block, disabled: disabled_ }, actionConfig.title)) :
+                    React.createElement(Button, { size: buttonSize, type: bType, block: block, disabled: disabled_ }, this.getTitle())) :
                 actionConfig.beforeExeConfirm == 'danger' ?
                     React.createElement(Popconfirm, { key: actionConfig.id, placement: "rightBottom", title: `确定要执行【${actionConfig.title}】吗？`, onConfirm: () => {
                             doAction(actionConfig.id, codes, {});
                         }, disabled: disabled_, okText: "\u786E\u5B9A", cancelText: "\u53D6\u6D88", okType: 'danger' },
-                        React.createElement(Button, { type: bType, block: block, danger: true, size: buttonSize, disabled: disabled_ }, actionConfig.title)) :
-                    React.createElement(Button, { type: bType, block: block, size: buttonSize, onClick: () => doAction(actionConfig.id, codes, {}), disabled: disabled_ }, actionConfig.title);
+                        React.createElement(Button, { type: bType, block: block, danger: true, size: buttonSize, disabled: disabled_ }, this.getTitle())) :
+                    React.createElement(Button, { type: bType, block: block, size: buttonSize, onClick: () => doAction(actionConfig.id, codes, {}), disabled: disabled_ }, this.getTitle());
         };
     }
     componentDidMount() {
@@ -161,5 +183,6 @@ Action.defaultProps = {
     buttonType: 'dashed',
     hiddenType: 'hidden',
     buttonSize: undefined,
+    iconType: 'icon-title',
 };
 //# sourceMappingURL=index.js.map

package/lib/controls/action/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAAC,MAAM,EAAE,QAAQ,IAAI,YAAY,EAAE,UAAU,EAAE,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAA;AAClF,OAAO,aAAa,CAAA;AAIpB,OAAO,cAAc,MAAM,oCAAoC,CAAA;AAE/D,OAAO,WAAW,MAAM,SAAS,CAAC;AAClC,OAAO,IAAI,MAAM,YAAY,CAAC;AAE9B,MAAM,aAAa,GAAG,YAAY,CAAC,KAAK,CAAC;AAgBxC,CAAC;AAKD,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,KAAK,CAAC,aAAuC;IAAjF;;QASI,UAAK,GAAG;YACJ,cAAc,EAAE,KAAK;SACxB,CAAA;QAeD,WAAM,GAAG,GAAG,EAAE;YACV,MAAM,EAAC,YAAY,EAAE,IAAI,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YACjD,OAAO,WAAW,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAC3D,CAAC,CAAA;QAGD,aAAQ,GAAG,GAAG,EAAE;YACZ,MAAM,EAAC,IAAI,EAAE,OAAO,EAAE,YAAY,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YACjD,IAAI,KAAK,GAAG,EAAE,CAAC;YACf,mBAAmB;YACnB,eAAe;YACf,IAAI,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC5C,IAAI,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;YAC3D,KAAK,IAAI,WAAW,IAAI,YAAY,CAAC,MAAM,EAAE;gBACzC,IAAG,CAAC,WAAW,EAAC;oBACZ,SAAS;iBACZ;gBACD,IAAI,cAAc,EAAE;oBAChB,IAAI,cAAc,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE;wBAC9C,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;qBAChF;yBAAI;wBACD,IAAG,UAAU,EAAC;4BACV,IAAG,UAAU,CAAC,UAAU,CAAC,EAAC;gCACtB,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,CAAA,UAAU,CAAC,UAAU,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;6BAC1F;iCAAI;gCACD,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,CAAA,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;6BAC9E;yBACJ;qBACJ;iBACJ;qBAAI;oBACD,IAAG,UAAU,EAAE;wBACX,IAAI,UAAU,CAAC,UAAU,CAAC,EAAE;4BACxB,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;yBAC3F;6BAAM;4BACH,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;yBAC/E;qBACJ;iBACJ;aACJ;YACD,OAAO,CAAC,GAAG,CAAC,cAAc,EAAC,KAAK,CAAC,CAAC;YAClC,OAAO,KAAK,CAAC;QACjB,CAAC,CAAA;QACD,SAAI,GAAG,CAAC,KAAa,EAAE,EAAE;YACrB,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;YACzC,MAAM,EAAC,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YACxE,IAAI,CAAC,QAAQ,CAAC;gBACV,cAAc,EAAE,KAAK;aACxB,CAAC,CAAA;YACF,QAAQ,CAAC,YAAY,CAAC,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC;QACtD,CAAC,CAAA;QACD,aAAQ,GAAG,GAAG,EAAE;YACZ,IAAI,CAAC,QAAQ,CAAC;gBACV,cAAc,EAAE,KAAK;aACxB,CAAC,CAAA;QACN,CAAC,CAAA;QACD,mBAAc,GAAG,CAAC,KAAa,EAAE,EAAE;YAC/B,MAAM,EAAC,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC3D,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE;gBAC5B,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;aACzC;QACL,CAAC,CAAA;QAGD,kBAAa,GAAG,GAAG,EAAE;YACjB,MAAM,EAAC,UAAU,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAChC,IAAI,KAAK,GAAe,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7G,OAAO,KAAK,CAAC;QACjB,CAAC,CAAA;QAED,gBAAW,GAAG,GAAY,EAAE;YACxB,MAAM,EAAC,UAAU,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAChC,IAAI,KAAK,GAAG,UAAU,IAAI,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YACvD,OAAO,KAAK,CAAC;QACjB,CAAC,CAAA;QAGD,eAAU,GAAG,GAAG,EAAE;YACd,MAAM,EAAC,cAAc,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YACpC,MAAM,EAAC,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAC,UAAU,EAAE,UAAU,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC/F,IAAI,SAAS,GAAG,QAAQ,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE;gBAChB,IAAI,CAAC,UAAU,IAAI,UAAU,IAAI,QAAQ,EAAE;oBACvC,OAAO,IAAI,CAAC;iBACf;qBAAM;oBACH,SAAS,GAAG,IAAI,CAAC;iBACpB;aACJ;YACD,OAAO,oBAAC,OAAO,IAAC,SAAS,EAAC,YAAY,EAAC,OAAO,EAAE,cAAc,EAAE,OAAO,EAAC,OAAO,EAAC,OAAO,EACnF,oBAAC,cAAc,IAAC,QAAQ,EAAE,YAAY,CAAC,gBAAgB,IAAI,QAAQ,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,YAAY,CAAC,MAAM,EAC/J,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EACvC,cAAc,EAAE,IAAI,CAAC,cAAc,GAAG;gBACtD,oBAAC,MAAM,IAAC,MAAM,EAAE,YAAY,CAAC,gBAAgB,IAAI,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,aAAa,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,UAAU,EAC1H,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAC,cAAc,EAAE,CAAC,cAAc,EAAC,CAAC,EAC/D,QAAQ,EAAE,SAAS,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAU,CAClD,CAAA;QACd,CAAC,CAAA;QAED,aAAQ,GAAC,GAAE,EAAE;YACT,MAAM,EAAC,YAAY,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC3C,IAAG,YAAY,CAAC,IAAI,EAAC;gBACjB,IAAG,QAAQ,IAAE,YAAY,EAAC;oBACxB,OAAQ;wBAAE,oBAAC,IAAI,IAAC,IAAI,EAAE,YAAY,CAAC,IAAI,GAAS;wBAAC,YAAY,CAAC,KAAK,CAAI,CAAA;iBACxE;qBAAK,IAAG,QAAQ,IAAE,MAAM,EAAC;oBACvB,OAAO,oBAAC,OAAO,IAAC,SAAS,EAAC,KAAK,EAAC,KAAK,EAAE,YAAY,CAAC,KAAK;wBAAE,oBAAC,IAAI,IAAC,IAAI,EAAE,YAAY,CAAC,IAAI,GAAS;wBAAC,EAAE,CAAW,CAAA;iBACjH;qBAAI;oBACD,OAAO,YAAY,CAAC,KAAK,CAAC;iBAC7B;aACJ;iBAAI;gBACF,OAAO,YAAY,CAAC,KAAK,CAAC;aAC5B;QACL,CAAC,CAAA;QAGD,aAAQ,GAAG,GAAG,EAAE;YACZ,MAAM,EAAC,IAAI,GAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YAC3B,IAAI,KAAK,GAAG,EAAE,CAAC;YACf,IAAI,IAAI,EAAE;gBACN,IAAI,IAAI,YAAY,KAAK,EAAE;oBACvB,KAAK,IAAI,CAAC,IAAI,IAAI,EAAE;wBAChB,IAAI,CAAC,EAAE;4BACH,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;yBACzB;qBACJ;iBACJ;aACJ;YACD,OAAO,KAAK,CAAC;QACjB,CAAC,CAAA;QAED,sBAAiB,GAAG,GAAG,EAAE;YACrB,MAAM,EAAC,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAChG,IAAI,SAAS,GAAG,QAAQ,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE;gBAChB,IAAI,CAAC,UAAU,IAAI,UAAU,IAAI,QAAQ,EAAE;oBACvC,OAAO,IAAI,CAAC;iBACf;qBAAM;oBACH,SAAS,GAAG,IAAI,CAAC;iBACpB;aACJ;YACD,IAAI,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC5B,IAAI,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YAC/B,IAAI,KAAK,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;YACjC,OAAO,CAAC,YAAY,CAAC,gBAAgB,IAAI,YAAY,CAAC,gBAAgB,IAAI,SAAS,CAAC,CAAC;gBACjF,oBAAC,UAAU,IAAC,GAAG,EAAE,YAAY,CAAC,EAAE,EACpB,SAAS,EAAC,aAAa,EACvB,KAAK,EAAE,SAAS,YAAY,CAAC,KAAK,KAAK,EACvC,SAAS,EAAE,GAAG,EAAE;wBACZ,QAAQ,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;oBACxC,CAAC,EACD,QAAQ,EAAE,SAAS,EACnB,MAAM,EAAC,cAAI,EACX,UAAU,EAAC,cAAI;oBAEvB,oBAAC,MAAM,IAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,IACtE,IAAI,CAAC,QAAQ,EAAE,CAAU,CAClB,CAAC,CAAC;gBACf,YAAY,CAAC,gBAAgB,IAAI,QAAQ,CAAC,CAAC;oBACvC,oBAAC,UAAU,IAAC,GAAG,EAAE,YAAY,CAAC,EAAE,EACpB,SAAS,EAAC,aAAa,EACvB,KAAK,EAAE,SAAS,YAAY,CAAC,KAAK,KAAK,EACvC,SAAS,EAAE,GAAG,EAAE;4BACZ,QAAQ,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAA;wBACxC,CAAC,EACD,QAAQ,EAAE,SAAS,EACnB,MAAM,EAAC,cAAI,EACX,UAAU,EAAC,cAAI,EACf,MAAM,EAAE,QAAQ;wBAExB,oBAAC,MAAM,IAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,IACpF,IAAI,CAAC,QAAQ,EAAE,CAAU,CAClB,CAAC,CAAC;oBACf,oBAAC,MAAM,IAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAC3C,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,EACnD,QAAQ,EAAE,SAAS,IACzB,IAAI,CAAC,QAAQ,EAAE,CAAU,CAAA;QACvC,CAAC,CAAA;IAUL,CAAC;IArMG,iBAAiB;QACb,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtB,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IACrB,CAAC;IAED,kBAAkB,CAAC,SAAS;QACxB,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtB,IAAI,IAAI,CAAC,KAAK,IAAI,SAAS,EAAE;YACzB,iDAAiD;SACpD;IACL,CAAC;IAmLD,MAAM;QACF,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtB,MAAM,EAAC,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QACxE,OAAO,0CACF,YAAY,CAAC,MAAM,IAAI,YAAY,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,EAAE,CACtG,CAAC;IACR,CAAC;;AA9MM,mBAAY,GAAG;IAClB,UAAU,EAAE,QAAQ;IACpB,UAAU,EAAE,QAAQ;IACpB,UAAU,EAAE,SAAS;IACrB,QAAQ,EAAC,YAAY;CACxB,CAAA"}

package/lib/controls/action/utils.js

@@ -77,7 +77,7 @@ export default class ActionUtils {
         if (!defaultValue) {
             return true;
         }
-        if (!value) {
+        if (!value && value != '0') {
             return false;
         }
         switch (comparator) {

package/lib/controls/action/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/utils.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/action/utils.tsx"],"names":[],"mappings":"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"}

package/lib/controls/auto-complete/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/auto-complete/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AAMnD,UAAU,iBAAkB,SAAQ,aAAa;CAEhD;AAED,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAiE7C,CAAA;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/auto-complete/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AAKnD,UAAU,iBAAkB,SAAQ,aAAa;CAEhD;AAED,QAAA,MAAM,YAAY,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAiE7C,CAAA;AAED,eAAe,YAAY,CAAC"}

package/lib/controls/auto-complete/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/auto-complete/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,YAAY,IAAI,gBAAgB,EAAE,KAAK,EAAC,MAAM,MAAM,CAAC;AAG7D,OAAO,YAAY,MAAM,2BAA2B,CAAC;AAErD,MAAM,EAAC,QAAQ,EAAC,GAAG,KAAK,CAAC;AAMzB,MAAM,YAAY,GAAgC,CAAC,KAAK,EAAE,EAAE;IAExD,MAAM,EAAC,EAAE,EAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAC,GAAG,KAAK,CAAC;IAE1D,IAAI,YAAY,GAAG,SAAS,CAAC;IAE7B,MAAM,WAAW,GAAG,CAAC,MAAM,EAAE,EAAE;QAC3B,IAAI,QAAQ,EAAE;YACV,IAAI,QAAQ,GAAC,SAAS,CAAC;YACvB,IAAI,MAAM,KAAK,SAAS,EAAE;gBACtB,OAAO,EAAE,CAAC;aACb;YACD,IAAI,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,EAAE,EAAE;gBACJ,QAAQ,GAAE,CAAC,KAAK,CAAA,CAAC,CAAA,KAAK,CAAA,CAAC,CAAA,EAAE,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;aACnE;iBAAM;gBACH,QAAQ,GAAC,MAAM,CAAC;aACnB;YACD,QAAQ,CAAC,QAAQ,CAAC,CAAC;SACtB;IACL,CAAC,CAAA;IAGD,IAAI,WAAW,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IAC7E,IAAI,QAAQ,GAAY,WAAW,CAAC,QAAQ,CAAC;IAE7C,IAAI,gBAAgB,GAAG;QACrB,EAAE,EAAE,WAAW,EAAE,QAAQ;KAC1B,CAAA;IAED,MAAM,cAAc,GAAG,GAAG,EAAE;QACxB,IAAI,IAAI,GAAG,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,CAAC,IAAI,EAAE;YACP,OAAO,EAAE,CAAC;SACb;QACD,MAAM,OAAO,GAAG,EAAE,CAAA;QAClB,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACd,MAAM,MAAM,GAAG;gBACX,KAAK,EAAE,IAAI,GAAG,IAAI,CAAC,KAAK;gBACxB,KAAK,EAAE,IAAI,CAAC,KAAK;aACpB,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACpB,OAAO,KAAK,CAAA;QAChB,CAAC,CAAC,CAAA;QACF,YAAY;QACZ,OAAO,OAAO,CAAA;IAClB,CAAC,CAAC;IAEF,YAAY,GAAG,oBAAC,gBAAgB,IAC5B,UAAU,EAAE,IAAI,EAChB,wBAAwB,EAAE,IAAI,EAC9B,OAAO,EAAE,cAAc,EAAE,EACzB,QAAQ,EAAE,WAAW,EACrB,KAAK,EAAE,KAAK;QAGZ,oBAAC,QAAQ,kBACL,KAAK,EAAE;gBACH,MAAM,EAAE,GAAG;aACd,IACG,gBAAgB,EACtB,CACa,CAAA;IAEnB,OAAO,YAAY,CAAC;AACxB,CAAC,CAAA;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/auto-complete/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,YAAY,IAAI,gBAAgB,EAAE,KAAK,EAAC,MAAM,MAAM,CAAC;AAE7D,OAAO,YAAY,MAAM,2BAA2B,CAAC;AAErD,MAAM,EAAC,QAAQ,EAAC,GAAG,KAAK,CAAC;AAMzB,MAAM,YAAY,GAAgC,CAAC,KAAK,EAAE,EAAE;IAExD,MAAM,EAAC,EAAE,EAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAC,GAAG,KAAK,CAAC;IAE1D,IAAI,YAAY,GAAG,SAAS,CAAC;IAE7B,MAAM,WAAW,GAAG,CAAC,MAAM,EAAE,EAAE;QAC3B,IAAI,QAAQ,EAAE;YACV,IAAI,QAAQ,GAAC,SAAS,CAAC;YACvB,IAAI,MAAM,KAAK,SAAS,EAAE;gBACtB,OAAO,EAAE,CAAC;aACb;YACD,IAAI,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,EAAE,EAAE;gBACJ,QAAQ,GAAE,CAAC,KAAK,CAAA,CAAC,CAAA,KAAK,CAAA,CAAC,CAAA,EAAE,CAAC,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;aACnE;iBAAM;gBACH,QAAQ,GAAC,MAAM,CAAC;aACnB;YACD,QAAQ,CAAC,QAAQ,CAAC,CAAC;SACtB;IACL,CAAC,CAAA;IAGD,IAAI,WAAW,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IAC7E,IAAI,QAAQ,GAAY,WAAW,CAAC,QAAQ,CAAC;IAE7C,IAAI,gBAAgB,GAAG;QACrB,EAAE,EAAE,WAAW,EAAE,QAAQ;KAC1B,CAAA;IAED,MAAM,cAAc,GAAG,GAAG,EAAE;QACxB,IAAI,IAAI,GAAG,YAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,CAAC,IAAI,EAAE;YACP,OAAO,EAAE,CAAC;SACb;QACD,MAAM,OAAO,GAAG,EAAE,CAAA;QAClB,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACd,MAAM,MAAM,GAAG;gBACX,KAAK,EAAE,IAAI,GAAG,IAAI,CAAC,KAAK;gBACxB,KAAK,EAAE,IAAI,CAAC,KAAK;aACpB,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACpB,OAAO,KAAK,CAAA;QAChB,CAAC,CAAC,CAAA;QACF,YAAY;QACZ,OAAO,OAAO,CAAA;IAClB,CAAC,CAAC;IAEF,YAAY,GAAG,oBAAC,gBAAgB,IAC5B,UAAU,EAAE,IAAI,EAChB,wBAAwB,EAAE,IAAI,EAC9B,OAAO,EAAE,cAAc,EAAE,EACzB,QAAQ,EAAE,WAAW,EACrB,KAAK,EAAE,KAAK;QAGZ,oBAAC,QAAQ,kBACL,KAAK,EAAE;gBACH,MAAM,EAAE,GAAG;aACd,IACG,gBAAgB,EACtB,CACa,CAAA;IAEnB,OAAO,YAAY,CAAC;AACxB,CAAC,CAAA;AAED,eAAe,YAAY,CAAC"}

package/lib/controls/cascader/index.d.ts

@@ -1,14 +1,23 @@
-export default class Cascader extends React.Component<any, any, any> {
-    constructor(props: any);
-    constructor(props: any, context: any);
+import React from 'react';
+import { EControlProps, EnumItem } from "../../tmpl/interface";
+interface CascaderProps extends EControlProps {
+    baseValue?: string[];
+}
+interface CascaderState {
+    options: object[];
+}
+export default class Cascader extends React.PureComponent<CascaderProps, CascaderState> {
+    static defaultProps: {
+        baseValue: any[];
+    };
     state: {
         options: any[];
     };
+    componentDidMount(): Promise<void>;
     handleChange: (value: any) => void;
-    triggerChange: (changedValue: any) => void;
-    requestLinkage: (optionKey: any) => void;
-    loadData: (selectedOptions: any) => void;
+    getOptions: () => Promise<any[]>;
+    buildOptions: (options: EnumItem[], ops: object[]) => void;
     render(): JSX.Element;
 }
-import React from "react";
+export {};
 //# sourceMappingURL=index.d.ts.map

package/lib/controls/cascader/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/cascader/index.js"],"names":[],"mappings":"AAIA;IA4Fu1hB,wBAA8C;IAAA,sCAAyJ;IA1F1hiB;;MAEC;IACD,mCAKC;IACD,2CAKG;IACH,yCAoBC;IACD,yCAqCG;IAEH,sBAcC;CACJ"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/cascader/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AAG9D,UAAU,aAAc,SAAQ,aAAa;IAEzC,SAAS,CAAC,EAAC,MAAM,EAAE,CAAC;CAEvB;AAED,UAAU,aAAa;IACnB,OAAO,EAAC,MAAM,EAAE,CAAA;CACnB;AAED,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,KAAK,CAAC,aAAa,CAAC,aAAa,EAAE,aAAa,CAAC;IAEnF,MAAM,CAAC,YAAY;;MAElB;IAED,KAAK;;MAEJ;IAEK,iBAAiB;IAQvB,YAAY,uBAWX;IAED,UAAU,uBAmCT;IAED,YAAY,YAAU,QAAQ,EAAE,OAAK,MAAM,EAAE,UAe5C;IAED,MAAM;CAaT"}

package/lib/controls/cascader/index.js

@@ -1,88 +1,107 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 import React from 'react';
-import Super from "../../tmpl/superagent";
 import { Cascader as AntdCascader } from 'antd';
-export default class Cascader extends React.Component {
+import HCDataSource from "../../tmpl/hc-data-source";
+export default class Cascader extends React.PureComponent {
     constructor() {
         super(...arguments);
         this.state = {
-            options: []
+            options: [],
         };
         this.handleChange = (value) => {
-            let res = "";
-            res = value.join("->");
-            console.log(res);
-            this.triggerChange(res);
-        };
-        this.triggerChange = (changedValue) => {
             const { onChange } = this.props;
+            let res = undefined;
+            console.log('Cascader', value);
+            if (value) {
+                res = value.join("->");
+                console.log("value.join(\"->\")", res);
+            }
             if (onChange) {
-                onChange(changedValue);
+                onChange(res);
             }
         };
-        this.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
+        this.getOptions = () => __awaiter(this, void 0, void 0, function* () {
+            const { fieldConfig, baseValue } = this.props;
+            let options = yield 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(Object.assign({}, option));
+                                nextOptions = option.subOptions;
+                            }
+                        }
+                    }
                 });
+            }
+            else {
+                newOptions = options;
+            }
+            this.buildOptions(newOptions, ops);
+            return ops;
+        });
+        this.buildOptions = (options, ops) => {
+            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;
+                }
             });
         };
-        this.loadData = (selectedOptions) => {
-            const targetOption = selectedOptions[selectedOptions.length - 1];
-            targetOption.loading = true;
+    }
+    componentDidMount() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let options = yield this.getOptions();
             this.setState({
-                time: this.state.time - 1
+                options
             });
-            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 (React.createElement(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 }));
+        const { options } = this.state;
+        const _a = this.props, { fieldConfig, onChange, value } = _a, other = __rest(_a, ["fieldConfig", "onChange", "value"]);
+        return (React.createElement(AntdCascader, Object.assign({ displayRender: label => label.join('->'), options: options, value: value ? value.split('->') : undefined, onChange: this.handleChange }, other)));
     }
 }
+Cascader.defaultProps = {
+    baseValue: [], //['level1','level2']
+};
 //# sourceMappingURL=index.js.map

package/lib/controls/cascader/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/cascader/index.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/cascader/index.tsx"],"names":[],"mappings":"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"}

package/lib/controls/cquery/cquick-button.d.ts

@@ -1,9 +1,10 @@
 import React from 'react';
 import { ButtonProps } from 'antd';
-import { CQueryConfig } from "../../tmpl/interface";
+import { CQueryConfig, PageType } from "../../tmpl/interface";
 interface CquickButtonProps extends ButtonProps {
     mainCode: string;
     cQueryConfig: CQueryConfig;
+    pageType: PageType;
 }
 interface CquickButtonState {
     showDraw: boolean;
@@ -12,6 +13,9 @@ declare class CquickButton extends React.PureComponent<CquickButtonProps, Cquick
     state: {
         showDraw: boolean;
     };
+    static defaultProps: {
+        pageType: string;
+    };
     showDraw: (currentId: string) => void;
     closeDrawer: () => void;
     render(): JSX.Element;

package/lib/controls/cquery/cquick-button.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cquick-button.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/cquery/cquick-button.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAsB,WAAW,EAAC,MAAM,MAAM,CAAA;AACrD,OAAO,EAAC,YAAY,EAAC,MAAM,sBAAsB,CAAC;AASlD,UAAU,iBAAkB,SAAQ,WAAW;IAC3C,QAAQ,EAAC,MAAM,CAAC;IAChB,YAAY,EAAC,YAAY,CAAC;CAC7B;AAED,UAAU,iBAAiB;IACvB,QAAQ,EAAC,OAAO,CAAC;CACpB;AAOD,cAAM,YAAa,SAAQ,KAAK,CAAC,aAAa,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAChF,KAAK;;MAEJ;IAKD,QAAQ,cAAY,MAAM,UAMzB;IAED,WAAW,aAIV;IAGD,MAAM;CAoDT;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"cquick-button.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/cquery/cquick-button.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAsB,WAAW,EAAC,MAAM,MAAM,CAAA;AACrD,OAAO,EAAC,YAAY,EAAC,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AAQ3D,UAAU,iBAAkB,SAAQ,WAAW;IAC3C,QAAQ,EAAC,MAAM,CAAC;IAChB,YAAY,EAAC,YAAY,CAAC;IAC1B,QAAQ,EAAC,QAAQ,CAAC;CACrB;AAED,UAAU,iBAAiB;IACvB,QAAQ,EAAC,OAAO,CAAC;CACpB;AAOD,cAAM,YAAa,SAAQ,KAAK,CAAC,aAAa,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAChF,KAAK;;MAEJ;IAGD,MAAM,CAAC,YAAY;;MAElB;IAED,QAAQ,cAAY,MAAM,UAMzB;IAED,WAAW,aAIV;IAGD,MAAM;CAmDT;AAED,eAAe,YAAY,CAAC"}

package/lib/controls/cquery/cquick-button.js

@@ -14,7 +14,7 @@ import { Drawer, Space, Button } from 'antd';
 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 DtmplEditPage from "../../detail/edit/dtmpl-edit-page";
 const outlinedMap = {
     EditOutlined: React.createElement(EditOutlined, null)
 };
@@ -37,7 +37,7 @@ class CquickButton extends React.PureComponent {
         };
     }
     render() {
-        const _a = this.props, { cQueryConfig, mainCode, type } = _a, button = __rest(_a, ["cQueryConfig", "mainCode", "type"]);
+        const _a = this.props, { cQueryConfig, mainCode, type, pageType } = _a, button = __rest(_a, ["cQueryConfig", "mainCode", "type", "pageType"]);
         const { showDraw, } = this.state;
         console.log("cQuery mainCode", mainCode);
         let mcode = mainCode && mainCode.indexOf("@R@") > 0 ? mainCode.split("@R@")[0] : mainCode;
@@ -53,17 +53,21 @@ class CquickButton extends React.PureComponent {
                 } }), outlinedMap[cQueryConfig.title] ? outlinedMap[cQueryConfig.title] : cQueryConfig.title),
             !showDraw ? null :
                 cQueryConfig.type == 'edit' ?
-                    React.createElement(ModalDtmplEdit, { visible: showDraw, onCancel: () => {
+                    React.createElement(DtmplEditPage, { pageType: pageType, visible: showDraw, onCancel: () => {
                             this.setState({
                                 showDraw: false,
                             });
-                        }, sourceId: cQueryConfig.id, code: mcode, onOk: this.closeDrawer }) :
-                    React.createElement(Drawer, { placement: 'left', title: "\u5173\u8054\u67E5\u8BE2", closable: true, mask: false, onClose: this.closeDrawer, visible: showDraw, width: 'calc(100% - 280px)', style: {
-                            maxWidth: 1960,
-                        }, extra: React.createElement(Space, null,
-                            React.createElement(Button, { onClick: this.closeDrawer }, "\u5173\u95ED")) }, cQueryConfig.path ? React.createElement(Units.getCustomPage(cQueryConfig.path)) :
-                        React.createElement(LtmplPage, { sourceId: cQueryConfig.id, mainCode: mcode }))));
+                        }, sourceId: cQueryConfig.id, code: mcode, onOk: this.closeDrawer })
+                    :
+                        React.createElement(Drawer, { placement: 'left', title: "\u5173\u8054\u67E5\u8BE2", closable: true, mask: false, onClose: this.closeDrawer, visible: showDraw, width: 'calc(100% - 280px)', style: {
+                                maxWidth: 1960,
+                            }, extra: React.createElement(Space, null,
+                                React.createElement(Button, { onClick: this.closeDrawer }, "\u5173\u95ED")) }, cQueryConfig.path ? React.createElement(Units.getCustomPage(cQueryConfig.path)) :
+                            React.createElement(LtmplPage, { sourceId: cQueryConfig.id, mainCode: mcode }))));
     }
 }
+CquickButton.defaultProps = {
+    pageType: 'modal'
+};
 export default CquickButton;
 //# sourceMappingURL=cquick-button.js.map

package/lib/controls/cquery/cquick-button.js.map

@@ -1 +1 @@
-{"version":3,"file":"cquick-button.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/cquery/cquick-button.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"cquick-button.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/cquery/cquick-button.tsx"],"names":[],"mappings":"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"}

package/lib/controls/date-picker/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/date-picker/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,EAAa,aAAa,EAAC,MAAM,sBAAsB,CAAC;AAO/D,UAAU,eAAgB,SAAQ,aAAa;CAE9C;AAGD,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA2HzC,CAAA;AAED,eAAe,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/date-picker/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,EAAa,aAAa,EAAC,MAAM,sBAAsB,CAAC;AAO/D,UAAU,eAAgB,SAAQ,aAAa;CAE9C;AAGD,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAuHzC,CAAA;AAED,eAAe,UAAU,CAAC"}

package/lib/controls/date-picker/index.js

@@ -4,12 +4,12 @@ import moment from "moment";
 import Units from "../../units";
 const { RangePicker } = AntdDatePicker;
 const DatePicker = (props) => {
-    const { id, value: propsValue, itemType, fieldConfig, onChange, style } = props;
+    const { id, value: propsValue, itemType, fieldConfig, onChange, style, min, max } = props;
     let value = propsValue;
     let format = Units.getMomentFormat(itemType);
     const changeValue = (value) => {
         if (onChange) {
-            onChange(value ? moment(value).format(format) : undefined);
+            onChange(value ? value.format(format) : undefined);
         }
     };
     const changeRangeValue = (value) => {
@@ -18,22 +18,14 @@ const DatePicker = (props) => {
                 onChange(value);
             }
             else if (value.length === 2 && value[0] && value[1]) {
-                onChange(moment(value[0]).format(format) + "~" + moment(value[1]).format(format));
+                onChange(value[0].format(format) + "~" + value[1].format(format));
             }
         }
     };
-    // if(value && value.startsWith("$$current")){
-    //     switch (itemType) {
-    //         case 'daterange':
-    //         case 'datetimerange':
-    //             changeRangeValue(TmplConfigAnalysis.current(value,format));
-    //             break;
-    //         default:
-    //             changeValue(TmplConfigAnalysis.current(value,format)[0]);
-    //             break;
-    //     }
-    //
-    // }
+    const disabledDate = current => {
+        // console.log('current',moment(min,format).format(format));
+        return current && ((max && moment(current.format(format), format) > moment(max, format)) || (min && moment(current.format(format), format) < moment(min, format)));
+    };
     let entryControl = undefined;
     let picker = "date";
     let momentValue;
@@ -44,13 +36,13 @@ const DatePicker = (props) => {
             momentValue = value ? moment(value, format) : undefined;
             picker = itemType == 'date-YY' ? 'year' : itemType == 'date-M1' ? "month" : "date";
             // @ts-ignore
-            entryControl = React.createElement(AntdDatePicker, { id: id, style: Object.assign({}, style), picker: picker, format: format, value: momentValue, disabled: fieldConfig.disabled, onChange: changeValue });
+            entryControl = React.createElement(AntdDatePicker, { id: id, style: Object.assign({}, style), picker: picker, format: format, disabledDate: disabledDate, value: momentValue, disabled: fieldConfig.disabled, onChange: changeValue });
             break;
         case 'datetime-HH':
         case 'datetime-mm':
         case 'datetime':
             momentValue = value ? moment(value, format) : undefined;
-            entryControl = React.createElement(AntdDatePicker, { id: id, style: Object.assign({}, style), showTime: { format: Units.getDateTimeFormat(itemType) }, picker: 'date', format: format, value: momentValue, disabled: fieldConfig.disabled, onChange: changeValue });
+            entryControl = React.createElement(AntdDatePicker, { id: id, style: Object.assign({}, style), disabledDate: disabledDate, showTime: { format: Units.getDateTimeFormat(itemType) }, picker: 'date', format: format, value: momentValue, disabled: fieldConfig.disabled, onChange: changeValue });
             break;
         case 'daterange-YY':
         case 'daterange-M1':
@@ -60,7 +52,7 @@ const DatePicker = (props) => {
             momentValue = [v1 ? moment(v1, format) : undefined, v2 ? moment(v2, format) : undefined];
             picker = itemType == 'daterange-YY' ? 'year' : itemType == 'daterange-M1' ? "month" : "date";
             // @ts-ignore
-            entryControl = React.createElement(RangePicker, { id: id, picker: picker, style: Object.assign({}, style), format: format, value: momentValue, disabled: fieldConfig.disabled, onChange: changeRangeValue });
+            entryControl = React.createElement(RangePicker, { id: id, picker: picker, style: Object.assign({}, style), format: format, disabledDate: disabledDate, value: momentValue, disabled: fieldConfig.disabled, onChange: changeRangeValue });
             break;
         case 'datetimerange-HH':
         case 'datetimerange-mm':
@@ -68,7 +60,7 @@ const DatePicker = (props) => {
             const v3 = value && value.indexOf("~") > 0 ? value.split("~")[0] : undefined;
             const v4 = value && value.indexOf("~") > 0 ? value.split("~")[1] : undefined;
             momentValue = [v3 ? moment(v3, format) : undefined, v4 ? moment(v4, format) : undefined];
-            entryControl = React.createElement(RangePicker, { id: id, showTime: { format: Units.getDateTimeFormat(itemType) }, format: format, style: Object.assign({}, style), value: momentValue, disabled: fieldConfig.disabled, onChange: changeRangeValue });
+            entryControl = React.createElement(RangePicker, { id: id, showTime: { format: Units.getDateTimeFormat(itemType) }, format: format, style: Object.assign({}, style), value: momentValue, disabledDate: disabledDate, disabled: fieldConfig.disabled, onChange: changeRangeValue });
             break;
         case 'time-HH':
         case 'time-mm':