plain-design 1.0.0-beta.67 → 1.0.0-beta.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plain-design",
-  "version": "1.0.0-beta.67",
+  "version": "1.0.0-beta.68",
   "description": "",
   "main": "dist/plain-design.min.js",
   "module": "dist/plain-design.commonjs.min.js",

package/src/packages/components/Form/form.scss

@@ -209,6 +209,7 @@
       }
     }
   }
+
   &:not(.form-vertical-label) {
     @include prefix(form-item) {
       .form-item-label {
@@ -216,4 +217,10 @@
       }
     }
   }
+
+  &.form-hide-label {
+    .form-item-label {
+      display: none;
+    }
+  }
 }

package/src/packages/components/Form/index.tsx

@@ -43,6 +43,7 @@ export const Form = designComponent({
       {
         ['form-vertical-label']: !!props.verticalLabel,
         ['form-column-center']: !!props.singleColumnCenter,
+        ['form-hide-label']: !!props.hideLabel,
       },
     ]);
 

package/src/packages/components/Form/layout/useFormLayout.tsx

@@ -42,6 +42,7 @@ export const FormLayoutPropsOption = {
   gutter: { type: Number },                                                               // 列间隔
   rowGutter: { type: Number },                                                            // 行间隔
   validateMessagePosition: { type: String as PropType<typeof FormValidateMessagePosition.TYPE> }, // 校验消息的位置
+  hideLabel: { type: Boolean },                                                           // 隐藏form-item的label
 } as const;
 
 /**
@@ -152,6 +153,9 @@ export const useFormLayout = (() => {
      * @date    2022.9.4 23:21
      */
     const labelWidth = computed((): number | string => {
+      if (form.props.hideLabel) {
+        return 0;
+      }
       /*纵向文本表单情况下，文本宽度占用整行*/
       if (form.props.verticalLabel) {
         return '100%';
@@ -233,7 +237,7 @@ export const useFormLayout = (() => {
      */
     const labelStyles = useStyles(style => {
       if (!form.isSingleColumn.value) {
-        if (!!labelWidth.value && !form.props.verticalLabel) {
+        if (labelWidth.value != null && !form.props.verticalLabel) {
           style.width = unit(labelWidth.value);
         }
       }
@@ -245,7 +249,7 @@ export const useFormLayout = (() => {
      */
     const contentStyles = useStyles(style => {
       if (!form.isSingleColumn.value) {
-        if (!!labelWidth.value && !form.props.verticalLabel) {
+        if (labelWidth.value != null && !form.props.verticalLabel) {
           style.width = `calc(100% - ${unit(labelWidth.value)})`;
         }
       } else {

package/src/packages/components/ThemeLocaleSelector/index.tsx

@@ -7,9 +7,6 @@ import './theme-locale-selector.scss';
 
 export const ThemeLocaleSelector = designComponent({
   name: 'theme-locale-selector',
-  props: {
-    i18nManager: {},
-  },
   setup({}) {
     const classes = useClassCache(() => [
       getComponentCls('theme-selector'),

package/src/packages/i18n/i18n.utils.ts

@@ -131,7 +131,7 @@ export const i18n = (() => {
    */
   const use = (lang: string, locale: any) => {
     state.currentLang = lang;
-    state.langs[lang] = deepmerge(state.langs[lang], locale);
+    if (!!locale) {state.langs[lang] = deepmerge(state.langs[lang], locale);}
     hooks.onChangeLang.exec(undefined);
   };
   /**
@@ -140,7 +140,7 @@ export const i18n = (() => {
    * @date    2023/10/11 9:30
    */
   const switchTo = async (lang: string, loadMethod?: () => any) => {
-    let locale = !loadMethod ? state.langs[lang] : await loadMethod();
+    let locale = !loadMethod ? undefined : await loadMethod();
     use(lang, locale);
   };
   /**
@@ -148,9 +148,7 @@ export const i18n = (() => {
    * @author  韦胜健
    * @date    2023/10/11 9:30
    */
-  const getCurrentLanguage = () => {
-    return state.currentLang;
-  };
+  const getCurrentLanguage = () => {return state.currentLang;};
   /**
    * 设置语言
    * @author  韦胜健
@@ -213,9 +211,11 @@ export const i18n = (() => {
     return result;
   };
 
-  const cache = createCache<string>('@@I18N_LANG');
-
-  if (cache.get()) {switchTo(cache.get()!);}
+  const applyCache = () => {
+    const cache = createCache<string>('@@I18N_LANG');
+    if (cache.get()) {switchTo(cache.get()!);}
+    hooks.onChangeLang.use(() => {cache.set(state.currentLang);});
+  };
 
   return {
     $t,
@@ -228,6 +228,7 @@ export const i18n = (() => {
     DEFAULT_LANG,
     state,
     hooks,
+    applyCache,
   };
 })();