aldehyde 0.2.105 → 0.2.106

package/src/aldehyde/locale/LocaleButton.tsx

@@ -1,11 +1,14 @@
 import { GlobalOutlined } from "@ant-design/icons";
-import { Button, Dropdown, MenuProps } from "antd";
+import { Button, ButtonProps, Dropdown, MenuProps, theme } from "antd";
 import { useLocale } from "./useLocale";
 import { LocaleType } from "./langMp";
 import React from "react";
 
-const LocaleButton = () => {
-  const { setLocale } = useLocale();
+const { useToken } = theme;
+
+const LocaleButton = (props: ButtonProps) => {
+  const { token } = useToken();
+  const { getLocale, setLocale } = useLocale();
 
   const onClick: MenuProps["onClick"] = ({ key }) => {
     setLocale(key as LocaleType);
@@ -13,17 +16,30 @@ const LocaleButton = () => {
 
   const items: MenuProps["items"] = [
     {
-      label: "中文",
+      label: (
+        <span style={getLocale() === "zh" ? { color: token.colorPrimary } : {}}>
+          中文
+        </span>
+      ),
       key: "zh",
     },
     {
-      label: "fr",
+      label: (
+        <span style={getLocale() === "fr" ? { color: token.colorPrimary } : {}}>
+          fr
+        </span>
+      ),
       key: "fr",
     },
   ];
   return (
-    <Dropdown menu={{ items, onClick }}>
-      <Button type="primary" shape="circle" icon={<GlobalOutlined />} />
+    <Dropdown overlayClassName="localeButton" menu={{ items, onClick }}>
+      <Button
+        type="primary"
+        shape="circle"
+        icon={<GlobalOutlined />}
+        {...props}
+      />
     </Dropdown>
   );
 };

package/src/aldehyde/login/router-login.tsx

@@ -54,7 +54,7 @@ const I18nLogin = (props: RLoginitProps) => {
           zIndex: "10000",
         }}
       >
-        <LocaleButton></LocaleButton>
+        <LocaleButton size="large"></LocaleButton>
       </div>
 
       <RouterLogin {...props} />

package/src/aldehyde/table/relation-table.tsx

@@ -579,6 +579,7 @@ class RelationTable extends React.PureComponent<
     const { translate } = this.context;
     const { buttons, disabled } = fieldGroupConfig;
     const { showRowEdit } = this.state;
+
     const buttonDisabled: boolean = disabled
       ? disabled
       : fieldGroupConfig.max
@@ -649,7 +650,7 @@ class RelationTable extends React.PureComponent<
               {fieldGroupConfig.min && (!value || value.length <= 0) ? (
                 <Text style={{ color: "red" }}>
                   {translate("${请选择或添加}")}
-                  {fieldGroupConfig.title}
+                  {translate("${"+fieldGroupConfig.title +"}")}
                 </Text>
               ) : null}
               <FormItem
@@ -670,6 +671,7 @@ class RelationTable extends React.PureComponent<
                   min={fieldGroupConfig.min + ""}
                   style={{ marginBottom: 10 }}
                   count={value ? value.length : 0}
+                  value={value}
                 ></CountingTag>
               </FormItem>
             </Space>

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

@@ -520,7 +520,7 @@ class TmplTree extends React.PureComponent<TmplTreeProps, TmplTreeState> {
           </Button>
         );
       }
-      debugger
+      //debugger
       if (ttmplNodeConfig.branchLTmplConfig) {
         if (ttmplNodeConfig.rootLTmplConfig.buttons.indexOf("dtmplAdd") > 0) {
           buttons.push(