Skip to content

Commit

Permalink
Merge branch 'master' into docs/homepage
Browse files Browse the repository at this point in the history
  • Loading branch information
heiyexing committed Oct 23, 2023
2 parents ca5e539 + 397dfb2 commit 94d3e86
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 2 deletions.
4 changes: 3 additions & 1 deletion src/components/app-table/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,9 @@ export const AppTable: React.FC = () => {
title={t('app_table.index.tianJiaLieZiDuan')}
description={
<div style={{ display: 'flex', alignItems: 'center' }}>
<div style={{ width: 80 }}>字段名:</div>
<div style={{ width: 80 }}>
{t('app_table.index.ziDuanMing')}
</div>
<Input
placeholder={t('app_table.index.qingShuRuLieZiDuan')}
value={addInputValue}
Expand Down
2 changes: 2 additions & 0 deletions src/locales/langs/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ export default {
'app_header.constants.xiaZaiGEO': 'Download GeoJSON format data',
'app_header.constants.zuJianAPI': 'Component API Documentation',
'app_header.constants.pingTaiShiYongWen': 'Platform Usage Documentation',
'app_header.constants.issue': 'Quick Issue',
'app_header.index.an': 'Dark',
'app_header.index.liang': 'Light',
'app_header.index.yinDao': 'Guide',
Expand All @@ -116,6 +117,7 @@ export default {
'app_table.index.xuHao': 'Serial number',
'app_table.index.shanChuLie': 'Confirm to delete this column of data?',
'app_table.index.tianJiaLieZiDuan': 'Add Column Field',
'app_table.index.ziDuanMing': 'Field Name:',
'app_table.index.qingShuRuLieZiDuan': 'Please enter a column field',
'geojson_editor.index.jiaoBenShuJuYou': 'Wrong script data',
'geojson_editor.index.xinXi': 'Information',
Expand Down
2 changes: 2 additions & 0 deletions src/locales/langs/zh-CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ export default {
'app_header.constants.xiaZaiGEO': '下载 GeoJSON 格式数据',
'app_header.constants.zuJianAPI': '组件API文档',
'app_header.constants.pingTaiShiYongWen': '平台使用文档',
'app_header.constants.issue':'提交 Issue',
'app_header.index.an': '暗',
'app_header.index.liang': '亮',
'app_header.index.yinDao': '引导',
Expand All @@ -105,6 +106,7 @@ export default {
'app_table.index.xuHao': '序号',
'app_table.index.shanChuLie': '确认删除此列数据?',
'app_table.index.tianJiaLieZiDuan': '添加列字段',
'app_table.index.ziDuanMing':'字段名:',
'app_table.index.qingShuRuLieZiDuan': '请输入列字段',
'geojson_editor.index.jiaoBenShuJuYou': '脚本数据有误',
'geojson_editor.index.xinXi': '信息',
Expand Down
3 changes: 2 additions & 1 deletion src/pages/components/editor.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { useUpdateEffect } from 'ahooks';
import { ConfigProvider, theme as antdTheme } from 'antd';
import classNames from 'classnames';
import React, { useEffect, useMemo } from 'react';
Expand Down Expand Up @@ -26,7 +27,7 @@ export const Editor: React.FC<EditorProps> = (props) => {
const { theme, mapOptions, setMapOptions, showIndex, locale } = useGlobal();
const styles = useStyle();

useEffect(() => {
useUpdateEffect(() => {
if (theme === 'dark') {
setMapOptions({ ...mapOptions, style: 'dark' });
} else {
Expand Down

0 comments on commit 94d3e86

Please sign in to comment.