aldehyde 0.1.4 → 0.1.7

package/lib/welcome/HCWelcome.js

@@ -0,0 +1,202 @@
+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());
+    });
+};
+import React from 'react';
+import AntdPieChart from "../chart/antd/PieChart2";
+import { Card, Col, Row, Image, Carousel } from 'antd';
+import HcserviceV3 from "../tmpl/hcservice-v3";
+import QuickEntrance from './quick-entrance';
+import Workbench from './workbench';
+import './index.css';
+import * as Echarts from 'echarts';
+import TimeCost from '../../../public/time-cost.png';
+import TimePrograss from '../../../public/time-prograss.png';
+import PainPoint from '../../../public/pain-point.png';
+import Target from '../../../public/target.png';
+import Development from '../../../public/development.png';
+export default class HCWelcome extends React.Component {
+    constructor() {
+        super(...arguments);
+        this.state = {};
+        this.intervals = [];
+        this.cardStyle = {
+            height: '400px',
+            // background: '#364d79',
+        };
+        this.carouselStyle = {
+            background: '#fff',
+            borderRadius: '6px'
+        };
+    }
+    componentDidMount() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let l2MenuCharts = yield HcserviceV3.requestSimpleCharts();
+            let piecharts = [];
+            for (const item of l2MenuCharts) {
+                let data = yield HcserviceV3.requestSimpleChartsEntities(item.id);
+                if (data) {
+                    piecharts.push(React.createElement(Col, { span: 12 },
+                        " ",
+                        React.createElement(AntdPieChart, { data: data, key: item.id })));
+                }
+            }
+            var chartDom = document.getElementById('echart1');
+            var myChart = Echarts.init(chartDom);
+            var option;
+            option = {
+                title: {
+                    text: 'Line'
+                },
+                tooltip: {
+                    trigger: 'axis'
+                },
+                legend: {
+                    data: ['Email', 'Union Ads', 'Video Ads', 'Direct', 'Search Engine']
+                },
+                grid: {
+                    left: '3%',
+                    right: '4%',
+                    bottom: '3%',
+                    containLabel: true
+                },
+                toolbox: {
+                    feature: {
+                        saveAsImage: {}
+                    }
+                },
+                xAxis: {
+                    type: 'category',
+                    boundaryGap: false,
+                    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+                },
+                yAxis: {
+                    type: 'value'
+                },
+                series: [
+                    {
+                        name: 'Email',
+                        type: 'line',
+                        stack: 'Total',
+                        data: [120, 132, 101, 134, 90, 230, 210]
+                    },
+                    {
+                        name: 'Union Ads',
+                        type: 'line',
+                        stack: 'Total',
+                        data: [220, 182, 191, 234, 290, 330, 310]
+                    },
+                    {
+                        name: 'Video Ads',
+                        type: 'line',
+                        stack: 'Total',
+                        data: [150, 232, 201, 154, 190, 330, 410]
+                    },
+                    {
+                        name: 'Direct',
+                        type: 'line',
+                        stack: 'Total',
+                        data: [320, 332, 301, 334, 390, 330, 320]
+                    },
+                    {
+                        name: 'Search Engine',
+                        type: 'line',
+                        stack: 'Total',
+                        data: [820, 932, 901, 934, 1290, 1330, 1320]
+                    }
+                ]
+            };
+            option && myChart.setOption(option);
+            var chartDom = document.getElementById('echart2');
+            var myChart = Echarts.init(chartDom);
+            var option;
+            option = {
+                legend: {
+                    top: 'bottom'
+                },
+                toolbox: {
+                    show: true,
+                    feature: {
+                        mark: { show: true },
+                        dataView: { show: true, readOnly: false },
+                        restore: { show: true },
+                        saveAsImage: { show: true }
+                    }
+                },
+                series: [
+                    {
+                        name: 'Nightingale Chart',
+                        type: 'pie',
+                        radius: [16, 80],
+                        center: ['50%', '50%'],
+                        roseType: 'area',
+                        itemStyle: {
+                            borderRadius: 8
+                        },
+                        data: [
+                            { value: 40, name: 'rose 1' },
+                            { value: 38, name: 'rose 2' },
+                            { value: 32, name: 'rose 3' },
+                            { value: 30, name: 'rose 4' },
+                            { value: 28, name: 'rose 5' },
+                            { value: 26, name: 'rose 6' },
+                            { value: 22, name: 'rose 7' },
+                            { value: 18, name: 'rose 8' }
+                        ]
+                    }
+                ]
+            };
+            option && myChart.setOption(option);
+            this.setState({
+                piecharts
+            });
+        });
+    }
+    componentWillUnmount() {
+        if (this.intervals.length > 0) {
+            for (let i of this.intervals) {
+                clearInterval(i);
+            }
+        }
+        this.intervals = [];
+    }
+    render() {
+        return React.createElement(React.Fragment, null,
+            React.createElement(Row, { className: 'home-page', gutter: { xs: 8, sm: 16, md: 24, lg: 32 } },
+                React.createElement(Col, { span: 24 },
+                    React.createElement(Card, { className: "hovercard" },
+                        React.createElement(Row, { gutter: { xs: 8, sm: 16, md: 24, lg: 32 } },
+                            React.createElement(Col, { span: 12 },
+                                React.createElement(Image, { src: PainPoint })),
+                            React.createElement(Col, { span: 12 },
+                                " ",
+                                React.createElement(Image, { src: Target }))))),
+                React.createElement(Col, { span: 24 },
+                    React.createElement(Row, { style: { minHeight: '100px' }, gutter: { xs: 8, sm: 16, md: 24, lg: 32 } },
+                        React.createElement(Col, { span: 12, style: { width: '100%' } },
+                            React.createElement(Workbench, { className: "hovercard" }),
+                            React.createElement(QuickEntrance, { className: "hovercard" })),
+                        React.createElement(Col, { span: 12, style: { 'height': '410px' } },
+                            React.createElement(Card, { className: "hovercard", style: this.cardStyle, bodyStyle: { padding: '2px' } },
+                                React.createElement(Carousel, { autoplay: true },
+                                    React.createElement("div", null,
+                                        React.createElement(Image, { src: TimePrograss })),
+                                    React.createElement("div", null,
+                                        React.createElement(Image, { src: Development })),
+                                    React.createElement("div", null,
+                                        React.createElement(Image, { src: TimeCost }))))))),
+                React.createElement(Col, { span: 24 },
+                    React.createElement(Row, { gutter: { xs: 8, sm: 16, md: 24, lg: 32 } },
+                        React.createElement(Col, { style: { width: '100%' } },
+                            React.createElement(Card, { className: "hovercard", title: '统计视图' },
+                                React.createElement(Row, { gutter: [{ xs: 8, sm: 16, md: 24, lg: 32 }, { xs: 8, sm: 16, md: 24, lg: 32 }] },
+                                    React.createElement(Col, { span: 16, style: { 'height': '400px' }, id: 'echart1' }),
+                                    React.createElement(Col, { span: 8, style: { 'height': '400px' }, id: 'echart2' }))))))));
+    }
+}
+//# sourceMappingURL=HCWelcome.js.map

package/lib/welcome/HCWelcome.js.map

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

package/lib/welcome/quick-entrance.d.ts

@@ -0,0 +1,20 @@
+import React from 'react';
+import { CardProps } from 'antd';
+import 'antd/dist/antd.css';
+import { Level2Menu } from "../tmpl/interface";
+interface QuickEntranceProps extends CardProps {
+}
+interface QuickEntranceState {
+    l2Menus: Level2Menu[];
+}
+declare class QuickEntrance extends React.PureComponent<QuickEntranceProps, QuickEntranceState> {
+    state: {
+        l2Menus: any;
+    };
+    intervals: any[];
+    componentDidMount(): Promise<void>;
+    componentWillUnmount(): void;
+    render(): JSX.Element;
+}
+export default QuickEntrance;
+//# sourceMappingURL=quick-entrance.d.ts.map

package/lib/welcome/quick-entrance.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"quick-entrance.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/quick-entrance.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAoC,SAAS,EAAC,MAAM,MAAM,CAAA;AAEjE,OAAO,oBAAoB,CAAC;AAG5B,OAAO,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAE7C,UAAU,kBAAmB,SAAQ,SAAS;CAC7C;AAED,UAAU,kBAAkB;IACxB,OAAO,EAAC,UAAU,EAAE,CAAA;CACvB;AAED,cAAM,aAAc,SAAQ,KAAK,CAAC,aAAa,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACnF,KAAK;;MAEJ;IACD,SAAS,EAAC,GAAG,EAAE,CAAI;IACb,iBAAiB;IAoBvB,oBAAoB,IAAI,IAAI;IAU5B,MAAM;CAwBT;AAED,eAAe,aAAa,CAAA"}

package/lib/welcome/quick-entrance.js

@@ -0,0 +1,79 @@
+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 { Badge, Button, Card, Space } from 'antd';
+import { CodeTwoTone } from '@ant-design/icons';
+import 'antd/dist/antd.css';
+import HcserviceV3 from "../tmpl/hcservice-v3";
+import HCDataSource from '../tmpl/hc-data-source';
+class QuickEntrance extends React.PureComponent {
+    constructor() {
+        super(...arguments);
+        this.state = {
+            l2Menus: undefined
+        };
+        this.intervals = [];
+    }
+    componentDidMount() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let l2Menus = yield HCDataSource.quickEntranceMenus();
+            for (const item of l2Menus) {
+                if (item.displayTotal == true) {
+                    let i = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+                        let count = yield HcserviceV3.requestLtmplCount(item.id);
+                        item.count = count;
+                        this.setState({});
+                    }), 180000);
+                    this.intervals.push(i);
+                    let count = yield HcserviceV3.requestLtmplCount(item.id);
+                    item.count = count;
+                    this.setState({});
+                }
+            }
+            this.setState({
+                l2Menus
+            });
+        });
+    }
+    componentWillUnmount() {
+        if (this.intervals.length > 0) {
+            for (let i of this.intervals) {
+                console.log('快捷入口移除定时任务');
+                clearInterval(i);
+            }
+        }
+        this.intervals = [];
+    }
+    render() {
+        const _a = this.props, { title } = _a, other = __rest(_a, ["title"]);
+        const { l2Menus } = this.state;
+        let faceplateL2MenuComp = [];
+        l2Menus && l2Menus.forEach((l2Menu) => {
+            let comp = React.createElement(Badge, { key: l2Menu.id, count: l2Menu.count },
+                React.createElement(Button, { shape: "round", icon: React.createElement(CodeTwoTone, null), href: `#/${l2Menu.id}/act-table?menuId=${l2Menu.id}`, size: 'large' }, l2Menu.title));
+            faceplateL2MenuComp.push(comp);
+        });
+        return (React.createElement(Card, Object.assign({}, other),
+            React.createElement(Space, { size: [16, 16], wrap: true }, faceplateL2MenuComp)));
+    }
+}
+export default QuickEntrance;
+//# sourceMappingURL=quick-entrance.js.map

package/lib/welcome/quick-entrance.js.map

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

package/lib/welcome/workbench.d.ts

@@ -0,0 +1,20 @@
+import React from 'react';
+import { CardProps } from 'antd';
+import 'antd/dist/antd.css';
+import { Level2Menu } from "../tmpl/interface";
+interface WorkbenchProps extends CardProps {
+}
+interface WorkbenchState {
+    l2Menus: Level2Menu[];
+}
+declare class Workbench extends React.PureComponent<WorkbenchProps, WorkbenchState> {
+    state: {
+        l2Menus: any;
+    };
+    intervals: any[];
+    componentDidMount(): Promise<void>;
+    componentWillUnmount(): void;
+    render(): JSX.Element;
+}
+export default Workbench;
+//# sourceMappingURL=workbench.d.ts.map

package/lib/welcome/workbench.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workbench.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/workbench.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAgC,SAAS,EAAC,MAAM,MAAM,CAAA;AAE7D,OAAO,oBAAoB,CAAC;AAG5B,OAAO,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAC;AAE7C,UAAU,cAAe,SAAQ,SAAS;CACzC;AAED,UAAU,cAAc;IACpB,OAAO,EAAE,UAAU,EAAE,CAAA;CACxB;AAED,cAAM,SAAU,SAAQ,KAAK,CAAC,aAAa,CAAC,cAAc,EAAE,cAAc,CAAC;IACvE,KAAK;;MAEJ;IACD,SAAS,EAAE,GAAG,EAAE,CAAM;IAEhB,iBAAiB;IAkBvB,oBAAoB,IAAI,IAAI;IAU5B,MAAM;CAwBT;AAED,eAAe,SAAS,CAAA"}

package/lib/welcome/workbench.js

@@ -0,0 +1,78 @@
+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 { Button, Card, Space, Statistic } from 'antd';
+import { RocketTwoTone } from '@ant-design/icons';
+import 'antd/dist/antd.css';
+import HcserviceV3 from "../tmpl/hcservice-v3";
+import HCDataSource from '../tmpl/hc-data-source';
+class Workbench extends React.PureComponent {
+    constructor() {
+        super(...arguments);
+        this.state = {
+            l2Menus: undefined
+        };
+        this.intervals = [];
+    }
+    componentDidMount() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let l2Menus = yield HCDataSource.workbenchMenus();
+            for (const item of l2Menus) {
+                let i = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+                    let count = yield HcserviceV3.requestLtmplCount(item.id);
+                    item.count = count;
+                    this.setState({});
+                }), 180000);
+                this.intervals.push(i);
+                let count = yield HcserviceV3.requestLtmplCount(item.id);
+                item.count = count;
+                this.setState({});
+            }
+            this.setState({
+                l2Menus
+            });
+        });
+    }
+    componentWillUnmount() {
+        if (this.intervals.length > 0) {
+            for (let i of this.intervals) {
+                console.log('workbanch移除定时任务');
+                clearInterval(i);
+            }
+        }
+        this.intervals = [];
+    }
+    render() {
+        const _a = this.props, { title } = _a, other = __rest(_a, ["title"]);
+        const { l2Menus } = this.state;
+        let faceplateStatisticL2MenusComp = [];
+        l2Menus && l2Menus.forEach((l2Menu) => {
+            let comp = (React.createElement(Card, { key: l2Menu.id },
+                React.createElement(Statistic, { prefix: React.createElement(RocketTwoTone, null), title: l2Menu.title, value: l2Menu.count }),
+                React.createElement(Button, { style: { marginTop: 12 }, href: `#/${l2Menu.id}/act-table?menuId=${l2Menu.id}` }, "\u67E5\u770B")));
+            faceplateStatisticL2MenusComp.push(comp);
+        });
+        return (React.createElement(Card, Object.assign({}, other, { title: title ? title : '工作台' }),
+            React.createElement(Space, { size: [16, 16], wrap: true }, faceplateStatisticL2MenusComp)));
+    }
+}
+export default Workbench;
+//# sourceMappingURL=workbench.js.map

package/lib/welcome/workbench.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aldehyde",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "author": "cosmicparticle",
   "main": "lib/index.js",
   "module": "src/aldehyde/index.txs",
@@ -10,19 +10,13 @@
     "src/aldehyde",
     "lib"
   ],
-  "sideEffects": [
-    "dist/*",
-    "es/**/style/*",
-    "lib/**/style/*",
-    "*.less"
-  ],
   "scripts": {
     "build": "cross-env NODE_ENV=production webpack --config config/webpack.prod.js",
     "dev": "cross-env NODE_ENV=development webpack server --config config/webpack.dev.js",
     "package-npm": "yarn tsc  && yarn build",
     "clean-lib": "rimraf lib && rimraf templib && rimraf dist",
     "tsc": "yarn clean-lib && tsc && yarn copy-files",
-    "copy-files": "copyfiles -u 2 templib/aldehyde/**/* src/aldehyde/**/*.html src/aldehyde/**/*.css src/aldehyde/**/*.png lib/"
+    "copy-files": "copyfiles -u 3 templib/src/aldehyde/**/* lib/ && copyfiles -u 2 src/aldehyde/**/*.html src/aldehyde/**/*.css src/aldehyde/**/*.png lib/"
   },
   "homepage": "./",
   "dependencies": {
@@ -36,7 +30,7 @@
     "axios": "^0.18.0",
     "bfj": "^6.1.1",
     "browserslist": "^4.6.2",
-    "caniuse-lite": "^1.0.30001299",
+    "caniuse-lite": "^1.0.30000974",
     "chalk": "^4.0.0",
     "clsx": "^1.1.1",
     "compute-scroll-into-view": "^1.0.17",
@@ -71,27 +65,6 @@
     "picomatch": "^2.3.1",
     "process": "^0.11.10",
     "prop-types": "^15.8.1",
-    "react": "^17.0.2",
-    "react-app-polyfill": "^0.1.3",
-    "react-color": "^2.19.3",
-    "react-copy-to-clipboard": "^5.0.1",
-    "react-custom-scrollbars": "^4.2.1",
-    "react-dev-utils": "^6.1.1",
-    "react-dnd": "^7.4.5",
-    "react-dnd-html5-backend": "^7.4.4",
-    "react-document-title": "^2.0.3",
-    "react-dom": "17.0.0",
-    "react-draft-wysiwyg": "^1.14.7",
-    "react-error-overlay": "^6.0.10",
-    "react-file-viewer": "^1.2.1",
-    "react-highlight-words": "^0.16.0",
-    "react-load-script": "^0.0.6",
-    "react-loadable": "^5.5.0",
-    "react-router-dom": "^4.3.1",
-    "react-signature-canvas": "^1.0.5",
-    "react-sortable-hoc": "^2.0.0",
-    "react-transition-group": "^4.4.2",
-    "react-virtualized": "^9.22.3",
     "reconnecting-websocket": "^4.4.0",
     "redux": "^4.0.1",
     "redux-devtools-extension": "^2.13.5",
@@ -184,6 +157,27 @@
     "pnp-webpack-plugin": "^1.7.0",
     "postcss-loader": "^6.2.1",
     "postcss-scss": "^3.0.5",
+    "react": "^17.0.2",
+    "react-app-polyfill": "^0.1.3",
+    "react-color": "^2.19.3",
+    "react-copy-to-clipboard": "^5.0.1",
+    "react-custom-scrollbars": "^4.2.1",
+    "react-dev-utils": "^6.1.1",
+    "react-dnd": "^7.4.5",
+    "react-dnd-html5-backend": "^7.4.4",
+    "react-document-title": "^2.0.3",
+    "react-dom": "17.0.0",
+    "react-draft-wysiwyg": "^1.14.7",
+    "react-error-overlay": "^6.0.10",
+    "react-file-viewer": "^1.2.1",
+    "react-highlight-words": "^0.16.0",
+    "react-load-script": "^0.0.6",
+    "react-loadable": "^5.5.0",
+    "react-router-dom": "^4.3.1",
+    "react-signature-canvas": "^1.0.5",
+    "react-sortable-hoc": "^2.0.0",
+    "react-transition-group": "^4.4.2",
+    "react-virtualized": "^9.22.3",
     "rimraf": "^3.0.2",
     "style-loader": "^3.3.1",
     "ts-loader": "^9.2.6",
@@ -194,5 +188,9 @@
     "webpack-manifest-plugin": "^4.0.2",
     "webpack-merge": "^5.8.0",
     "workbox-webpack-plugin": "^6.4.2"
+  },
+  "peerDependencies": {
+    "react": ">=17.0.0",
+    "react-dom": ">=17.0.0"
   }
 }

package/src/aldehyde/layout/menu/reset-password.tsx

@@ -169,13 +169,10 @@ class ResetPassword extends React.PureComponent<ResetPasswordProps, ResetPasswor
             <>
                 <Popover destroyTooltipOnHide={true} visible={showPopover} overlayStyle={{maxWidth: '400px'}} title={'修改密码'} placement="leftBottom" trigger="click"
                          content={this.getForm()}
-                ><Button type={"text"} size={'small'} onClick={()=>{
+                ><span onClick={()=>{
                     this.setState({
                         showPopover:!showPopover
-                    })
-                }} >
-                    <KeyOutlined />修改密码
-                </Button>
+                    })}} > <KeyOutlined />修改密码</span>
                 </Popover>
             </>
         );

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

@@ -1,13 +1,12 @@
 import React from 'react'
-import {Dropdown, Menu, Modal, message, Popconfirm, Avatar, Badge,Tooltip} from 'antd';
-import {UserOutlined,LogoutOutlined,ClearOutlined,KeyOutlined,SolutionOutlined} from '@ant-design/icons';
-import 'antd/dist/antd.css';
-import {Level2Menu,UserInfo} from "../../tmpl/interface";
+import {Dropdown, Menu} from 'antd';
+import {UserOutlined,LogoutOutlined,ClearOutlined} from '@ant-design/icons';
+import {UserInfo} from "../../tmpl/interface";
 import HcserviceV3 from '../../tmpl/hcservice-v3';
 import HCDataSource from "../../tmpl/hc-data-source";
 import UserInfoBar from "./userinfo-bar"
 import ResetPassword from "./reset-password";
-const confirm = Modal.confirm;
+//const confirm = Modal.confirm;
 
 interface UserBarProps {
 
@@ -50,7 +49,6 @@ class UserBar extends React.PureComponent<UserBarProps, UserBarState> {
                 {/*<Menu.Item>*/}
                 {/*    <span onClick={() => this.userDetail("edit")}><FormOutlined/>用户修改</span>*/}
                 {/*</Menu.Item>*/}
-
                 <Menu.Item>
                         <UserInfoBar />
                 </Menu.Item>
@@ -58,28 +56,16 @@ class UserBar extends React.PureComponent<UserBarProps, UserBarState> {
                     <ResetPassword></ResetPassword>
                 </Menu.Item>
                 <Menu.Item>
-                    {/*<Popconfirm*/}
-                    {/*    placement="rightBottom"*/}
-                    {/*    title={'确定要清除缓存吗'}*/}
-                    {/*    onConfirm={()=>{*/}
-                    {/*        HCDataSource.clear();*/}
-                    {/*        message.success("清除成功");*/}
-                    {/*    }}*/}
-                    {/*    okText="Yes"*/}
-                    {/*    cancelText="No"*/}
-                    {/*>*/}
-                    {/*    <span ><ClearOutlined />清空缓存</span>*/}
-                    {/*</Popconfirm>*/}
                     <span onClick={this.cleanCache}><ClearOutlined />清空缓存</span>
-                    <Menu.Item>
-                        <span onClick={HcserviceV3.logout}><LogoutOutlined/>退出登录</span>
-                    </Menu.Item>
                 </Menu.Item>
+                <Menu.Item>
+                        <span onClick={HcserviceV3.logout}><LogoutOutlined/>退出登录</span>
+                 </Menu.Item>
             </Menu>
         );
         return (
             <>
-                <Dropdown overlay={menu} placement="bottomCenter" trigger={['click']}>
+                <Dropdown overlay={menu} placement="bottomRight" trigger={['click']}>
                     <div className="userLogin">
                         {/*<Tooltip placement={'right'} title={name} >*/}
                         {/*<Avatar style={{ color:'#1890ff' }} shape="square" icon={<UserOutlined/>}  size={{ xs: 8, sm: 16, md: 24, lg: 32, xl: 40, xxl: 48 }}>*/}

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

@@ -1,13 +1,7 @@
 import React from 'react'
-import {Badge, Avatar, Dropdown, Menu, Timeline, Drawer, Space,Button} from 'antd'
-import {MessageTwoTone,AppstoreOutlined} from '@ant-design/icons';
-import 'antd/dist/antd.css';
-import {Level2Menu} from "../../tmpl/interface";
-// import HcserviceV3 from '../../tmpl/hcservice-v3'
-import HCDataSource from '../../tmpl/hc-data-source'
-import {UserOutlined,LogoutOutlined,ClearOutlined,KeyOutlined,SolutionOutlined} from '@ant-design/icons';
+import { Drawer, Space,Button} from 'antd'
+import {SolutionOutlined} from '@ant-design/icons';
 import DtmplPage from "../../module/dtmpl-page";
-import HcserviceV3 from "../../tmpl/hcservice-v3";
 
 interface UserInfoBarProps {
 

package/src/aldehyde/module/ltmpl-page.tsx

@@ -153,7 +153,7 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
                 <ActTable  mainCode={mainCode} showView={this.showView}
                              doSearch={this.doSearch} doEdit={this.doEdit} doCreate={this.doCreate}
                              sourceId={sourceId} criteriaData={criteriaData}
-                             ltmplConfig={ltmplConfigRes.ltmplConfig}/>
+                             ltmplConfig={ltmplConfigRes.ltmplConfig} />
                 {buttons.includes('detail') ?
                     <ModalDtmplView visible={showDtmplView} onCancel={()=>{
                     this.setState({