Merge pull request #567 from noneAuth/feat_iconfont_up

feat: up richContainer data get & minWidth limit & up iconfont & fix …
antvis · Dec 27, 2023 · 2c3f92b · 2c3f92b
2 parents 2dd6db9 + 1552dd5
commit 2c3f92b
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -91,3 +91,4 @@ packages/gi-httpservice-xxx
 release/gi-httpservice
 
 **/unprocessed-code.ts.txt
+pnpm-lock.yaml
diff --git a/packages/gi-assets-basic/src/components/RichContainer/Component.tsx b/packages/gi-assets-basic/src/components/RichContainer/Component.tsx
@@ -9,6 +9,7 @@ import Toolbar from './Toolbar';
 import './index.less';
 
 const URL_SEARCH_KEY = 'ActiveAssetID';
+const MIN_WIDTH = 336;
 const visibleStyle: React.CSSProperties = {
   visibility: 'visible',
   width: '100%',
@@ -57,7 +58,7 @@ const RichContainer = props => {
   useEffect(() => {
     if (isExpanded) {
       const defaultWidth = getDefaultSideWidth();
-      setWidth(defaultWidth);
+      setWidth(defaultWidth >= MIN_WIDTH ? defaultWidth : MIN_WIDTH);
     } else setWidth(0);
   }, [isExpanded]);
 
@@ -129,8 +130,10 @@ const RichContainer = props => {
   };
   const onResizeStop = (e, direction, ref, d) => {
     setWidth(prev => {
-      localStorage.setItem('GI_RICH_CONTAINER_SIDE_WIDTH', prev + d.width);
-      return prev + d.width;
+      const currentWidth = prev + d.width;
+      const realWidth = currentWidth >= MIN_WIDTH ? currentWidth : MIN_WIDTH;
+      localStorage.setItem('GI_RICH_CONTAINER_SIDE_WIDTH', realWidth);
+      return realWidth;
     });
     setIsResizing(false);
   };
@@ -208,7 +211,12 @@ const RichContainer = props => {
               }}
               onClick={() => {
                 if (!HAS_QUERY_VIEW) {
-                  handleChange(DATA_QUERY_ID[0]);
+                  const localKey = localStorage.getItem(URL_SEARCH_KEY) || '';
+                  if (DATA_QUERY_ID.includes(localKey)) {
+                    handleChange(localKey);
+                  } else {
+                    handleChange(DATA_QUERY_ID[0]);
+                  }
                 }
               }}
             >
@@ -227,9 +235,14 @@ const RichContainer = props => {
                 fontSize: 12,
                 ...(HAS_FILTER_VIEW ? ActiveButtonStyle : {}),
               }}
-              onClick={() => {
+              onClick={e => {
                 if (!HAS_FILTER_VIEW) {
-                  handleChange(localStorage.getItem(URL_SEARCH_KEY) || DATA_FILTER_ID[0]);
+                  const localKey = localStorage.getItem(URL_SEARCH_KEY) || '';
+                  if (DATA_FILTER_ID.includes(localKey)) {
+                    handleChange(localKey);
+                  } else {
+                    handleChange(DATA_FILTER_ID[0]);
+                  }
                 }
               }}
             >

diff --git a/packages/gi-assets-basic/src/components/RichContainer/registerMeta.ts b/packages/gi-assets-basic/src/components/RichContainer/registerMeta.ts
@@ -55,7 +55,7 @@ const registerMeta = context => {
           type: 'string',
           'x-decorator': 'FormItem',
           'x-component': 'Input',
-          default: 'icon-deploymentunit1',
+          default: 'icon-tugraph-graph-view',
         },
       },
       {
@@ -78,7 +78,7 @@ const registerMeta = context => {
           type: 'string',
           'x-decorator': 'FormItem',
           'x-component': 'Input',
-          default: 'icon-query',
+          default: 'icon-tugraph-query',
         },
       },
       {
@@ -101,7 +101,7 @@ const registerMeta = context => {
           type: 'string',
           'x-decorator': 'FormItem',
           'x-component': 'Input',
-          default: 'icon-filter',
+          default: 'icon-tugraph-filter',
         },
       },
       {
@@ -138,7 +138,7 @@ const registerMeta = context => {
       },
       {
         id: 'condition-content',
-        name:'条件展示容器',
+        name: '条件展示容器',
         required: true,
         GI_CONTAINER: {
           title: $i18n.get({ id: 'basic.components.RichContainer.registerMeta.IntegratedComponents', dm: '集成组件' }),

diff --git a/packages/gi-assets-basic/src/components/SegmentedLayout/SegmentedTabs.tsx b/packages/gi-assets-basic/src/components/SegmentedLayout/SegmentedTabs.tsx
@@ -32,7 +32,7 @@ const SegmentedTabs: React.FunctionComponent<SegmentedTabsProps> = props => {
 
   const [state, setState] = React.useState<{ active: string }>(() => {
     const { searchParams } = getSearchParams(window.location);
-    const active = searchParams.get(queryKey) || defaultActive || items[0].key;
+    const active = searchParams.get(queryKey) || defaultActive || items[0]?.key || '';
     return {
       active,
     };

diff --git a/packages/gi-assets-tugraph-db b/packages/gi-assets-tugraph-db
diff --git a/packages/gi-common-components/src/Icon/index.tsx b/packages/gi-common-components/src/Icon/index.tsx
@@ -6,6 +6,7 @@ import React from 'react';
 import { loadFontJson, loadUnicodeFont, type FontJson } from './loader';
 
 export const fontFamily = 'iconfont';
+export const FONT_3381398 = 'font_3381398_i824ocozt7';
 
 // --- 注册 font icon ---
 
@@ -36,8 +37,7 @@ export { glyphs, icons };
 
 // --- 注册 antd iconfont ---
 const registeredIds = new Set<string>();
-const builtInIconFontId = 'font_3381398_i824ocozt7';
-const getIconfontScriptUrl = (id: string) => `//at.alicdn.com/t/a/${id}.js`;
+const getIconfontScriptUrl = (id: string) => `//at.alicdn.com/t/a/${FONT_3381398}.js`;
 
 async function loadUnicodeFonts(ids: string[]) {
   await Promise.all(ids.map(id => loadUnicodeFont(id)));
@@ -58,7 +58,7 @@ export async function registerIconFonts(ids: string[]) {
 }
 
 // 注册内置 iconfont
-registerIconFonts([builtInIconFontId]);
+registerIconFonts([FONT_3381398]);
 
 interface IconProps extends React.HTMLProps<HTMLSpanElement> {
   spin?: boolean;

diff --git a/packages/gi-site/scripts/create-assets.mjs b/packages/gi-site/scripts/create-assets.mjs
@@ -5,6 +5,7 @@ import { fileURLToPath } from 'url';
 import assets from './deps.json' assert { type: 'json' };
 
 const __filename = fileURLToPath(import.meta.url);
+export const FONT_3381398 = 'font_3381398_i824ocozt7';
 
 const __dirname = path.dirname(__filename);
 assets.forEach(item => {
@@ -40,7 +41,7 @@ assets.forEach(item => {
 });
 
 /** 生成 font 字体 */
-fetch('https://at.alicdn.com/t/a/font_3381398_hecr296g6n8.js')
+fetch(`https://at.alicdn.com/t/a/${FONT_3381398}.js`)
   .then(res => res.text())
   .then(res => {
     fs.writeFile(path.resolve(__dirname, '../public/libs/', `font.js`), res, error => {

diff --git a/packages/gi-site/src/components/SegmentedTabs/index.tsx b/packages/gi-site/src/components/SegmentedTabs/index.tsx
@@ -16,7 +16,7 @@ const SegmentedTabs: React.FunctionComponent<SegmentedTabsProps> = props => {
 
   const [state, setState] = React.useState<{ active: string }>(() => {
     const { searchParams, path } = getSearchParams(window.location);
-    const active = searchParams.get(queryKey) || defaultActive || items[0].key;
+    const active = searchParams.get(queryKey) || defaultActive || items[0]?.key || '';
     return {
       active,
     };

diff --git a/packages/gi-site/src/services/inject.ts b/packages/gi-site/src/services/inject.ts
@@ -1 +1 @@
-export default {};
+export default {};
Original file line number	Diff line number	Diff line change
Expand Up		@@ -91,3 +91,4 @@ packages/gi-httpservice-xxx
		release/gi-httpservice

		**/unprocessed-code.ts.txt
		pnpm-lock.yaml