aldehyde 0.2.480 → 0.2.481

package/src/aldehyde/locale/translate.ts

@@ -1,80 +1,80 @@
-const noLocaleTranslate = (str) => {
-  let res = [],
-    tres = "";
-
-  let matchStr = "",
-    enableMatch = false;
-
-  for (const char of str) {
-    if (char === "$" && !enableMatch) {
-      enableMatch = true;
-      res.push(tres);
-      tres = "";
-    } else if (enableMatch && char === "{") {
-      continue;
-    } else if (enableMatch && char === "}") {
-      res.push(matchStr);
-      enableMatch = false;
-      matchStr = "";
-    } else if (enableMatch) matchStr += char;
-    else tres += char;
-  }
-
-  res.push(tres);
-  return res.join("");
-};
-const translate = (str) => {
-  const locale = window.localStorage.getItem("locale");
-  const langPkg = JSON.parse(window.localStorage.getItem("langPkg"));
-
-  if (!locale || !langPkg) return noLocaleTranslate(str);
-
-  let res = [],
-    resMp = [],
-    flag = false,
-    tres = "";
-
-  let matchStr = "",
-    enableMatch = false;
-
-  for (const char of str) {
-    if (char === "$" && !enableMatch) {
-      enableMatch = true;
-      if (tres !== "") {
-        res.push(tres);
-        tres = "";
-        resMp.push(false);
-      }
-    } else if (enableMatch && char === "{") {
-      continue;
-    } else if (enableMatch && char === "}") {
-      const tStr =
-        langPkg[locale] === undefined ? undefined : langPkg[locale][matchStr];
-      if (tStr === undefined) {
-        flag = true;
-      }
-      res.push(matchStr);
-      resMp.push(true);
-      enableMatch = false;
-      matchStr = "";
-    } else if (enableMatch) matchStr += char;
-    else tres += char;
-  }
-
-  if (tres !== "") {
-    res.push(tres);
-    resMp.push(false);
-  }
-
-  if (flag) return res.join("");
-
-  let resStr = "";
-  for (let i = 0; i < res.length; i++) {
-    if (resMp[i]) resStr += (i !== 0 ? " " : "") + langPkg[locale][res[i]];
-    else resStr += res[i];
-  }
-
-  return resStr;
-};
-
-export default translate;
+const noLocaleTranslate = (str) => {
+  let res = [],
+    tres = "";
+
+  let matchStr = "",
+    enableMatch = false;
+
+  for (const char of str) {
+    if (char === "$" && !enableMatch) {
+      enableMatch = true;
+      res.push(tres);
+      tres = "";
+    } else if (enableMatch && char === "{") {
+      continue;
+    } else if (enableMatch && char === "}") {
+      res.push(matchStr);
+      enableMatch = false;
+      matchStr = "";
+    } else if (enableMatch) matchStr += char;
+    else tres += char;
+  }
+
+  res.push(tres);
+  return res.join("");
+};
+const translate = (str) => {
+  const locale = window.localStorage.getItem("locale");
+  const langPkg = JSON.parse(window.localStorage.getItem("langPkg"));
+
+  if (!locale || !langPkg) return noLocaleTranslate(str);
+
+  let res = [],
+    resMp = [],
+    flag = false,
+    tres = "";
+
+  let matchStr = "",
+    enableMatch = false;
+
+  for (const char of str) {
+    if (char === "$" && !enableMatch) {
+      enableMatch = true;
+      if (tres !== "") {
+        res.push(tres);
+        tres = "";
+        resMp.push(false);
+      }
+    } else if (enableMatch && char === "{") {
+      continue;
+    } else if (enableMatch && char === "}") {
+      const tStr =
+        langPkg[locale] === undefined ? undefined : langPkg[locale][matchStr];
+      if (tStr === undefined) {
+        flag = true;
+      }
+      res.push(matchStr);
+      resMp.push(true);
+      enableMatch = false;
+      matchStr = "";
+    } else if (enableMatch) matchStr += char;
+    else tres += char;
+  }
+
+  if (tres !== "") {
+    res.push(tres);
+    resMp.push(false);
+  }
+
+  if (flag) return res.join("");
+
+  let resStr = "";
+  for (let i = 0; i < res.length; i++) {
+    if (resMp[i]) resStr += (i !== 0 ? " " : "") + langPkg[locale][res[i]];
+    else resStr += res[i];
+  }
+
+  return resStr;
+};
+
+export default translate;

package/src/aldehyde/locale/useLocale.ts

@@ -1,72 +1,72 @@
-import { useContext, useState } from "react";
-import { LocaleType } from "./langMp";
-import { LocaleContext } from "./LocaleProvider";
-
-type NavigatorLanguageState = {
-  isSupported: boolean;
-  navigatorLanguage: string;
-};
-
-export const useNavigatorLanguage = (): Readonly<NavigatorLanguageState> => {
-  // 获取navigator
-  const navigator = window?.navigator;
-
-  // 查看当前浏览器是否支持language
-  const isSupported = Boolean(navigator && "language" in navigator);
-
-  // 存储当前language
-  const [navigatorLanguage, setNavigatorLanguage] = useState(
-    navigator?.language
-  );
-
-  // 监听languagechange事件，如果有变化，就更新存储的language值
-  window.addEventListener("languagechange", () => {
-    if (navigator) {
-      setNavigatorLanguage(navigator.language);
-    }
-  });
-
-  return {
-    isSupported,
-    navigatorLanguage,
-  };
-};
-
-export const useLocale = () => {
-  const {
-    locale,
-    changeLocale,
-    siderCollapsed,
-    changeSiderCollapsed,
-    t,
-    translate,
-    availableLang,
-    getServiceLangStr,
-    compactTheme,
-    changeCompactTheme,
-    screenfull,
-    changeScreenfull
-  } = useContext(LocaleContext);
-
-  return {
-    getLocale: () => {
-      return locale;
-    },
-    setLocale: (loacle: LocaleType) => {
-      changeLocale(loacle);
-    },
-    getSiderCollapsed: () => {
-      return siderCollapsed;
-    },
-    changeSiderCollapsed: () => {
-      changeSiderCollapsed();
-    },
-    t,
-    translate,
-    availableLang, getServiceLangStr,
-    compactTheme,
-    changeCompactTheme,
-    screenfull,
-    changeScreenfull
-  };
-};
+import { useContext, useState } from "react";
+import { LocaleType } from "./langMp";
+import { LocaleContext } from "./LocaleProvider";
+
+type NavigatorLanguageState = {
+  isSupported: boolean;
+  navigatorLanguage: string;
+};
+
+export const useNavigatorLanguage = (): Readonly<NavigatorLanguageState> => {
+  // 获取navigator
+  const navigator = window?.navigator;
+
+  // 查看当前浏览器是否支持language
+  const isSupported = Boolean(navigator && "language" in navigator);
+
+  // 存储当前language
+  const [navigatorLanguage, setNavigatorLanguage] = useState(
+    navigator?.language
+  );
+
+  // 监听languagechange事件，如果有变化，就更新存储的language值
+  window.addEventListener("languagechange", () => {
+    if (navigator) {
+      setNavigatorLanguage(navigator.language);
+    }
+  });
+
+  return {
+    isSupported,
+    navigatorLanguage,
+  };
+};
+
+export const useLocale = () => {
+  const {
+    locale,
+    changeLocale,
+    siderCollapsed,
+    changeSiderCollapsed,
+    t,
+    translate,
+    availableLang,
+    getServiceLangStr,
+    compactTheme,
+    changeCompactTheme,
+    screenfull,
+    changeScreenfull
+  } = useContext(LocaleContext);
+
+  return {
+    getLocale: () => {
+      return locale;
+    },
+    setLocale: (loacle: LocaleType) => {
+      changeLocale(loacle);
+    },
+    getSiderCollapsed: () => {
+      return siderCollapsed;
+    },
+    changeSiderCollapsed: () => {
+      changeSiderCollapsed();
+    },
+    t,
+    translate,
+    availableLang, getServiceLangStr,
+    compactTheme,
+    changeCompactTheme,
+    screenfull,
+    changeScreenfull
+  };
+};

package/src/aldehyde/login/context-setter.tsx

@@ -1,130 +1,130 @@
-import React from 'react'
-// import StatActTable from '../table/stat-act-table'
-import {Button, Col, Form, FormInstance, Modal, Row} from "antd";
-import EntryControl from "../controls/entry-control";
-import HCserviceV3 from "../tmpl/hcservice-v3";
-import withRouter from "../routable/withroute";
-import {LocaleContext} from "../locale/LocaleProvider";
-import DraggableModal from "../module/draggable-modal";
-
-//以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
-
-export interface ContextSetterProps {
-    serverKey?:string,
-    // match:any,
-};
-
-export interface ContextSetterState {
-    loading?:boolean,
-    config?: object,
-    context?:object,
-};
-
-class ContextSetter extends React.PureComponent<ContextSetterProps, ContextSetterState> {
-
-    state = {
-        loading:false,
-        config: null,
-        context:null,
-    }
-    formRef = React.createRef<FormInstance>();
-    static defaultProps = {}
-    static contextType = LocaleContext;
-    context: React.ContextType<typeof LocaleContext>;
-    async componentDidMount() {
-        let config = await HCserviceV3.getContextSourceConfig();
-        let context = await HCserviceV3.getContextSourceValue();
-        if (!config || config.length==0 ) {
-            config = []
-            window.location.hash = "#/home";
-            return;
-        }
-        this.setState({
-            config,
-            context,
-            loading: false
-        })
-    }
-
-    async componentDidUpdate(prevProps) {
-
-    }
-
-    handleSubmit =async () => {
-        this.setState({
-            loading: true
-        })
-        let { config} = this.state
-
-        await this.formRef.current.validateFields().then(async (values) => {
-                let json = {}
-                config.forEach((c) => {
-                    json[c.id] = values[c.id];
-                })
-                let res = await HCserviceV3.setContext(json);
-                // if (res.status === 'error') {
-                //     await this.getKaptchaToken();
-                // }
-            }
-        ).catch(errorInfo => {
-        })
-        this.setState({
-            loading: false
-        })
-    }
-
-
-    render() {
-        const { translate} = this.context;
-        const {config,loading,context}=this.state;
-        const {serverKey}=this.props;
-        return <DraggableModal title={translate("${全局配置}")} closable={false} open={true} footer={[]}>
-            <Row  justify="center" align="middle" >
-                <Col>
-                    <Form style={{width: 350}} ref={this.formRef}
-                          name="normal_login"
-                          className="login-form"
-                          initialValues={{remember: true}}
-                    >
-                        {config ? config.map((c) => {
-                            let initialValue=null;
-                            if(context ){
-                                context.forEach((con)=>{
-                                    if(con.moduleName== c.moduleName){
-                                        initialValue=con.selectedValues;
-                                    }
-                                })
-                            }
-                            return <Form.Item
-                                name={c.id} initialValue={initialValue} rules={[{required: true, message: '请选择' + c.title}]}
-                            >
-                                <EntryControl serverKey={serverKey} id={'14'}
-                                              fieldConfig={{
-                                                  id: c.groupId,
-                                                  title: c.title,
-                                                  controlType: 'entity-select',
-                                                  max: "1",
-                                                  required: true,
-                                                  sourceId:c.groupId,
-                                                  suppleOptions: c.canNotSet ? [{code: 'all', title: '不设置'}] : undefined
-                                              }}
-                                />
-                            </Form.Item>
-                        }) : null}
-                        <Form.Item>
-                            <Button type="primary" style={{width: '100%'}} loading={loading} onClick={this.handleSubmit}
-                                    className="login-form-button">
-                                {translate("${确定}")}
-                            </Button>
-                        </Form.Item>
-                    </Form>
-                </Col>
-            </Row>
-        </DraggableModal>
-
-
-    }
-}
-
-export default withRouter(ContextSetter);
-
+import React from 'react'
+// import StatActTable from '../table/stat-act-table'
+import {Button, Col, Form, FormInstance, Modal, Row} from "antd";
+import EntryControl from "../controls/entry-control";
+import HCserviceV3 from "../tmpl/hcservice-v3";
+import withRouter from "../routable/withroute";
+import {LocaleContext} from "../locale/LocaleProvider";
+import DraggableModal from "../module/draggable-modal";
+
+//以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
+
+export interface ContextSetterProps {
+    serverKey?:string,
+    // match:any,
+};
+
+export interface ContextSetterState {
+    loading?:boolean,
+    config?: object,
+    context?:object,
+};
+
+class ContextSetter extends React.PureComponent<ContextSetterProps, ContextSetterState> {
+
+    state = {
+        loading:false,
+        config: null,
+        context:null,
+    }
+    formRef = React.createRef<FormInstance>();
+    static defaultProps = {}
+    static contextType = LocaleContext;
+    context: React.ContextType<typeof LocaleContext>;
+    async componentDidMount() {
+        let config = await HCserviceV3.getContextSourceConfig();
+        let context = await HCserviceV3.getContextSourceValue();
+        if (!config || config.length==0 ) {
+            config = []
+            window.location.hash = "#/home";
+            return;
+        }
+        this.setState({
+            config,
+            context,
+            loading: false
+        })
+    }
+
+    async componentDidUpdate(prevProps) {
+
+    }
+
+    handleSubmit =async () => {
+        this.setState({
+            loading: true
+        })
+        let { config} = this.state
+
+        await this.formRef.current.validateFields().then(async (values) => {
+                let json = {}
+                config.forEach((c) => {
+                    json[c.id] = values[c.id];
+                })
+                let res = await HCserviceV3.setContext(json);
+                // if (res.status === 'error') {
+                //     await this.getKaptchaToken();
+                // }
+            }
+        ).catch(errorInfo => {
+        })
+        this.setState({
+            loading: false
+        })
+    }
+
+
+    render() {
+        const { translate} = this.context;
+        const {config,loading,context}=this.state;
+        const {serverKey}=this.props;
+        return <DraggableModal title={translate("${全局配置}")} closable={false} open={true} footer={[]}>
+            <Row  justify="center" align="middle" >
+                <Col>
+                    <Form style={{width: 350}} ref={this.formRef}
+                          name="normal_login"
+                          className="login-form"
+                          initialValues={{remember: true}}
+                    >
+                        {config ? config.map((c) => {
+                            let initialValue=null;
+                            if(context ){
+                                context.forEach((con)=>{
+                                    if(con.moduleName== c.moduleName){
+                                        initialValue=con.selectedValues;
+                                    }
+                                })
+                            }
+                            return <Form.Item
+                                name={c.id} initialValue={initialValue} rules={[{required: true, message: '请选择' + c.title}]}
+                            >
+                                <EntryControl serverKey={serverKey} id={'14'}
+                                              fieldConfig={{
+                                                  id: c.groupId,
+                                                  title: c.title,
+                                                  controlType: 'entity-select',
+                                                  max: "1",
+                                                  required: true,
+                                                  sourceId:c.groupId,
+                                                  suppleOptions: c.canNotSet ? [{code: 'all', title: '不设置'}] : undefined
+                                              }}
+                                />
+                            </Form.Item>
+                        }) : null}
+                        <Form.Item>
+                            <Button type="primary" style={{width: '100%'}} loading={loading} onClick={this.handleSubmit}
+                                    className="login-form-button">
+                                {translate("${确定}")}
+                            </Button>
+                        </Form.Item>
+                    </Form>
+                </Col>
+            </Row>
+        </DraggableModal>
+
+
+    }
+}
+
+export default withRouter(ContextSetter);
+

package/src/aldehyde/login/index.css

@@ -1,19 +1,19 @@
-.login-blue{
-	position: relative;
-	height:calc(100vh);
-	background:#0f4da1;
-}
-.login-dark{
-	position: relative;
-	height:calc(100vh);
-	background: #001529;
-}
-.login-dark form,.login-blue form{
-	background: #fff;
-	position: absolute;
-	top:50%;
-	left:50%;
-	transform: translate(-50%,-50%);
-	padding:30px 20px;
-	border-radius: 5px
-}
+.login-blue{
+	position: relative;
+	height:calc(100vh);
+	background:#0f4da1;
+}
+.login-dark{
+	position: relative;
+	height:calc(100vh);
+	background: #001529;
+}
+.login-dark form,.login-blue form{
+	background: #fff;
+	position: absolute;
+	top:50%;
+	left:50%;
+	transform: translate(-50%,-50%);
+	padding:30px 20px;
+	border-radius: 5px
+}