aldehyde 0.2.197 → 0.2.199

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

@@ -1,258 +1,258 @@
-import React, { CSSProperties } from "react";
-import { Avatar, Col, Dropdown, Menu, MenuProps, Row, Tooltip } from "antd";
-import { LoginOutlined, LogoutOutlined, UserOutlined } 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";
-import { LocaleContext } from "../../locale/LocaleProvider";
-import { LocaleType } from "../../locale/langMp";
-
-//const confirm = Modal.confirm;
-
-interface UserBarProps {
-  backgroudColor?: string;
-  showUserInfo?: boolean;
-  showChangePassword?: boolean;
-  menu?: MenuProps;
-}
-
-interface UserBarState extends UserInfo {
-  context: Array<object>;
-}
-
-class UserBar extends React.PureComponent<UserBarProps, UserBarState> {
-  state = {
-    id: undefined,
-    name: undefined,
-    roles: [],
-    context: undefined,
-    cleanCachable: false,
-    gtmplSourceId: undefined,
-    changePasswordable: undefined,
-    changePersonalInfoable: undefined,
-    viewPersonalInfoable: undefined,
-  };
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-
-  static defaultProps = {
-    backgroudColor: "#4a5f74",
-    showUserInfo: true,
-    showChangePassword: true,
-  };
-
-  async componentDidMount() {
-    let userInfo: UserInfo = await HcserviceV3.getUser();
-    //查询 上下文配置信息
-    let context = await HcserviceV3.getContextSourceValue();
-    // console.log('context', context);
-    this.setState({
-      context,
-      ...userInfo,
-    });
-  }
-
-  cleanCache = () => {
-    let { roles } = this.state;
-    let loading = document.getElementById("ajaxLoading");
-    loading.style.display = "block";
-    HCDataSource.reload(roles);
-    loading.style.display = "none";
-  };
-
-  getContext = () => {
-    let { context } = this.state;
-    const { translate } = this.context;
-    if (context) {
-      console.log("context", context);
-      return (
-        <>
-          {context.map((c) => {
-            return (
-              <Row>
-                <Col>
-                  {c.label} : {c.content}
-                </Col>
-              </Row>
-            );
-          })}
-        </>
-      );
-    }
-    return translate("${无}");
-  };
-  toSetContext = () => {
-    window.location.hash = "#/context-setter";
-  };
-
-  getTitle = () => {
-    const { name, context } = this.state;
-    return (
-      <>
-        <p>{name}</p>
-        {context
-          ? context.map((con) => {
-              return (
-                <p>
-                  {con.label} : {con.content}
-                </p>
-              );
-            })
-          : null}
-      </>
-    );
-  };
-
-  render() {
-    const {
-      backgroudColor,
-      showUserInfo,
-      showChangePassword,
-      menu,
-    } = this.props;
-    const {
-      name,
-      context,
-      cleanCachable,
-      gtmplSourceId,
-      changePasswordable,
-      changePersonalInfoable,
-      viewPersonalInfoable,
-      id,
-    } = this.state;
-    const { translate, changeLocale, locale, availableLang } = this.context;
-    const syyy: CSSProperties = {
-      "--message-bar-backgroupd": backgroudColor,
-    } as CSSProperties;
-
-    const items: MenuProps["items"] = [];
-
-    const langItems = availableLang.map((lang) => ({
-      label: (
-        <span onClick={() => changeLocale(lang as LocaleType)} style={locale === lang ? { color: backgroudColor } : {}}>
-          { lang }
-        </span>
-      ),
-      key: lang,
-    }))
-
-    langItems.unshift({
-      label: (
-        <span
-          onClick={() => changeLocale("zh")}
-          style={locale === "zh" ? { color: backgroudColor } : {}}
-        >
-          中文
-        </span>
-      ),
-      key: "zh",
-    });
-
-    items.push({
-      key: "locale",
-      label: translate("${切换语言}"),
-      children: langItems,
-    });
-
-    if (name) {
-      showUserInfo && viewPersonalInfoable
-        ? items.push({
-            key: "1",
-            label: (
-              <UserInfoBar
-                gtmplSourceId={gtmplSourceId}
-                editable={changePersonalInfoable}
-                userCode={id}
-              />
-            ),
-          })
-        : null;
-      context && context.length > 0
-        ? items.push({
-            key: "2",
-            label: (
-              <span onClick={this.toSetContext}>
-                {translate("${全局配置}")}
-              </span>
-            ),
-          })
-        : null;
-      showChangePassword && changePasswordable
-        ? items.push({
-            key: "3",
-            label: <ResetPassword></ResetPassword>,
-          })
-        : null;
-
-      cleanCachable
-        ? items.push({
-            key: "4",
-            label: (
-              <span onClick={this.cleanCache}>{translate("${清空缓存}")}</span>
-            ),
-          })
-        : null;
-
-      items.push({
-        key: "5",
-        label: (
-          <span onClick={HcserviceV3.logout}>
-            <LogoutOutlined /> {translate("${退出}")}
-          </span>
-        ),
-      });
-    } else {
-      items.push({
-        key: "2",
-        label: (
-          <span onClick={HcserviceV3.logout}>
-            <LoginOutlined /> {translate("${登录}")}
-          </span>
-        ),
-      });
-    }
-
-    return (
-      <>
-        <Dropdown
-          menu={menu ? menu : { items }}
-          placement="bottomRight"
-          trigger={["click"]}
-        >
-          <div
-            className="userLogin"
-            style={{
-              ...syyy,
-              ...{
-                display: "flex",
-                justifyContent: "center",
-                alignItems: "center",
-              },
-              height: 55,
-            }}
-          >
-            {/*<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 }}>*/}
-            {/*</Avatar>*/}
-            {/*</Tooltip>*/}
-            {/*<UserOutlined/>*/}
-            <Tooltip placement="left" title={this.getTitle()}>
-              <Avatar
-                className={"loginAvatar"}
-                icon={<UserOutlined />}
-                size="large"
-              >
-                {/*{name ?name.substring(0,1).toUpperCase():null}*/}
-              </Avatar>
-              {/*<span>{name && name.length>=8?name.substring(0,5)+'...':name}</span>*/}
-            </Tooltip>
-          </div>
-        </Dropdown>
-      </>
-    );
-  }
-}
-
-export default UserBar;
+import React, { CSSProperties } from "react";
+import { Avatar, Col, Dropdown, Menu, MenuProps, Row, Tooltip } from "antd";
+import { LoginOutlined, LogoutOutlined, UserOutlined } 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";
+import { LocaleContext } from "../../locale/LocaleProvider";
+import { LocaleType } from "../../locale/langMp";
+
+//const confirm = Modal.confirm;
+
+interface UserBarProps {
+  backgroudColor?: string;
+  showUserInfo?: boolean;
+  showChangePassword?: boolean;
+  menu?: MenuProps;
+}
+
+interface UserBarState extends UserInfo {
+  context: Array<object>;
+}
+
+class UserBar extends React.PureComponent<UserBarProps, UserBarState> {
+  state = {
+    id: undefined,
+    name: undefined,
+    roles: [],
+    context: undefined,
+    cleanCachable: false,
+    gtmplSourceId: undefined,
+    changePasswordable: undefined,
+    changePersonalInfoable: undefined,
+    viewPersonalInfoable: undefined,
+  };
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  static defaultProps = {
+    backgroudColor: "#4a5f74",
+    showUserInfo: true,
+    showChangePassword: true,
+  };
+
+  async componentDidMount() {
+    let userInfo: UserInfo = await HcserviceV3.getUser();
+    //查询 上下文配置信息
+    let context = await HcserviceV3.getContextSourceValue();
+    // console.log('context', context);
+    this.setState({
+      context,
+      ...userInfo,
+    });
+  }
+
+  cleanCache = () => {
+    let { roles } = this.state;
+    let loading = document.getElementById("ajaxLoading");
+    loading.style.display = "block";
+    HCDataSource.reload(roles);
+    loading.style.display = "none";
+  };
+
+  getContext = () => {
+    let { context } = this.state;
+    const { translate } = this.context;
+    if (context) {
+      console.log("context", context);
+      return (
+        <>
+          {context.map((c) => {
+            return (
+              <Row>
+                <Col>
+                  {c.label} : {c.content}
+                </Col>
+              </Row>
+            );
+          })}
+        </>
+      );
+    }
+    return translate("${无}");
+  };
+  toSetContext = () => {
+    window.location.hash = "#/context-setter";
+  };
+
+  getTitle = () => {
+    const { name, context } = this.state;
+    return (
+      <>
+        <p>{name}</p>
+        {context
+          ? context.map((con) => {
+              return (
+                <p>
+                  {con.label} : {con.content}
+                </p>
+              );
+            })
+          : null}
+      </>
+    );
+  };
+
+  render() {
+    const {
+      backgroudColor,
+      showUserInfo,
+      showChangePassword,
+      menu,
+    } = this.props;
+    const {
+      name,
+      context,
+      cleanCachable,
+      gtmplSourceId,
+      changePasswordable,
+      changePersonalInfoable,
+      viewPersonalInfoable,
+      id,
+    } = this.state;
+    const { translate, changeLocale, locale, availableLang } = this.context;
+    const syyy: CSSProperties = {
+      "--message-bar-backgroupd": backgroudColor,
+    } as CSSProperties;
+
+    const items: MenuProps["items"] = [];
+
+    const langItems = availableLang.map((lang) => ({
+      label: (
+        <span onClick={() => changeLocale(lang as LocaleType)} style={locale === lang ? { color: backgroudColor } : {}}>
+          { lang }
+        </span>
+      ),
+      key: lang,
+    }))
+
+    langItems.unshift({
+      label: (
+        <span
+          onClick={() => changeLocale("zh")}
+          style={locale === "zh" ? { color: backgroudColor } : {}}
+        >
+          中文
+        </span>
+      ),
+      key: "zh",
+    });
+
+    items.push({
+      key: "locale",
+      label: translate("${切换语言}"),
+      children: langItems,
+    });
+
+    if (name) {
+      showUserInfo && viewPersonalInfoable
+        ? items.push({
+            key: "1",
+            label: (
+              <UserInfoBar
+                gtmplSourceId={gtmplSourceId}
+                editable={changePersonalInfoable}
+                userCode={id}
+              />
+            ),
+          })
+        : null;
+      context && context.length > 0
+        ? items.push({
+            key: "2",
+            label: (
+              <span onClick={this.toSetContext}>
+                {translate("${全局配置}")}
+              </span>
+            ),
+          })
+        : null;
+      showChangePassword && changePasswordable
+        ? items.push({
+            key: "3",
+            label: <ResetPassword></ResetPassword>,
+          })
+        : null;
+
+      cleanCachable
+        ? items.push({
+            key: "4",
+            label: (
+              <span onClick={this.cleanCache}>{translate("${清空缓存}")}</span>
+            ),
+          })
+        : null;
+
+      items.push({
+        key: "5",
+        label: (
+          <span onClick={HcserviceV3.logout}>
+            <LogoutOutlined /> {translate("${退出}")}
+          </span>
+        ),
+      });
+    } else {
+      items.push({
+        key: "2",
+        label: (
+          <span onClick={HcserviceV3.logout}>
+            <LoginOutlined /> {translate("${登录}")}
+          </span>
+        ),
+      });
+    }
+
+    return (
+      <>
+        <Dropdown
+          menu={menu ? menu : { items }}
+          placement="bottomRight"
+          trigger={["click"]}
+        >
+          <div
+            className="userLogin"
+            style={{
+              ...syyy,
+              ...{
+                display: "flex",
+                justifyContent: "center",
+                alignItems: "center",
+              },
+              height: 55,
+            }}
+          >
+            {/*<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 }}>*/}
+            {/*</Avatar>*/}
+            {/*</Tooltip>*/}
+            {/*<UserOutlined/>*/}
+            <Tooltip placement="left" title={this.getTitle()}>
+              <Avatar
+                className={"loginAvatar"}
+                icon={<UserOutlined />}
+                size="large"
+              >
+                {/*{name ?name.substring(0,1).toUpperCase():null}*/}
+              </Avatar>
+              {/*<span>{name && name.length>=8?name.substring(0,5)+'...':name}</span>*/}
+            </Tooltip>
+          </div>
+        </Dropdown>
+      </>
+    );
+  }
+}
+
+export default UserBar;

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

@@ -1,69 +1,69 @@
-import React from "react";
-import DtmplViewDrawer from "../../module/dtmpl-view-drawer";
-import { LocaleContext } from "../../locale/LocaleProvider";
-
-interface UserInfoBarProps {
-  gtmplSourceId: string;
-  userCode: string;
-  editable?: boolean;
-}
-
-interface UserInfoBarState {
-  showDraw?: boolean;
-}
-
-class UserInfoBar extends React.PureComponent<
-  UserInfoBarProps,
-  UserInfoBarState
-> {
-  state = {
-    showDraw: false,
-  };
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-
-  static defaultProps = {
-    editable: false,
-  };
-
-  async componentDidMount() {}
-  showDraw = () => {
-    this.setState({
-      showDraw: true,
-    });
-  };
-
-  closeDrawer = () => {
-    this.setState({
-      showDraw: false,
-    });
-  };
-
-  render() {
-    const { showDraw } = this.state;
-    const { gtmplSourceId, userCode, editable } = this.props;
-    const { translate } = this.context;
-    return (
-      <>
-        {userCode ? (
-          <>
-            <span onClick={this.showDraw}>{translate("${个人信息}")}</span>
-            {showDraw ? (
-              <DtmplViewDrawer
-                serverKey={null}
-                editable={editable}
-                title={translate("${个人信息}")}
-                sourceId={gtmplSourceId}
-                open={showDraw}
-                code={userCode}
-                onClose={this.closeDrawer}
-              ></DtmplViewDrawer>
-            ) : null}
-          </>
-        ) : null}{" "}
-      </>
-    );
-  }
-}
-
-export default UserInfoBar;
+import React from "react";
+import DtmplViewDrawer from "../../module/dtmpl-view-drawer";
+import { LocaleContext } from "../../locale/LocaleProvider";
+
+interface UserInfoBarProps {
+  gtmplSourceId: string;
+  userCode: string;
+  editable?: boolean;
+}
+
+interface UserInfoBarState {
+  showDraw?: boolean;
+}
+
+class UserInfoBar extends React.PureComponent<
+  UserInfoBarProps,
+  UserInfoBarState
+> {
+  state = {
+    showDraw: false,
+  };
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  static defaultProps = {
+    editable: false,
+  };
+
+  async componentDidMount() {}
+  showDraw = () => {
+    this.setState({
+      showDraw: true,
+    });
+  };
+
+  closeDrawer = () => {
+    this.setState({
+      showDraw: false,
+    });
+  };
+
+  render() {
+    const { showDraw } = this.state;
+    const { gtmplSourceId, userCode, editable } = this.props;
+    const { translate } = this.context;
+    return (
+      <>
+        {userCode ? (
+          <>
+            <span onClick={this.showDraw}>{translate("${个人信息}")}</span>
+            {showDraw ? (
+              <DtmplViewDrawer
+                serverKey={null}
+                editable={editable}
+                title={translate("${个人信息}")}
+                sourceId={gtmplSourceId}
+                open={showDraw}
+                code={userCode}
+                onClose={this.closeDrawer}
+              ></DtmplViewDrawer>
+            ) : null}
+          </>
+        ) : null}{" "}
+      </>
+    );
+  }
+}
+
+export default UserInfoBar;