aldehyde 0.2.480 → 0.2.481

package/src/aldehyde/layout/menu/l2menu-message-bar.tsx

@@ -1,161 +1,161 @@
-import React, { CSSProperties, useEffect, useState, useRef } from "react";
-import { Badge, Dropdown, Button } from "antd";
-import { BellOutlined } from "@ant-design/icons";
-import { Level2Menu } from "../../tmpl/interface";
-import HcserviceV3 from "../../tmpl/hcservice-v3";
-import { NavLink } from "react-router-dom";
-import HCDataSource from "../../tmpl/hc-data-source";
-import WebSocket from "../../tmpl/web-socket";
-import Units from "../../units";
-import "./message-bar.less";
-
-interface L2MenuMessageBarProps {
-  backgroudColor?: string;
-  style?: CSSProperties;
-  version?: string;
-}
-
-interface MessageBar {
-  l2Menu: Level2Menu;
-  count: number;
-}
-
-const Index = (props: L2MenuMessageBarProps) => {
-  const { backgroudColor, style = {}, version = "v2" } = props;
-  const [messageBars, setMessageBars] = useState<MessageBar[]>([]);
-  const wsRef = useRef(undefined); // 实时数据websocket连接
-  const subscribeRef = useRef(undefined); // 实时数据订阅
-
-  const getMessageBars = async () => {
-    let l2Menus = await HCDataSource.fastMenu("MessageBar");
-    const temArr: MessageBar[] = [];
-    if (l2Menus) {
-      for (const item of l2Menus) {
-        if (item.disabled) {
-          continue;
-        }
-
-        const messageBar: MessageBar = { l2Menu: item, count: 0 };
-        let count = await HcserviceV3.requestLtmplCount(null, item.id);
-        messageBar.count = count;
-        temArr.push(messageBar);
-      }
-    }
-    setMessageBars(temArr);
-    if (temArr?.length) getWebSocketMessageBar();
-  }
-
-  // 订阅消息数据
-  const getWebSocketMessageBar = async () => {
-    if (subscribeRef.current) { subscribeRef.current.unsubscribe(); }
-    wsRef.current = WebSocket.getInstance("v3/kk-ws");
-    subscribeRef.current = await wsRef.current.subscribe("/user/queue/bar-messages", {}, (data) => {
-      const temData = data?.message?.[0] || {};
-      setMessageBars(val => val.map(r => r.l2Menu.id === temData.menuId ? { ...r, count: temData.count } : r));
-    });
-  }
-
-  useEffect(() => {
-    getMessageBars();
-    return () => {
-      if (subscribeRef.current) { subscribeRef.current.unsubscribe(); }
-    }
-  }, []);
-
-  const renderMessageBar = () => {
-    let total: number = 0;
-    const syyy: CSSProperties = { "--message-bar-backgroupd": backgroudColor } as CSSProperties;
-
-    const menu = messageBars.map((messageBar, index) => {
-      if (messageBar.count) {
-        total = total + messageBar.count;
-      }
-      let defaultCriteriaData = "";
-      if (messageBar.l2Menu.defaultCriteriaValue) {
-        defaultCriteriaData = "&" + Units.transQueryParamsToStr(messageBar.l2Menu.defaultCriteriaValue);
-      }
-      return {
-        key: index,
-        label: <NavLink
-          to={`/${version}/${messageBar.l2Menu.id}/act-table?menuId=${messageBar.l2Menu.id}${defaultCriteriaData}`}
-        >
-          {messageBar.l2Menu.title}
-          <Badge
-            count={messageBar.count}
-            overflowCount={99}
-            offset={[2, -2]}
-            size="small"
-          />
-        </NavLink>
-      };
-    });
-
-    if (!messageBars?.length) {
-      return;
-    }
-    if (messageBars.length == 1) {
-      let messageBar = messageBars[0];
-      const l2Menu = messageBar.l2Menu;
-      let defaultCriteriaData = "";
-      if (l2Menu.defaultCriteriaValue) {
-        defaultCriteriaData = "&" + Units.transQueryParamsToStr(l2Menu.defaultCriteriaValue);
-      }
-      return (
-        <div style={syyy}>
-          <a
-            href={
-              l2Menu.customPath
-                ? `/page/${l2Menu.id}${l2Menu.customPath}?menuId=${l2Menu.id}`
-                : `#/${version}/${l2Menu.id}/act-table?menuId=${l2Menu.id}${defaultCriteriaData}`
-            }
-            className="head-example"
-          >
-            <Badge size="small" count={messageBar.count} overflowCount={99} offset={[6, -2]} className="ripple-dot">
-              <Button
-                icon={<BellOutlined />}
-                shape="default"
-                size="large"
-                type="text"
-                style={{
-                  width: "100%",
-                  height: "100%",
-                  boxSizing: "border-box",
-                  padding: 0,
-                  borderRadius: 0,
-                  ...style
-                }}
-              />
-            </Badge>
-          </a>
-        </div>
-      );
-    } else {
-      return (
-        <Dropdown menu={{ items: menu }} placement="bottomCenter">
-          <div style={syyy}>
-            <Badge size="small" count={total} overflowCount={99} offset={[6, -2]} className="ripple-dot">
-              <Button
-                icon={<BellOutlined />}
-                shape="default"
-                size="large"
-                type="text"
-                style={{
-                  width: "100%",
-                  height: "100%",
-                  boxSizing: "border-box",
-                  padding: 0,
-                  borderRadius: 0,
-                  ...style
-                }}
-              />
-            </Badge>
-          </div>
-        </Dropdown>
-      );
-    }
-  };
-
-  return messageBars?.length ? renderMessageBar() : "";
-}
-
+import React, { CSSProperties, useEffect, useState, useRef } from "react";
+import { Badge, Dropdown, Button } from "antd";
+import { BellOutlined } from "@ant-design/icons";
+import { Level2Menu } from "../../tmpl/interface";
+import HcserviceV3 from "../../tmpl/hcservice-v3";
+import { NavLink } from "react-router-dom";
+import HCDataSource from "../../tmpl/hc-data-source";
+import WebSocket from "../../tmpl/web-socket";
+import Units from "../../units";
+import "./message-bar.less";
+
+interface L2MenuMessageBarProps {
+  backgroudColor?: string;
+  style?: CSSProperties;
+  version?: string;
+}
+
+interface MessageBar {
+  l2Menu: Level2Menu;
+  count: number;
+}
+
+const Index = (props: L2MenuMessageBarProps) => {
+  const { backgroudColor, style = {}, version = "v2" } = props;
+  const [messageBars, setMessageBars] = useState<MessageBar[]>([]);
+  const wsRef = useRef(undefined); // 实时数据websocket连接
+  const subscribeRef = useRef(undefined); // 实时数据订阅
+
+  const getMessageBars = async () => {
+    let l2Menus = await HCDataSource.fastMenu("MessageBar");
+    const temArr: MessageBar[] = [];
+    if (l2Menus) {
+      for (const item of l2Menus) {
+        if (item.disabled) {
+          continue;
+        }
+
+        const messageBar: MessageBar = { l2Menu: item, count: 0 };
+        let count = await HcserviceV3.requestLtmplCount(null, item.id);
+        messageBar.count = count;
+        temArr.push(messageBar);
+      }
+    }
+    setMessageBars(temArr);
+    if (temArr?.length) getWebSocketMessageBar();
+  }
+
+  // 订阅消息数据
+  const getWebSocketMessageBar = async () => {
+    if (subscribeRef.current) { subscribeRef.current.unsubscribe(); }
+    wsRef.current = WebSocket.getInstance("v3/kk-ws");
+    subscribeRef.current = await wsRef.current.subscribe("/user/queue/bar-messages", {}, (data) => {
+      const temData = data?.message?.[0] || {};
+      setMessageBars(val => val.map(r => r.l2Menu.id === temData.menuId ? { ...r, count: temData.count } : r));
+    });
+  }
+
+  useEffect(() => {
+    getMessageBars();
+    return () => {
+      if (subscribeRef.current) { subscribeRef.current.unsubscribe(); }
+    }
+  }, []);
+
+  const renderMessageBar = () => {
+    let total: number = 0;
+    const syyy: CSSProperties = { "--message-bar-backgroupd": backgroudColor } as CSSProperties;
+
+    const menu = messageBars.map((messageBar, index) => {
+      if (messageBar.count) {
+        total = total + messageBar.count;
+      }
+      let defaultCriteriaData = "";
+      if (messageBar.l2Menu.defaultCriteriaValue) {
+        defaultCriteriaData = "&" + Units.transQueryParamsToStr(messageBar.l2Menu.defaultCriteriaValue);
+      }
+      return {
+        key: index,
+        label: <NavLink
+          to={`/${version}/${messageBar.l2Menu.id}/act-table?menuId=${messageBar.l2Menu.id}${defaultCriteriaData}`}
+        >
+          {messageBar.l2Menu.title}
+          <Badge
+            count={messageBar.count}
+            overflowCount={99}
+            offset={[2, -2]}
+            size="small"
+          />
+        </NavLink>
+      };
+    });
+
+    if (!messageBars?.length) {
+      return;
+    }
+    if (messageBars.length == 1) {
+      let messageBar = messageBars[0];
+      const l2Menu = messageBar.l2Menu;
+      let defaultCriteriaData = "";
+      if (l2Menu.defaultCriteriaValue) {
+        defaultCriteriaData = "&" + Units.transQueryParamsToStr(l2Menu.defaultCriteriaValue);
+      }
+      return (
+        <div style={syyy}>
+          <a
+            href={
+              l2Menu.customPath
+                ? `/page/${l2Menu.id}${l2Menu.customPath}?menuId=${l2Menu.id}`
+                : `#/${version}/${l2Menu.id}/act-table?menuId=${l2Menu.id}${defaultCriteriaData}`
+            }
+            className="head-example"
+          >
+            <Badge size="small" count={messageBar.count} overflowCount={99} offset={[6, -2]} className="ripple-dot">
+              <Button
+                icon={<BellOutlined />}
+                shape="default"
+                size="large"
+                type="text"
+                style={{
+                  width: "100%",
+                  height: "100%",
+                  boxSizing: "border-box",
+                  padding: 0,
+                  borderRadius: 0,
+                  ...style
+                }}
+              />
+            </Badge>
+          </a>
+        </div>
+      );
+    } else {
+      return (
+        <Dropdown menu={{ items: menu }} placement="bottomCenter">
+          <div style={syyy}>
+            <Badge size="small" count={total} overflowCount={99} offset={[6, -2]} className="ripple-dot">
+              <Button
+                icon={<BellOutlined />}
+                shape="default"
+                size="large"
+                type="text"
+                style={{
+                  width: "100%",
+                  height: "100%",
+                  boxSizing: "border-box",
+                  padding: 0,
+                  borderRadius: 0,
+                  ...style
+                }}
+              />
+            </Badge>
+          </div>
+        </Dropdown>
+      );
+    }
+  };
+
+  return messageBars?.length ? renderMessageBar() : "";
+}
+
 export default Index;

package/src/aldehyde/layout/menu/l2menu-quick-bar.tsx

@@ -1,175 +1,175 @@
-import React, { CSSProperties } from "react";
-import { Dropdown, Drawer, Space, Button } from "antd";
-import { AppstoreOutlined } from "@ant-design/icons";
-import { Level2Menu } from "../../tmpl/interface";
-import HCDataSource from "../../tmpl/hc-data-source";
-import LtmplTable from "../../module/ltmpl-table";
-import { LocaleContext } from "../../locale/LocaleProvider";
-import IconFont from "../../layout2/components/icon-font";
-
-interface L2MenuQuickBarProps {
-  backgroudColor?: string;
-  style?: CSSProperties;
-}
-
-interface QuickBar {
-  l2Menu: Level2Menu;
-  count: number;
-}
-
-interface L2MenuQuickBarState {
-  quickBars?: QuickBar[];
-  anyState?: boolean;
-  currentId?: string;
-  showDraw?: boolean;
-  drawerSize?: number | string; // 抽屉组件尺寸
-}
-
-class L2MenuQuickBar extends React.PureComponent<
-  L2MenuQuickBarProps,
-  L2MenuQuickBarState
-> {
-  state = {
-    quickBars: undefined,
-    anyState: false,
-    currentId: undefined,
-    showDraw: false,
-    drawerSize: "92vw",
-  };
-  static defaultProps = {
-    backgroudColor: "#4a5f74",
-  };
-  static contextType = LocaleContext;
-  context: React.ContextType<typeof LocaleContext>;
-
-  async componentDidMount() {
-    let l2Menus = await HCDataSource.fastMenu("QuickQueryBar");
-    const quickBars: QuickBar[] = [];
-    if (l2Menus) {
-      for (const item of l2Menus) {
-        if (item.disabled) {
-          continue;
-        }
-        const quickBar: QuickBar = {
-          l2Menu: item,
-          count: 0,
-        };
-        let that = this;
-        quickBars.push(quickBar);
-      }
-    }
-
-    this.setState({
-      quickBars,
-    });
-  }
-  showDraw = (currentId: string) => {
-    // console.log("点击了L2MenuQuickBar",currentId);
-    this.setState({
-      currentId,
-      showDraw: true,
-    });
-  };
-
-  closeDrawer = () => {
-    this.setState({
-      showDraw: false,
-    });
-  };
-
-  renderQuickBar = (quickBars: QuickBar[]) => {
-    const { backgroudColor, style = {} } = this.props;
-    const { translate } = this.context;
-    let total: number = 0;
-    const syyy: CSSProperties = { "--message-bar-backgroupd": backgroudColor } as CSSProperties;
-    const menu = quickBars.map((quickBar, index) => {
-      if (quickBar.count) {
-        total = total + quickBar.count;
-      }
-      const renderIcon = quickBar.l2Menu.icon ? <IconFont type={quickBar.l2Menu.icon} /> : "";
-      return {
-        key: index,
-        label: <span onClick={() => this.showDraw(quickBar.l2Menu.id)}>
-          <Space>
-            {renderIcon}
-            {translate("${" + quickBar.l2Menu.title + "}")}
-          </Space>
-        </span>
-      };
-    });
-
-    if (!quickBars || quickBars.length == 0) {
-      return;
-    } else if (quickBars.length == 1) {
-      let l2Menu = quickBars[0].l2Menu;
-      return (
-        <Button
-          onClick={() => this.showDraw(l2Menu.id)}
-          icon={<AppstoreOutlined />}
-          shape="default"
-          size="large"
-          type="text"
-          style={{
-            width: "100%",
-            height: "100%",
-            boxSizing: "border-box",
-            padding: 0,
-            borderRadius: 0,
-            ...syyy,
-            ...style
-          }}
-        />
-      );
-    } else {
-      return (
-        <Dropdown menu={{ items: menu }} placement="bottomCenter">
-          <Button
-            icon={<AppstoreOutlined />}
-            shape="default"
-            size="large"
-            type="link"
-            style={{
-              width: "100%",
-              height: "100%",
-              boxSizing: "border-box",
-              padding: 0,
-              borderRadius: 0,
-              ...syyy,
-              ...style
-            }}
-          />
-        </Dropdown>
-      );
-    }
-  };
-
-  render() {
-    const { quickBars, showDraw, currentId, drawerSize } = this.state;
-    const { translate } = this.context;
-    return (
-      <>
-        {quickBars ? this.renderQuickBar(quickBars) : ""}
-        <Drawer
-          placement={"left"}
-          title={translate("${快捷查询}")}
-          size={drawerSize}
-          resizable={{ onResize: (newSize => this.setState({ drawerSize: newSize })) }}
-          closable={true}
-          mask={false}
-          onClose={this.closeDrawer}
-          open={showDraw}
-          extra={
-            <Space>
-              <Button onClick={this.closeDrawer}>关闭</Button>
-            </Space>
-          }
-          styles={{ body: { minWidth: "720px" } }}
-        >
-          <LtmplTable serverKey={null} sourceId={currentId} />
-        </Drawer>
-      </>
-    );
-  }
-}
-
-export default L2MenuQuickBar;
+import React, { CSSProperties } from "react";
+import { Dropdown, Drawer, Space, Button } from "antd";
+import { AppstoreOutlined } from "@ant-design/icons";
+import { Level2Menu } from "../../tmpl/interface";
+import HCDataSource from "../../tmpl/hc-data-source";
+import LtmplTable from "../../module/ltmpl-table";
+import { LocaleContext } from "../../locale/LocaleProvider";
+import IconFont from "../../layout2/components/icon-font";
+
+interface L2MenuQuickBarProps {
+  backgroudColor?: string;
+  style?: CSSProperties;
+}
+
+interface QuickBar {
+  l2Menu: Level2Menu;
+  count: number;
+}
+
+interface L2MenuQuickBarState {
+  quickBars?: QuickBar[];
+  anyState?: boolean;
+  currentId?: string;
+  showDraw?: boolean;
+  drawerSize?: number | string; // 抽屉组件尺寸
+}
+
+class L2MenuQuickBar extends React.PureComponent<
+  L2MenuQuickBarProps,
+  L2MenuQuickBarState
+> {
+  state = {
+    quickBars: undefined,
+    anyState: false,
+    currentId: undefined,
+    showDraw: false,
+    drawerSize: "92vw",
+  };
+  static defaultProps = {
+    backgroudColor: "#4a5f74",
+  };
+  static contextType = LocaleContext;
+  context: React.ContextType<typeof LocaleContext>;
+
+  async componentDidMount() {
+    let l2Menus = await HCDataSource.fastMenu("QuickQueryBar");
+    const quickBars: QuickBar[] = [];
+    if (l2Menus) {
+      for (const item of l2Menus) {
+        if (item.disabled) {
+          continue;
+        }
+        const quickBar: QuickBar = {
+          l2Menu: item,
+          count: 0,
+        };
+        let that = this;
+        quickBars.push(quickBar);
+      }
+    }
+
+    this.setState({
+      quickBars,
+    });
+  }
+  showDraw = (currentId: string) => {
+    // console.log("点击了L2MenuQuickBar",currentId);
+    this.setState({
+      currentId,
+      showDraw: true,
+    });
+  };
+
+  closeDrawer = () => {
+    this.setState({
+      showDraw: false,
+    });
+  };
+
+  renderQuickBar = (quickBars: QuickBar[]) => {
+    const { backgroudColor, style = {} } = this.props;
+    const { translate } = this.context;
+    let total: number = 0;
+    const syyy: CSSProperties = { "--message-bar-backgroupd": backgroudColor } as CSSProperties;
+    const menu = quickBars.map((quickBar, index) => {
+      if (quickBar.count) {
+        total = total + quickBar.count;
+      }
+      const renderIcon = quickBar.l2Menu.icon ? <IconFont type={quickBar.l2Menu.icon} /> : "";
+      return {
+        key: index,
+        label: <span onClick={() => this.showDraw(quickBar.l2Menu.id)}>
+          <Space>
+            {renderIcon}
+            {translate("${" + quickBar.l2Menu.title + "}")}
+          </Space>
+        </span>
+      };
+    });
+
+    if (!quickBars || quickBars.length == 0) {
+      return;
+    } else if (quickBars.length == 1) {
+      let l2Menu = quickBars[0].l2Menu;
+      return (
+        <Button
+          onClick={() => this.showDraw(l2Menu.id)}
+          icon={<AppstoreOutlined />}
+          shape="default"
+          size="large"
+          type="text"
+          style={{
+            width: "100%",
+            height: "100%",
+            boxSizing: "border-box",
+            padding: 0,
+            borderRadius: 0,
+            ...syyy,
+            ...style
+          }}
+        />
+      );
+    } else {
+      return (
+        <Dropdown menu={{ items: menu }} placement="bottomCenter">
+          <Button
+            icon={<AppstoreOutlined />}
+            shape="default"
+            size="large"
+            type="link"
+            style={{
+              width: "100%",
+              height: "100%",
+              boxSizing: "border-box",
+              padding: 0,
+              borderRadius: 0,
+              ...syyy,
+              ...style
+            }}
+          />
+        </Dropdown>
+      );
+    }
+  };
+
+  render() {
+    const { quickBars, showDraw, currentId, drawerSize } = this.state;
+    const { translate } = this.context;
+    return (
+      <>
+        {quickBars ? this.renderQuickBar(quickBars) : ""}
+        <Drawer
+          placement={"left"}
+          title={translate("${快捷查询}")}
+          size={drawerSize}
+          resizable={{ onResize: (newSize => this.setState({ drawerSize: newSize })) }}
+          closable={true}
+          mask={false}
+          onClose={this.closeDrawer}
+          open={showDraw}
+          extra={
+            <Space>
+              <Button onClick={this.closeDrawer}>关闭</Button>
+            </Space>
+          }
+          styles={{ body: { minWidth: "720px" } }}
+        >
+          <LtmplTable serverKey={null} sourceId={currentId} />
+        </Drawer>
+      </>
+    );
+  }
+}
+
+export default L2MenuQuickBar;