Compare commits

..

No commits in common. 'master' and 'master' have entirely different histories.

  1. 7
      src/web/src/modules/app.dataset.ts
  2. 13
      src/web/src/modules/app.program.ts

7
src/web/src/modules/app.dataset.ts

@ -45,8 +45,7 @@ export class RedisDataset extends BI.Widget {
render() {
const { database = '', orderValue = 0, query = '', parameters = [] } = this.options.value.datasetData || {};
this.store.setParameters(parameters);
const plainQuery = BI.Providers.getProvider("dec.provider.cipher").getPlain(query);
this.store.setAbleSave(!!plainQuery);
this.store.setAbleSave(!!query);
const inputType = typeof orderValue === 'string' ? 'formula' : 'int';
return {
@ -131,7 +130,7 @@ export class RedisDataset extends BI.Widget {
cls: 'bi-border',
height: 200,
allowBlank: true,
value: plainQuery,
value: query,
ref: (_ref: any) => {
this.queryCondition = _ref;
},
@ -228,7 +227,7 @@ export class RedisDataset extends BI.Widget {
return {
database: this.tableList.getSelectedDatabase(),
orderValue: this.databaseIndex.getValue(),
query: BI.Providers.getProvider("dec.provider.cipher").getCipher(this.queryCondition.getValue()),
query: this.queryCondition.getValue(),
parameters: this.model.parameters,
};
}

13
src/web/src/modules/app.program.ts

@ -46,16 +46,9 @@ export class RedisProgram extends BI.Widget {
}
render() {
const {
database = '',
orderValue = 0,
script = '',
parameters = [],
engineType = 0
} = this.options.value.datasetData || {};
const { database = '', orderValue = 0, script = '', parameters = [], engineType = 0 } = this.options.value.datasetData || {};
this.store.setParameters(parameters);
const inputType = typeof orderValue === 'string' ? 'formula' : 'int';
const plainScript = BI.Providers.getProvider("dec.provider.cipher").getPlain(script);
return {
type: BI.HTapeLayout.xtype,
@ -164,7 +157,7 @@ export class RedisProgram extends BI.Widget {
cls: 'bi-border',
height: 200,
allowBlank: true,
value: plainScript,
value: script,
ref: (_ref: any) => {
this.queryCondition = _ref;
},
@ -267,7 +260,7 @@ export class RedisProgram extends BI.Widget {
return {
database: this.tableList.getSelectedDatabase(),
orderValue: this.databaseIndex.getValue(),
script: BI.Providers.getProvider("dec.provider.cipher").getCipher(this.queryCondition.getValue()),
script: this.queryCondition.getValue(),
engineType: this.engineTypeSelect.getValue()[0],
parameters: this.model.parameters,
};

Loading…
Cancel
Save