aldehyde 0.2.479 → 0.2.481

package/src/aldehyde/tree/block-menu-auth-tree.tsx

@@ -1,190 +1,190 @@
-import React from 'react'
-import { Card, Col, Row, Tree, Space } from 'antd';
-import './index.css'
-import HCserviceV3 from "../tmpl/hcservice-v3";
-import { BlockMenu, Level2Menu, ProgramAuth } from "../tmpl/interface";
-import { LocaleContext } from "../locale/LocaleProvider";
-import { DeleteOutlined, KeyOutlined, LockOutlined, PlusOutlined, RedoOutlined, UnlockOutlined } from '@ant-design/icons'
-interface BlockMenuAuthTreeProps {
-    checks: string[],
-    //checkAuthCodes: string[],
-    onChange: (checkeds: string[]) => void,
-    // onCheck: (keys, info: object) => void,
-}
-
-interface BlockMenuAuthTreeState {
-    treeData?: Object[],
-    loading?: boolean,
-    // treekeyAuthId?:{},
-    // authIdtreekeys?:{}
-
-}
-
-
-class BlockMenuAuthTree extends React.PureComponent<BlockMenuAuthTreeProps, BlockMenuAuthTreeState> {
-
-    static defaultProps = { checkeds: [] }
-
-    treekeyAuthId = {};
-    authIdtreekeys = {};
-
-    static contextType = LocaleContext;
-    context: React.ContextType<typeof LocaleContext>;
-
-
-    state = {
-        treeData: undefined,
-        loading: false,
-        // treekeyAuthId:{},
-        // authIdtreekeys:{}
-    }
-
-
-    async componentDidMount() {
-        await this.refresh();
-    }
-
-
-
-    async componentDidUpdate(prevProps, prevState) {
-        // const {checks:prechecks,} = prevProps;
-        // const {checks} = this.props;
-        // if(checks!=prechecks){
-        //     await this.refresh();
-        // }
-    }
-
-    async componentWillUnmount() {
-
-    }
-
-
-    initData = async () => {
-
-        this.setState({
-            loading: true
-        })
-
-        let data: BlockMenu[] = await HCserviceV3.requestBlockMenuAuths();
-
-        //转换成Treenode
-
-        let treeData = [];
-
-        if (data) {
-            treeData = this.toTreeNode(data);
-            console.log("treeData", treeData)
-        }
-
-        //已经选了那些
-        this.setState({
-            treeData, loading: false
-        })
-    }
-
-    toTreeNode = (blockMenus: (BlockMenu | Level2Menu)[]): Object[] => {
-        let treeData = [];
-        // let authIdtreekeys={};
-        // let treekeyAuthId={};
-        if (blockMenus) {
-            blockMenus.forEach((block) => {
-                let blockNode = { key: block.id, title: block.title }
-                treeData.push(blockNode);
-                let nextBlockMenus = [];
-                blockNode["children"] = nextBlockMenus;
-                nextBlockMenus.push(...this.toTreeNode(block.items));
-                //处理权限
-                if (block["programAuths"]) {
-
-                    block["programAuths"].forEach((auth) => {
-                        let key = blockNode.key + auth.id;
-                        this.treekeyAuthId[key] = auth.id;
-                        if (!this.authIdtreekeys[auth.id]) {
-                            this.authIdtreekeys[auth.id] = [];
-                        }
-                        this.authIdtreekeys[auth.id].push(key);
-                        let authNode = { key, title: auth.title, isLeaf: true }
-                        authNode["code"] = auth.id;
-                        nextBlockMenus.push(authNode);
-                    });
-                } else {
-
-                }
-            });
-        }
-
-        return treeData;
-
-
-    }
-
-    onCheck = (checkedKeys, e) => {
-        const { checked, node } = e;
-        let checks = [];
-        if (checkedKeys) {
-            checkedKeys.forEach((k) => {
-                const temCode = this.treekeyAuthId[k];
-                if (temCode && (checked || (!checked && temCode !== node.code))) {
-                    checks.push(temCode);
-                }
-            });
-        }
-        this.props.onChange(checks);
-    }
-
-    async refresh() {
-        this.setState({
-            loading: true
-        })
-        await this.initData();
-        this.setState({
-            loading: false,
-        })
-    }
-
-    renderTitle = (nodeData) => {
-        const { translate } = this.context;
-        return <Card variant={"borderless"} style={{ width: '100%', minWidth: '180px', marginBottom: 2 }} styles={{ body: { padding: '2px' } }} >
-            <Row>
-                <Col span={24}>
-                    <Space>
-                        {nodeData["isLeaf"] ? <KeyOutlined rotate={180} style={{ color: '#f5222d', marginRight: '4px' }} /> : null}
-                        {translate("${" + nodeData.title + "}")}
-                    </Space>
-                </Col>
-            </Row>
-        </Card>
-    }
-
-    render() {
-        const { checks, onChange } = this.props;
-        const { loading, treeData } = this.state;
-
-
-        let checkedKeys = [];
-        checks.forEach((id) => {
-            if (this.authIdtreekeys[id]) {
-                checkedKeys.push(...this.authIdtreekeys[id]);
-            }
-        })
-        // console.log("treeData", treeData);
-        // console.log("checkedKeys", checkedKeys);
-        return <Card bodyStyle={{ padding: '2px', "overflowY": "scroll", height: 'calc(78vh)', minWidth: '420px' }}
-            loading={loading}>
-            <Tree
-                checkable={true}
-                defaultExpandAll={true}
-                checkedKeys={checkedKeys}
-                showLine={{ showLeafIcon: false }}
-                selectable={false}
-                onCheck={this.onCheck}
-                titleRender={(nodeData) => {
-                    return <span title={""}> {this.renderTitle(nodeData)}</span>
-                }}
-                treeData={treeData}
-            />
-        </Card>
-    }
-}
-
+import React from 'react'
+import { Card, Col, Row, Tree, Space } from 'antd';
+import './index.css'
+import HCserviceV3 from "../tmpl/hcservice-v3";
+import { BlockMenu, Level2Menu, ProgramAuth } from "../tmpl/interface";
+import { LocaleContext } from "../locale/LocaleProvider";
+import { DeleteOutlined, KeyOutlined, LockOutlined, PlusOutlined, RedoOutlined, UnlockOutlined } from '@ant-design/icons'
+interface BlockMenuAuthTreeProps {
+    checks: string[],
+    //checkAuthCodes: string[],
+    onChange: (checkeds: string[]) => void,
+    // onCheck: (keys, info: object) => void,
+}
+
+interface BlockMenuAuthTreeState {
+    treeData?: Object[],
+    loading?: boolean,
+    // treekeyAuthId?:{},
+    // authIdtreekeys?:{}
+
+}
+
+
+class BlockMenuAuthTree extends React.PureComponent<BlockMenuAuthTreeProps, BlockMenuAuthTreeState> {
+
+    static defaultProps = { checkeds: [] }
+
+    treekeyAuthId = {};
+    authIdtreekeys = {};
+
+    static contextType = LocaleContext;
+    context: React.ContextType<typeof LocaleContext>;
+
+
+    state = {
+        treeData: undefined,
+        loading: false,
+        // treekeyAuthId:{},
+        // authIdtreekeys:{}
+    }
+
+
+    async componentDidMount() {
+        await this.refresh();
+    }
+
+
+
+    async componentDidUpdate(prevProps, prevState) {
+        // const {checks:prechecks,} = prevProps;
+        // const {checks} = this.props;
+        // if(checks!=prechecks){
+        //     await this.refresh();
+        // }
+    }
+
+    async componentWillUnmount() {
+
+    }
+
+
+    initData = async () => {
+
+        this.setState({
+            loading: true
+        })
+
+        let data: BlockMenu[] = await HCserviceV3.requestBlockMenuAuths();
+
+        //转换成Treenode
+
+        let treeData = [];
+
+        if (data) {
+            treeData = this.toTreeNode(data);
+            console.log("treeData", treeData)
+        }
+
+        //已经选了那些
+        this.setState({
+            treeData, loading: false
+        })
+    }
+
+    toTreeNode = (blockMenus: (BlockMenu | Level2Menu)[]): Object[] => {
+        let treeData = [];
+        // let authIdtreekeys={};
+        // let treekeyAuthId={};
+        if (blockMenus) {
+            blockMenus.forEach((block) => {
+                let blockNode = { key: block.id, title: block.title }
+                treeData.push(blockNode);
+                let nextBlockMenus = [];
+                blockNode["children"] = nextBlockMenus;
+                nextBlockMenus.push(...this.toTreeNode(block.items));
+                //处理权限
+                if (block["programAuths"]) {
+
+                    block["programAuths"].forEach((auth) => {
+                        let key = blockNode.key + auth.id;
+                        this.treekeyAuthId[key] = auth.id;
+                        if (!this.authIdtreekeys[auth.id]) {
+                            this.authIdtreekeys[auth.id] = [];
+                        }
+                        this.authIdtreekeys[auth.id].push(key);
+                        let authNode = { key, title: auth.title, isLeaf: true }
+                        authNode["code"] = auth.id;
+                        nextBlockMenus.push(authNode);
+                    });
+                } else {
+
+                }
+            });
+        }
+
+        return treeData;
+
+
+    }
+
+    onCheck = (checkedKeys, e) => {
+        const { checked, node } = e;
+        let checks = [];
+        if (checkedKeys) {
+            checkedKeys.forEach((k) => {
+                const temCode = this.treekeyAuthId[k];
+                if (temCode && (checked || (!checked && temCode !== node.code))) {
+                    checks.push(temCode);
+                }
+            });
+        }
+        this.props.onChange(checks);
+    }
+
+    async refresh() {
+        this.setState({
+            loading: true
+        })
+        await this.initData();
+        this.setState({
+            loading: false,
+        })
+    }
+
+    renderTitle = (nodeData) => {
+        const { translate } = this.context;
+        return <Card variant={"borderless"} style={{ width: '100%', minWidth: '180px', marginBottom: 2 }} styles={{ body: { padding: '2px' } }} >
+            <Row>
+                <Col span={24}>
+                    <Space>
+                        {nodeData["isLeaf"] ? <KeyOutlined rotate={180} style={{ color: '#f5222d', marginRight: '4px' }} /> : null}
+                        {translate("${" + nodeData.title + "}")}
+                    </Space>
+                </Col>
+            </Row>
+        </Card>
+    }
+
+    render() {
+        const { checks, onChange } = this.props;
+        const { loading, treeData } = this.state;
+
+
+        let checkedKeys = [];
+        checks.forEach((id) => {
+            if (this.authIdtreekeys[id]) {
+                checkedKeys.push(...this.authIdtreekeys[id]);
+            }
+        })
+        // console.log("treeData", treeData);
+        // console.log("checkedKeys", checkedKeys);
+        return <Card bodyStyle={{ padding: '2px', "overflowY": "scroll", height: 'calc(78vh)', minWidth: '420px' }}
+            loading={loading}>
+            <Tree
+                checkable={true}
+                defaultExpandAll={true}
+                checkedKeys={checkedKeys}
+                showLine={{ showLeafIcon: false }}
+                selectable={false}
+                onCheck={this.onCheck}
+                titleRender={(nodeData) => {
+                    return <span title={""}> {this.renderTitle(nodeData)}</span>
+                }}
+                treeData={treeData}
+            />
+        </Card>
+    }
+}
+
 export default BlockMenuAuthTree

package/src/aldehyde/tree/index.css

@@ -1,23 +1,23 @@
-.tree-container {
-    box-shadow: 1px 0 0px 1px rgba(0, 0, 0, 0.3);
-}
-
-.tree-node {
-    box-shadow: 0.4px 0px 0px 0.4px rgba(0, 0, 0, 0.2);
-    margin-bottom: 2px;
-}
-
-
-
-.tree-card-title-body {
-    padding: 2px;
-    min-width: 280px;
-}
-
-.ant-tree-node-selected {
-    background-color: transparent !important;
-}
-
-.ant-avatar-string {
-    transform: scale(0.8) translateX(-50%) !important;
+.tree-container {
+    box-shadow: 1px 0 0px 1px rgba(0, 0, 0, 0.3);
+}
+
+.tree-node {
+    box-shadow: 0.4px 0px 0px 0.4px rgba(0, 0, 0, 0.2);
+    margin-bottom: 2px;
+}
+
+
+
+.tree-card-title-body {
+    padding: 2px;
+    min-width: 280px;
+}
+
+.ant-tree-node-selected {
+    background-color: transparent !important;
+}
+
+.ant-avatar-string {
+    transform: scale(0.8) translateX(-50%) !important;
 }

package/src/aldehyde/tree/navigation-tree.tsx

@@ -1,40 +1,40 @@
-import React, { useEffect, useState } from "react";
-import TreeUtils, { TtmplNodeConfig } from "./tree-utils";
-import HCDataSource from "../tmpl/hc-data-source";
-import TmplTree from "./tmpl-tree";
-
-interface NavigationTreeProps {
-  sourceId: string;
-  onClick?: (val) => void;
-  defExpandedRoot?: boolean; // 默认展开根节点
-  defSelect?: boolean; // 默认选中节点
-  currentId?: string; // 默认选中的节点
-}
-
-const NavigationTree = (props: NavigationTreeProps) => {
-  const { sourceId, onClick, defExpandedRoot, defSelect, currentId } = props
-  const [ttmplNodeConfig, setTtmplNodeConfig] = useState<TtmplNodeConfig>(undefined);
-
-  const getttmplConfig = async () => {
-    let ttmplConfig = await HCDataSource.requestTtmplConfig(null, sourceId);
-    let ttmplNodeConfig = await TreeUtils.initTtmplNodeConfig(ttmplConfig);
-    setTtmplNodeConfig(ttmplNodeConfig);
-  }
-
-  useEffect(() => {
-    if (sourceId) {
-      getttmplConfig();
-    }
-  }, [sourceId]);
-
-
-  return <TmplTree
-    onClickNode={(node) => onClick && onClick(node)}
-    ttmplNodeConfig={ttmplNodeConfig}
-    defExpandedRoot={defExpandedRoot}
-    defSelect={defSelect}
-    currentId={currentId}
-  />
-}
-
+import React, { useEffect, useState } from "react";
+import TreeUtils, { TtmplNodeConfig } from "./tree-utils";
+import HCDataSource from "../tmpl/hc-data-source";
+import TmplTree from "./tmpl-tree";
+
+interface NavigationTreeProps {
+  sourceId: string;
+  onClick?: (val) => void;
+  defExpandedRoot?: boolean; // 默认展开根节点
+  defSelect?: boolean; // 默认选中节点
+  currentId?: string; // 默认选中的节点
+}
+
+const NavigationTree = (props: NavigationTreeProps) => {
+  const { sourceId, onClick, defExpandedRoot, defSelect, currentId } = props
+  const [ttmplNodeConfig, setTtmplNodeConfig] = useState<TtmplNodeConfig>(undefined);
+
+  const getttmplConfig = async () => {
+    let ttmplConfig = await HCDataSource.requestTtmplConfig(null, sourceId);
+    let ttmplNodeConfig = await TreeUtils.initTtmplNodeConfig(ttmplConfig);
+    setTtmplNodeConfig(ttmplNodeConfig);
+  }
+
+  useEffect(() => {
+    if (sourceId) {
+      getttmplConfig();
+    }
+  }, [sourceId]);
+
+
+  return <TmplTree
+    onClickNode={(node) => onClick && onClick(node)}
+    ttmplNodeConfig={ttmplNodeConfig}
+    defExpandedRoot={defExpandedRoot}
+    defSelect={defSelect}
+    currentId={currentId}
+  />
+}
+
 export default NavigationTree;