-
{totalObject} {UtilCommon.plural(totalObject, translate('pluralObject'))}
+
{totalObject} {UtilCommon.sprintf(translate('pageMainRelationObjectsCreated'), UtilCommon.plural(totalObject, translate('pluralObject')))}
diff --git a/src/ts/component/page/main/type.tsx b/src/ts/component/page/main/type.tsx
index c9aa7b5f4e..bb7fa58b7e 100644
--- a/src/ts/component/page/main/type.tsx
+++ b/src/ts/component/page/main/type.tsx
@@ -506,7 +506,7 @@ const PageMainType = observer(class PageMainType extends React.Component
{
menuStore.open('dataviewTemplateContext', {
menuKey: item.id,
- element: `#item-${item.id} .more`,
+ element: `#item-more-${item.id}`,
vertical: I.MenuDirection.Bottom,
horizontal: I.MenuDirection.Right,
onOpen: () => $(`#item-${item.id}`).addClass('active'),
diff --git a/src/ts/component/popup/export.tsx b/src/ts/component/popup/export.tsx
index 0f0a640e50..9e2482d41a 100644
--- a/src/ts/component/popup/export.tsx
+++ b/src/ts/component/popup/export.tsx
@@ -49,7 +49,7 @@ const PopupExport = observer(class PopupExport extends React.Component
control = (
{
this.data[item.id] = v;
this.save();
diff --git a/src/ts/component/popup/page/settings/appearance.tsx b/src/ts/component/popup/page/settings/appearance.tsx
index c4d41215ee..d77e7ba699 100644
--- a/src/ts/component/popup/page/settings/appearance.tsx
+++ b/src/ts/component/popup/page/settings/appearance.tsx
@@ -40,9 +40,7 @@ const PopupSettingsPageAppearance = observer(class PopupSettingsPageAppearance e
-
-
{ commonStore.autoSidebarSet(v); }}/>
diff --git a/src/ts/component/popup/page/settings/delete.tsx b/src/ts/component/popup/page/settings/delete.tsx
index 66298868ef..91764573bf 100644
--- a/src/ts/component/popup/page/settings/delete.tsx
+++ b/src/ts/component/popup/page/settings/delete.tsx
@@ -1,15 +1,22 @@
import * as React from 'react';
-import { Title, Button, Checkbox } from 'Component';
+import { Title, Button, Checkbox, Error } from 'Component';
import { I, C, translate, UtilRouter, analytics } from 'Lib';
import { authStore } from 'Store';
import { observer } from 'mobx-react';
import Head from './head';
-const PopupSettingsPageDelete = observer(class PopupSettingsPageDelete extends React.Component {
+interface State {
+ error: string;
+};
- refCheckbox = null;
+const PopupSettingsPageDelete = observer(class PopupSettingsPageDelete extends React.Component {
+
+ refCheckbox: any = null;
refButton = null;
- node = null;
+ node: any = null;
+ state = {
+ error: '',
+ };
constructor (props: I.PopupSettings) {
super(props);
@@ -19,6 +26,8 @@ const PopupSettingsPageDelete = observer(class PopupSettingsPageDelete extends R
};
render () {
+ const { error } = this.state;
+
return (
this.node = node}
@@ -38,7 +47,9 @@ const PopupSettingsPageDelete = observer(class PopupSettingsPageDelete extends R
this.refCheckbox = ref} /> {translate('popupSettingsDeleteCheckboxLabel')}
-
);
};
@@ -55,6 +66,7 @@ const PopupSettingsPageDelete = observer(class PopupSettingsPageDelete extends R
C.AccountDelete((message: any) => {
if (message.error.code) {
+ this.setState({ error: message.error.description });
return;
};
diff --git a/src/ts/component/popup/page/settings/personal.tsx b/src/ts/component/popup/page/settings/personal.tsx
index aeb0d5699c..b7714ccf00 100644
--- a/src/ts/component/popup/page/settings/personal.tsx
+++ b/src/ts/component/popup/page/settings/personal.tsx
@@ -1,46 +1,35 @@
import * as React from 'react';
import { observer } from 'mobx-react';
-import { Icon, Title, Label, Select } from 'Component';
-import { I, translate, analytics, Renderer, UtilObject, Action } from 'Lib';
-import { commonStore, menuStore, dbStore } from 'Store';
+import { Icon, Title, Label, Select, Switch } from 'Component';
+import { I, translate, UtilCommon, Action, Renderer } from 'Lib';
+import { commonStore } from 'Store';
import Constant from 'json/constant.json';
const PopupSettingsPagePersonal = observer(class PopupSettingsPagePersonal extends React.Component