plain-design 1.0.0-beta.52 → 1.0.0-beta.54

package/package.json

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

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

@@ -3,7 +3,7 @@ import {createCache} from "../../utils/createCache";
 import {InputMode, ThemeMode, ThemeShape, ThemeSize} from "../../uses/useStyle";
 import {DeepPartial} from "../../utils/type";
 import {iApplicationConfiguration} from "../Application/utils/application.utils";
-import {iThemeConfiguration} from "../Application/theme/theme";
+import {BaseColors, iThemeConfiguration} from "../Application/theme/theme";
 import {deepmerge} from "./deepmerge";
 import {PlainObject} from "plain-utils/utils/event";
 
@@ -235,3 +235,24 @@ export const ThemePrimaryColors: Record<string, {
 };
 
 export default PageThemeUtils;
+
+export function getPrimaryColor(primaryKey?: string | undefined): { light: string, dark: string } {
+  const baseColor = {
+    light: BaseColors.light.primary,
+    dark: BaseColors.dark.primary,
+  };
+  if (!primaryKey) {
+    return baseColor;
+  }
+  const themeConfig = ThemePrimaryColors[primaryKey]?.themeConfig;
+
+  if (!themeConfig) {return baseColor;}
+
+  return typeof themeConfig === "string" ? {
+    dark: themeConfig,
+    light: themeConfig,
+  } : {
+    dark: themeConfig.dark.base!.primary!,
+    light: themeConfig.light.base!.primary!
+  };
+}

package/src/packages/entry.tsx

@@ -196,7 +196,8 @@ export type {
   iTableOptionCacheRegistryConfig,
   iTableOptionGetCacheParam
 } from './components/AutoTable/use/useTableOption.cache.utils';
-export {PageThemeUtils} from './components/PageThemeUtils';
+export {PageThemeUtils, getPrimaryColor} from './components/PageThemeUtils';
+export {BaseColors, BaseGrayColors} from './components/Application/theme/theme';
 export {ThemePrimaryColors} from './components/ThemePrimaryColors';
 export {ThemeEditor} from './components/ThemeEditor';
 export {useReferenceTrigger} from './components/useReferenceTrigger';

package/src/packages/i18n/lang/en-us.ts

@@ -54,31 +54,31 @@ export const EnUsLocale: tZhCnLocale = {
     operation: 'operation',
     noFilter: 'no filter',
     validate: {
-      require: 'require',
-      notMatchPattern: 'not match patter',
-      canNotUseMinInAnyType: 'any type cannot use min validation',
-      canNotUseMaxInAnyType: 'any type cannot use max validation',
-      canNotUseLenInAnyType: 'any type cannot use len validation',
-      outOfRange: 'value "{value}" is out of range {range}',
-      pleaseEnterArrayValue: 'please enter array value',
-      arrayCannotUsePatternValidation: 'array cannot use pattern validation',
-      minimunValues: 'minimun {num} values',
-      maximunValues: 'maximun {num} values',
-      minimunCharacters: 'minimun {num} characters',
-      maximunCharacters: 'maximun {num} characters',
-      fixedValues: 'fixed {num} values',
-      fixedCharacters: 'fixed {num} characters',
-      notLessThan: 'not less than {num}',
-      notLargerThan: 'not larger than{num}',
-      minValue: 'min {num}',
-      maxValue: 'max {num}',
-      fixedLength: 'fixed length {num} characters',
-      pleaseEnterCorrectEmail: 'please enter correct email',
-      pleaseEnterCorrectIdCard: 'please enter correct idcard',
-      pleaseEnterNumber: 'please enter correct number',
-      pleaseEnterCorrectPhoneNumber: 'please enter correct phone number',
-      pleaseEnterCorrectQQNum: 'please enter correct qq',
-      valueShouldBeStringOrNumber: 'please enter correct string or number',
+      require: ' require',
+      notMatchPattern: ' not match patter',
+      canNotUseMinInAnyType: ' any type cannot use min validation',
+      canNotUseMaxInAnyType: ' any type cannot use max validation',
+      canNotUseLenInAnyType: ' any type cannot use len validation',
+      outOfRange: ' value "{value}" is out of range {range}',
+      pleaseEnterArrayValue: ' please enter array value',
+      arrayCannotUsePatternValidation: ' array cannot use pattern validation',
+      minimunValues: ' minimun {num} values',
+      maximunValues: ' maximun {num} values',
+      minimunCharacters: ' minimun {num} characters',
+      maximunCharacters: ' maximun {num} characters',
+      fixedValues: ' fixed {num} values',
+      fixedCharacters: ' fixed {num} characters',
+      notLessThan: ' not less than {num}',
+      notLargerThan: ' not larger than{num}',
+      minValue: ' min {num}',
+      maxValue: ' max {num}',
+      fixedLength: ' fixed length {num} characters',
+      pleaseEnterCorrectEmail: ' please enter correct email',
+      pleaseEnterCorrectIdCard: ' please enter correct idcard',
+      pleaseEnterNumber: ' please enter correct number',
+      pleaseEnterCorrectPhoneNumber: ' please enter correct phone number',
+      pleaseEnterCorrectQQNum: ' please enter correct qq',
+      valueShouldBeStringOrNumber: ' please enter correct string or number',
 
     },
     filter: {

package/src/packages/utils/plainDate.ts

@@ -192,8 +192,12 @@ const parse = (str: string | undefined | null, format: string) => {
  * @author  韦胜健
  * @date    2021/1/18 10:30
  */
-const today = (displayFormat: string, valueFormat: string) => {
+const today = (displayFormat: string = 'YYYY-MM-DD', valueFormat: string = 'YYYY-MM-DD') => {
   return wrapDate(new Date(), { displayFormat, valueFormat });
 };
 
-export const plainDate = Object.assign(wrapDate, { defaultDate, format, parse, today, DayJs });
+const now = (displayFormat: string = 'YYYY-MM-DD HH:mm:ss', valueFormat: string = 'YYYY-MM-DD HH:mm:ss') => {
+  return wrapDate(new Date(), { displayFormat, valueFormat });
+};
+
+export const plainDate = Object.assign(wrapDate, { defaultDate, format, parse, today, now, DayJs });