Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE PE] Fix Bug 49364 v2

Browse source
This commit is contained in:
ShimaginAndrey 2021-10-04 11:56:39 +03:00
parent 60350fbb13
commit b4b013f68a
6 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/documenteditor/mobile/src/view/add/Add.jsx
View file

@ -185,8 +185,9 @@ const AddTabs = inject("storeFocusObjects", "storeTableSettings")(observer(({sto
const onGetTableStylesPreviews = () => { const onGetTableStylesPreviews = () => {
const api = Common.EditorApi.get(); const api = Common.EditorApi.get();
if(storeTableSettings.isRenderStyles) { if(storeTableSettings.isRenderStyles) {
$$('.table-styles').hide();
f7.preloader.showIn('.preload'); f7.preloader.showIn('.preload');
setTimeout( () => storeTableSettings.setStyles(api.asc_getTableStylesPreviews()), 10); setTimeout( () => storeTableSettings.setStyles(api.asc_getTableStylesPreviews(true)), 10);
storeTableSettings.resetFlagRender(false); storeTableSettings.resetFlagRender(false);
} }
} }

1
apps/documenteditor/mobile/src/view/add/AddTable.jsx
View file

@ -12,6 +12,7 @@ const AddTable = props => {
const onReadyStyles = () => { const onReadyStyles = () => {
f7.preloader.hideIn('.preload'); f7.preloader.hideIn('.preload');
$$('.table-styles').show();
} }
return ( return (

8
apps/documenteditor/mobile/src/view/edit/EditTable.jsx
View file

@ -180,8 +180,8 @@ const StyleTemplates = inject("storeFocusObjects","storeTableSettings")(observer
const styles = storeTableSettings.arrayStyles; const styles = storeTableSettings.arrayStyles;
useEffect(() => { useEffect(() => {
if (storeTableSettings.isRenderStyles) onGetTableStylesPreviews(); if (storeTableSettings.isRenderStyles) {
return () => { onGetTableStylesPreviews();
storeTableSettings.resetFlagRender(false); storeTableSettings.resetFlagRender(false);
} }
}, []); }, []);
@ -224,12 +224,11 @@ const PageStyleOptions = props => {
nextStateRef.current = [isFirstRow, isLastRow, isBandHor, isFirstCol, isLastCol, isBandVer]; nextStateRef.current = [isFirstRow, isLastRow, isBandHor, isFirstCol, isLastCol, isBandVer];
useEffect(() => { useEffect(() => {
props.storeTableSettings.resetFlagRender(false);
prevStateRef.current = [...nextStateRef.current]; prevStateRef.current = [...nextStateRef.current];
return () => { return () => {
if (!(prevStateRef.current.every((item, index) => item === nextStateRef.current[index]))) { if (!(prevStateRef.current.every((item, index) => item === nextStateRef.current[index]))) {
props.onGetTableStylesPreviews(); props.storeTableSettings.resetFlagRender(true);
} }
} }
}, []); }, []);
@ -238,6 +237,7 @@ const PageStyleOptions = props => {
if ( !(prevStateRef.current.every((item, index) => item === nextStateRef.current[index]))) { if ( !(prevStateRef.current.every((item, index) => item === nextStateRef.current[index]))) {
$$('.table-styles').hide(); $$('.table-styles').hide();
f7.preloader.showIn('.preload'); f7.preloader.showIn('.preload');
props.onGetTableStylesPreviews();
} }
} }

3
apps/presentationeditor/mobile/src/controller/add/AddOther.jsx
View file

@ -95,8 +95,9 @@ class AddOtherController extends Component {
onGetTableStylesPreviews = () => { onGetTableStylesPreviews = () => {
const api = Common.EditorApi.get(); const api = Common.EditorApi.get();
if (this.props.storeTableSettings.isRenderStyles) { if (this.props.storeTableSettings.isRenderStyles) {
$$('.table-styles').hide();
f7.preloader.showIn('.preload'); f7.preloader.showIn('.preload');
setTimeout(() => this.props.storeTableSettings.setStyles(api.asc_getTableStylesPreviews()) , 10); setTimeout(() => this.props.storeTableSettings.setStyles(api.asc_getTableStylesPreviews(true)) , 10);
this.props.storeTableSettings.resetFlagRender(false); this.props.storeTableSettings.resetFlagRender(false);
} }
} }

1
apps/presentationeditor/mobile/src/view/add/AddOther.jsx
View file

@ -13,6 +13,7 @@ const PageTable = props => {
const onReadyStyles = () => { const onReadyStyles = () => {
f7.preloader.hideIn('.preload'); f7.preloader.hideIn('.preload');
$$('.table-styles').show();
} }
return ( return (

8
apps/presentationeditor/mobile/src/view/edit/EditTable.jsx
View file

@ -14,8 +14,8 @@ const StyleTemplates = inject("storeFocusObjects","storeTableSettings")(observer
const styles = storeTableSettings.arrayStyles; const styles = storeTableSettings.arrayStyles;
useEffect(() => { useEffect(() => {
if (storeTableSettings.isRenderStyles) onGetTableStylesPreviews(); if (storeTableSettings.isRenderStyles) {
return () => { onGetTableStylesPreviews();
storeTableSettings.resetFlagRender(false); storeTableSettings.resetFlagRender(false);
} }
}, []); }, []);
@ -64,12 +64,11 @@ const PageStyleOptions = props => {
nextStateRef.current = [isFirstRow, isLastRow, isBandHor, isFirstCol, isLastCol, isBandVer]; nextStateRef.current = [isFirstRow, isLastRow, isBandHor, isFirstCol, isLastCol, isBandVer];
useEffect(() => { useEffect(() => {
props.storeTableSettings.resetFlagRender(false);
prevStateRef.current = [...nextStateRef.current]; prevStateRef.current = [...nextStateRef.current];
return () => { return () => {
if (!(prevStateRef.current.every((item, index) => item === nextStateRef.current[index]))) { if (!(prevStateRef.current.every((item, index) => item === nextStateRef.current[index]))) {
props.onGetTableStylesPreviews(); props.storeTableSettings.resetFlagRender(true);
} }
} }
}, []); }, []);
@ -78,6 +77,7 @@ const PageStyleOptions = props => {
if ( !(prevStateRef.current.every((item, index) => item === nextStateRef.current[index]))) { if ( !(prevStateRef.current.every((item, index) => item === nextStateRef.current[index]))) {
$$('.table-styles').hide(); $$('.table-styles').hide();
f7.preloader.showIn('.preload'); f7.preloader.showIn('.preload');
props.onGetTableStylesPreviews();
} }
} }