fix: compile error

Esieve · Esieve · commit 0ffa42558e72 · 2023-01-06T19:52:55.000+08:00
diff --git a/client/packages/openblocks/src/assets/images/index.ts b/client/packages/openblocks/src/assets/images/index.ts
diff --git a/client/packages/openblocks/src/assets/images/index.tsx b/client/packages/openblocks/src/assets/images/index.tsx
@@ -0,0 +1,12 @@
+//window.matchMedia && window.matchMedia("(prefers-color-scheme: dark)").matches
+import { ReactComponent as CELogo } from "./logo.svg";
+import { ReactComponent as CELogoWithName } from "./logo-with-name.svg";
+
+export { default as favicon } from "./favicon.ico";
+
+export const Logo = (props: { branding?: boolean }) => {
+  return <CELogo />;
+};
+export const LogoWithName = (props: { branding?: boolean }) => {
+  return <CELogoWithName />;
+};
diff --git a/client/packages/openblocks/src/comps/controls/codeControl.tsx b/client/packages/openblocks/src/comps/controls/codeControl.tsx
@@ -6,6 +6,7 @@ import {
   AbstractComp,
   changeDependName,
   changeValueAction,
+  CodeFunction,
   CodeNode,
   CodeNodeOptions,
   CompAction,
@@ -18,7 +19,6 @@ import {
   transformWrapper,
   ValueAndMsg,
   withFunction,
-  CodeFunction,
 } from "openblocks-core";
 import { EditorContext } from "comps/editorState";
 import { withDefault } from "comps/generators/simpleGenerators";
@@ -218,6 +218,9 @@ export function codeControl<
 
 function toCardTitle(expectedType?: string, value?: unknown) {
   const type = expectedType ?? toType(value);
+  if (type === "RegExp") {
+    return type;
+  }
   if (Array.isArray(value)) {
     return type + "(" + value.length + ")";
   }
@@ -257,8 +260,8 @@ function toRegExp(value: unknown): RegExp {
   if (valueType === "RegExp") {
     return value as RegExp;
   } else if (valueType === "string") {
-    const regexStr = _.trimStart(_.trimEnd(value as string, "$"), "^");
-    return new RegExp("^" + regexStr ?? ".*" + "$");
+    const regexStr = _.trimStart(value as string, "^");
+    return new RegExp("^" + (regexStr ?? ".*") + "$");
   }
   throw new TypeError(
     `must be a valid JavaScript regular expression without forward slashes around the pattern`
diff --git a/client/packages/openblocks/src/constants/configConstants.ts b/client/packages/openblocks/src/constants/configConstants.ts
@@ -2,12 +2,20 @@ interface FeatureFlag {
   enableCustomBrand: boolean;
 }
 
+export interface BrandingConfig {
+  logo?: string;
+  favicon?: string;
+  brandName?: string;
+  headerColor?: string;
+}
+
 export type ConfigBaseInfo = {
   selfDomain: boolean;
   cloudHosting: boolean;
   workspaceMode: "SAAS" | "ENTERPRISE";
   warning?: string;
   featureFlag: FeatureFlag;
+  branding?: BrandingConfig;
 };
 
 export type ConfigResponseData = {
diff --git a/client/packages/openblocks/src/pages/setting/settingHome.tsx b/client/packages/openblocks/src/pages/setting/settingHome.tsx
@@ -5,7 +5,7 @@ import { AdvancedSetting } from "./advanced/AdvancedSetting";
 import { currentOrgAdmin } from "util/permissionUtils";
 import { trans } from "i18n";
 import AuditSetting from "@openblocks-ee/pages/setting/audit";
-import { isEE, isEnterpriseMode, isSelfDomain } from "util/envUtils";
+import { developEnv, isEE, isEnterpriseMode, isSelfDomain } from "util/envUtils";
 import { TwoColumnSettingPageContent } from "./styled";
 import SubSideBar from "components/layout/SubSideBar";
 import { Menu } from "openblocks-design";
@@ -52,10 +52,11 @@ export function SettingHome() {
       key: SettingPageEnum.Theme,
       label: trans("settings.theme"),
     },
-    ...(isEE() &&
-    currentOrgAdmin(user) &&
-    enableCustomBrand(config) &&
-    (isSelfDomain(config) || isEnterpriseMode(config))
+    ...(developEnv() ||
+    (isEE() &&
+      currentOrgAdmin(user) &&
+      enableCustomBrand(config) &&
+      (isSelfDomain(config) || isEnterpriseMode(config)))
       ? [
           {
             key: SettingPageEnum.Branding,
