Skip to content

Commit

Permalink
ref #769 fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@CharlesGrimont
CharlesGrimont committed Nov 26, 2024
1 parent 3a1de88 commit bb2f040
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 45 deletions.
2 changes: 1 addition & 1 deletion DisplayObjects/mobile/assets/i18n/en.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version_c8o": "2.0.0-beta162",
"version_c8o": "2.0.0-beta164",
"reset_to_default_values": "Reset to default values",
"general_settings": "General settings",
"font_size": "Font size",
Expand Down
2 changes: 1 addition & 1 deletion DisplayObjects/mobile/assets/i18n/es.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version_c8o": "2.0.0-beta162",
"version_c8o": "2.0.0-beta164",
"reset_to_default_values": "Restablecer los valores predeterminados",
"general_settings": "Configuración general",
"font_size": "Tamaño de fuente",
Expand Down
2 changes: 1 addition & 1 deletion DisplayObjects/mobile/assets/i18n/fr.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version_c8o": "2.0.0-beta162",
"version_c8o": "2.0.0-beta164",
"reset_to_default_values": "Réinitialiser les valeurs par défaut",
"general_settings": "Paramètres généraux",
"font_size": "Taille de police",
Expand Down
2 changes: 1 addition & 1 deletion DisplayObjects/mobile/assets/i18n/it.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version_c8o": "2.0.0-beta162",
"version_c8o": "2.0.0-beta164",
"reset_to_default_values": "Reimposta i valori predefiniti",
"general_settings": "Impostazioni generali",
"font_size": "Dimensione del carattere",
Expand Down
24 changes: 9 additions & 15 deletions _c8oProject/mobilePages/editorPage.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9401,12 +9401,6 @@ title: Title for editor
- xmlizable:
- ↑classname: com.twinsoft.convertigo.beans.ngx.components.MobileSmartSourceType
- MobileSmartSourceType: plain:event.preventDefault()
↓Event1 [ngx.components.UIControlEvent-1650357060077]:
attrName: (change)
eventName: onChange
↓InvokeSharedAction1 [ngx.components.UIDynamicInvoke-1650357060080]:
beanData: '{"ionBean":"InvokeAction"}'
stack: C8Oforms.MobileApplication.Application.updateState
↓Event11 [ngx.components.UIControlEvent-1650357060083]:
attrName: (dragover)
eventName: (dragover)
Expand Down Expand Up @@ -9437,24 +9431,24 @@ title: Title for editor
- ↑classname: com.twinsoft.convertigo.beans.common.FormatedContent
- com.twinsoft.convertigo.beans.common.FormatedContent:
→: |
let currentIndex = this.local['currentIndex'];
let beforeVal = this.form.pages[currentIndex];
let currentIndex = page.local['currentIndex'];
let beforeVal = page.form.pages[currentIndex];
let bad = false;
for(let i in this.form.pages){
if((this.form.pages[+i].name == event.srcElement.value && +i != currentIndex) || ""+ event.srcElement.value.trim() == ""){
for(let i in page.form.pages){
if((page.form.pages[+i].name == event.srcElement.value && +i != currentIndex) || ""+ event.srcElement.value.trim() == ""){
console.log("badValue");
this.form.pages[currentIndex].name = beforeVal.name + " ";
this.form.pages[currentIndex].name = beforeVal.name;
page.form.pages[currentIndex].name = beforeVal.name + " ";
page.form.pages[currentIndex].name = beforeVal.name;
bad = true;
resolve({"badValue":true})
this.getTranslate("nameAlreadyexits")
page.getTranslate("nameAlreadyexits")
.then((res:any)=>{
this.showToast(res);
page.showToast(res);
});
}
}
if(!bad){
this.form.pages[currentIndex].name = event.srcElement.value;
page.form.pages[currentIndex].name = event.srcElement.value;
resolve({"badValue":false})
}

Expand Down
48 changes: 28 additions & 20 deletions _c8oProject/mobilePages/viewerPage.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1955,29 +1955,37 @@ scriptContent:
}
public async evalHtml(html, name){
let regex = /\$\$(?:START)?(\d+)(.*?)(?:END)?(?:\d+)?\$\$/;
let ObjectThatHaveToCallFunc = []
let str = this.stringOf$$ToCode(html, "html", ObjectThatHaveToCallFunc, regex);
let sha = sha256(JSON.stringify(html));
this.functionsById[sha] = async () => {
try{
let page = this;
const asyncFunction = Object.getPrototypeOf(async () => {}).constructor(
''page'',
`return (async () => { return ${str} })();`
);
let res = await asyncFunction(page);
page.local.htmlValue[name] = res != null && res != "null" && res != "undefined" ? res : "";
}
catch(e){
this.local.htmlValue[name] =""
if(html != "" && html != null){
let regex = /\$\$(?:START)?(\d+)(.*?)(?:END)?(?:\d+)?\$\$/;
let ObjectThatHaveToCallFunc = []
let str = this.stringOf$$ToCode(html, "html", ObjectThatHaveToCallFunc, regex);
let sha = sha256(JSON.stringify(html));
this.functionsById[sha] = async () => {
try{
let page = this;
const asyncFunction = Object.getPrototypeOf(async () => {}).constructor(
''page'',
`return (async () => { return ${str} })();`
);
let res = await asyncFunction(page);
page.local.htmlValue[name] = res != null && res != "null" && res != "undefined" ? res : "";
}
catch(e){
this.local.htmlValue[name] =""
}
finally{
this.ref.detectChanges();
}
}
finally{
this.ref.detectChanges();
await this.functionsById[sha]();
if(sha){
this.fillFunctionsIDToBeCalledFromObjectThatHaveToCallFunc(ObjectThatHaveToCallFunc, sha);
}
}
await this.functionsById[sha]();
this.fillFunctionsIDToBeCalledFromObjectThatHaveToCallFunc(ObjectThatHaveToCallFunc, sha);
else{
this.local.htmlValue[name] = "";
}
}
public async fillPages(pages){
Expand Down
8 changes: 4 additions & 4 deletions c8oProject.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
↑convertigo: 8.1.0.m006
↓C8Oforms [core.Project]:
comment: Convertigo No Code Studio
contextTimeout: ${C8Oforms.context.timeout=3600}
contextTimeout: ${C8Oforms.context.timeout=60}
corsOrigin: =Origin
httpSessionTimeout: ${C8Oforms.http_session.timeout=3600}
version: 2.0.0-beta162
httpSessionTimeout: ${C8Oforms.http_session.timeout=60}
version: 2.0.0-beta164
↓c8oforms_fs [connectors.FullSyncConnector]: 🗏 connectors/c8oforms_fs.yaml
↓c8oforms_response_fs [connectors.FullSyncConnector]: 🗏 connectors/c8oforms_response_fs.yaml
↓HTTP_connector [connectors.HttpConnector]: 🗏 connectors/HTTP_connector.yaml
Expand Down Expand Up @@ -102,7 +102,7 @@
↓lib_GeneratePWAAssets_reference [references.ProjectSchemaReference]:
projectName: lib_GeneratePWAAssets=https://github.com/convertigo/c8oprj-lib-generate-assets-pwa.git:branch=2.0.6:autoPull=true
↓lib_OAuth_reference [references.ProjectSchemaReference]:
projectName: lib_OAuth=https://github.com/convertigo/c8oprj-lib-oauth.git:branch=1.0.3:autoPull=true
projectName: lib_OAuth=https://github.com/convertigo/c8oprj-lib-oauth.git:branch=1.3.2:autoPull=true
↓lib_ProductTour_reference [references.ProjectSchemaReference]:
projectName: lib_ProductTour=https://github.com/convertigo/c8oprj-product-tour.git:branch=master
↓lib_Vonage_ui_ngx_reference [references.ProjectSchemaReference]:
Expand Down
2 changes: 1 addition & 1 deletion ngswForPWA/ngsw-config-sub-pwa.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"appData": {
"name": "Convertigo Forms Builder",
"description": "A simple and intuitive \"no code\" tool to create your personalized apps in a few clicks!",
"version": "2.0.0-beta162"
"version": "2.0.0-beta164"
},
"assetGroups": [
{
Expand Down
2 changes: 1 addition & 1 deletion project.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ see [readme](https://github.com/convertigo/c8oprj-lib-geocoding-ui-ngx/tree/a7a4
## ![](https://github.com/convertigo/convertigo/blob/develop/engine/src/com/twinsoft/convertigo/beans/references/images/ProjectSchemaReference_16x16.png?raw=true "ProjectSchemaReference") lib_OAuth


see [readme](https://github.com/convertigo/c8oprj-lib-oauth/tree/bf120fcf0e880098e3ac992b86c8a1076864564d#readme)
see [readme](https://github.com/convertigo/c8oprj-lib-oauth/tree/8.0.0#readme)
</p></blockquote></details>

<details><summary><b>lib_ProductTour</b></summary><blockquote><p>
Expand Down

0 comments on commit bb2f040

Please sign in to comment.