[DE mobile] Refactoring Document Info

This commit is contained in:
SergeyEzhin 2020-11-24 17:03:21 +03:00
parent 0402a93aaf
commit 736412ce23
2 changed files with 86 additions and 100 deletions

View file

@ -4,22 +4,21 @@ import DocumentInfo from "../../view/settings/DocumentInfo";
class DocumentInfoController extends Component {
constructor(props) {
super(props);
this.docProps = this.getDocProps();
this.getModified = this.getModified();
this.getModifiedBy = this.getModifiedBy();
this.getCreators = this.getCreators();
}
getDocProps() {
const api = Common.EditorApi.get();
if (api) {
let docProps = api.asc_getCoreProps();
// console.log(docProps);
return docProps;
}
return api.asc_getCoreProps();
}
getAppProps() {
const api = Common.EditorApi.get();
if (api) {
const appProps = api.asc_getAppProps();
// console.log(appProps);
if (appProps) {
let appName =
(appProps.asc_getApplication() || "") +
@ -28,12 +27,9 @@ class DocumentInfoController extends Component {
return appName;
}
}
}
getModified() {
const docProps = this.getDocProps();
if (docProps) {
let valueModified = docProps.asc_getModified();
let valueModified = this.docProps.asc_getModified();
if (valueModified) {
return (
@ -47,33 +43,23 @@ class DocumentInfoController extends Component {
);
}
}
}
getModifiedBy() {
const docProps = this.getDocProps();
if (docProps) {
let valueModifiedBy = docProps.asc_getLastModifiedBy();
let valueModifiedBy = this.docProps.asc_getLastModifiedBy();
if (valueModifiedBy) {
return Common.Utils.UserInfoParser.getParsedName(valueModifiedBy);
}
}
}
getCreators() {
const docProps = this.getDocProps();
if(docProps) {
let valueCreators = docProps.asc_getCreator();
return valueCreators;
}
return this.docProps.asc_getCreator();
}
componentDidMount() {
const api = Common.EditorApi.get();
if (api) {
api.startGetDocInfo();
}
}
render() {
return (
@ -81,11 +67,11 @@ class DocumentInfoController extends Component {
getAppProps={this.getAppProps}
getModified={this.getModified}
getModifiedBy={this.getModifiedBy}
getDocProps={this.getDocProps}
getCreators={this.getCreators}
/>
);
}
}
export default DocumentInfoController;

View file

@ -8,10 +8,10 @@ const PageDocumentInfo = (props) => {
const _t = t("Settings", { returnObjects: true });
const storeInfo = props.storeDocumentInfo;
const dataApp = props.getAppProps();
const dataModified = props.getModified();
const dataModifiedBy = props.getModifiedBy();
const creators = props.getCreators();
console.log(creators);
const dataModified = props.getModified;
const dataModifiedBy = props.getModifiedBy;
const creators = props.getCreators;
// console.log(creators);
const {
pageCount,
paragraphCount,
@ -21,7 +21,7 @@ const PageDocumentInfo = (props) => {
} = storeInfo.infoObj;
const dataDoc = JSON.parse(JSON.stringify(storeInfo.dataDoc));
const isLoaded = storeInfo.isLoaded;
console.log(pageCount, paragraphCount, symbolsCount, symbolsWSCount, wordsCount);
// console.log(pageCount, paragraphCount, symbolsCount, symbolsWSCount, wordsCount);
return (
<Page>
@ -40,11 +40,11 @@ const PageDocumentInfo = (props) => {
</List>
<BlockTitle>{_t.textStatistic}</BlockTitle>
<List>
<ListItem title="Pages" after={isLoaded ? pageCount : _t.textLoading}></ListItem>
<ListItem title="Paragraphs" after={isLoaded ? paragraphCount : _t.textLoading}></ListItem>
<ListItem title="Words" after={isLoaded ? wordsCount : _t.textLoading}></ListItem>
<ListItem title="Symbols" after={isLoaded ? symbolsCount : _t.textLoading}></ListItem>
<ListItem title="Spaces" after={isLoaded ? symbolsWSCount : _t.textLoading}></ListItem>
<ListItem title="Pages" after={isLoaded ? String(pageCount) : _t.textLoading}></ListItem>
<ListItem title="Paragraphs" after={isLoaded ? String(paragraphCount) : _t.textLoading}></ListItem>
<ListItem title="Words" after={isLoaded ? String(wordsCount) : _t.textLoading}></ListItem>
<ListItem title="Symbols" after={isLoaded ? String(symbolsCount) : _t.textLoading}></ListItem>
<ListItem title="Spaces" after={isLoaded ? String(symbolsWSCount) : _t.textLoading}></ListItem>
</List>
{dataModified && dataModifiedBy ? (
<Fragment>