From 3d366c4be33a2e44b9500d4a9e2436902c437dd2 Mon Sep 17 00:00:00 2001 From: dailer Date: Wed, 11 Aug 2021 17:29:16 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"DEC-17971=20feat:=20redis=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=8A=A0=E5=AF=86"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 03eac54abd73198c274f3f5132c9b447ccece5d2. --- src/web/src/modules/app.dataset.ts | 29 ++++++++++++------------- src/web/src/modules/app.program.ts | 35 ++++++++++++------------------ 2 files changed, 28 insertions(+), 36 deletions(-) diff --git a/src/web/src/modules/app.dataset.ts b/src/web/src/modules/app.dataset.ts index b0af00a..f722420 100644 --- a/src/web/src/modules/app.dataset.ts +++ b/src/web/src/modules/app.dataset.ts @@ -1,11 +1,11 @@ -import {shortcut, store} from '@core/core'; -import {TableList} from './table_list/table_list'; +import { shortcut, store } from '@core/core'; +import { TableList } from './table_list/table_list'; import '../less/index.less'; -import {DatabaseIndex} from './components/database_index/database_index'; -import {RedisModel, ParameterType} from './app.model'; -import {Preview} from './components/preview/preview'; +import { DatabaseIndex } from './components/database_index/database_index'; +import { RedisModel, ParameterType } from './app.model'; +import { Preview } from './components/preview/preview'; import './app.less'; -import {redisField} from './app.constant'; +import { redisField } from './app.constant'; @shortcut() @store(RedisModel) @@ -43,12 +43,11 @@ export class RedisDataset extends BI.Widget { } render() { - const {database = '', orderValue = 0, query = '', parameters = []} = this.options.value.datasetData || {}; + 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 { type: BI.HTapeLayout.xtype, tgap: 15, @@ -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; }, @@ -186,7 +185,7 @@ export class RedisDataset extends BI.Widget { columnSize: [300, 300, ''], items: this.renderItems(), header: [this.model.paramHeader], - ref: (_ref: any) => { + ref: (_ref: any) => { this.parameterEditor = _ref; }, }], @@ -196,7 +195,7 @@ export class RedisDataset extends BI.Widget { private renderItems() { const self = this; - + return this.model.parameters.map((item, index) => [{ type: BI.Label.xtype, text: item.name, @@ -211,7 +210,7 @@ export class RedisDataset extends BI.Widget { value: item.type, listeners: [{ eventName: BI.IconTextValueCombo.EVENT_CHANGE, - action() { + action () { self.store.setParamType(index, this.getValue()[0]); }, }], @@ -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, }; } diff --git a/src/web/src/modules/app.program.ts b/src/web/src/modules/app.program.ts index 1e8156c..127fb3b 100644 --- a/src/web/src/modules/app.program.ts +++ b/src/web/src/modules/app.program.ts @@ -1,11 +1,11 @@ -import {shortcut, store} from '@core/core'; -import {TableList} from './table_list/table_list'; +import { shortcut, store } from '@core/core'; +import { TableList } from './table_list/table_list'; import '../less/index.less'; -import {DatabaseIndex} from './components/database_index/database_index'; -import {RedisModel, ParameterType} from './app.model'; +import { DatabaseIndex } from './components/database_index/database_index'; +import { RedisModel, ParameterType } from './app.model'; import './app.less'; -import {redisField} from './app.constant'; -import {Preview} from './components/preview/preview'; +import { redisField } from './app.constant'; +import { Preview } from './components/preview/preview'; @shortcut() @store(RedisModel) @@ -46,17 +46,10 @@ 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, tgap: 15, @@ -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; }, @@ -219,7 +212,7 @@ export class RedisProgram extends BI.Widget { columnSize: [300, 300, ''], items: this.renderItems(), header: [this.model.paramHeader], - ref: (_ref: any) => { + ref: (_ref: any) => { this.parameterEditor = _ref; }, }], @@ -229,7 +222,7 @@ export class RedisProgram extends BI.Widget { private renderItems() { const self = this; - + return this.model.parameters.map((item, index) => [{ type: BI.Label.xtype, text: item.name, @@ -244,7 +237,7 @@ export class RedisProgram extends BI.Widget { value: item.type, listeners: [{ eventName: BI.IconTextValueCombo.EVENT_CHANGE, - action() { + action () { self.store.setParamType(index, this.getValue()[0]); }, }], @@ -258,7 +251,7 @@ export class RedisProgram extends BI.Widget { self.store.setParamValue(index, value); })]); } - + private createParameterValueItem(param: ParameterType, cb: Function) { return BI.Services.getService('dec.service.data.set').createParameterValueItem(param, cb); } @@ -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, };