Browse Source

Pull request #1: DEC-20119 fix: 【自动化】服务器数据集页面刷新后,创建数据集不显示插件类型数据集

Merge in PG3/demo-tabledata-redis from ~DAILER/demo-tabledata-redis:master to master

* commit '95507f0edeb1cb8b06ca966a4253857dabfc032f':
  提升版本
  DEC-20119 fix: 【自动化】服务器数据集页面刷新后,创建数据集不显示插件类型数据集
  Revert "DEC-17971 feat: redis数据集加密"
  DEC-17971 feat: redis数据集加密
master
Dailer 4 years ago
parent
commit
c3247246f3
  1. 2
      plugin.xml
  2. 4
      src/main/resources/com/fr/plugin/db/redis/web/redis.js
  3. 40
      src/web/src/index.ts

2
plugin.xml

@ -3,7 +3,7 @@
<id>com.fr.solution.plugin.db.redis.v10</id> <id>com.fr.solution.plugin.db.redis.v10</id>
<name><![CDATA[Redis数据集]]></name> <name><![CDATA[Redis数据集]]></name>
<active>yes</active> <active>yes</active>
<version>7.4.4</version> <version>7.4.5</version>
<env-version>10.0</env-version> <env-version>10.0</env-version>
<jartime>2020-01-20</jartime> <jartime>2020-01-20</jartime>
<vendor>richie</vendor> <vendor>richie</vendor>

4
src/main/resources/com/fr/plugin/db/redis/web/redis.js

File diff suppressed because one or more lines are too long

40
src/web/src/index.ts

@ -3,30 +3,28 @@ import { RedisEdit } from './modules/app.edit';
import { RedisDataset } from './modules/app.dataset'; import { RedisDataset } from './modules/app.dataset';
import { RedisProgram } from './modules/app.program'; import { RedisProgram } from './modules/app.program';
BI.DOM.ready(() => { BI.config('dec.connection.provider.datebase', provider => {
BI.config('dec.connection.provider.datebase', provider => { provider.registerDatabaseType({
provider.registerDatabaseType({ text: 'Redis',
text: 'Redis', databaseType: 'Redis',
databaseType: 'Redis', iconUrl: 'com/fr/plugin/db/redis/images/redis.jpg',
iconUrl: 'com/fr/plugin/db/redis/images/redis.jpg', edit: RedisEdit.xtype,
edit: RedisEdit.xtype, show: RedisShow.xtype,
show: RedisShow.xtype,
});
}); });
});
BI.config('dec.provider.data.set', provider => { BI.config('dec.provider.data.set', provider => {
provider.registerDataSetType({ provider.registerDataSetType({
value: 'Redis', value: 'Redis',
text: 'Redis数据集', text: 'Redis数据集',
cardType: RedisDataset.xtype, cardType: RedisDataset.xtype,
});
}); });
});
BI.config('dec.provider.data.set', provider => { BI.config('dec.provider.data.set', provider => {
provider.registerDataSetType({ provider.registerDataSetType({
value: 'RedisScript', value: 'RedisScript',
text: 'Redis程序数据集', text: 'Redis程序数据集',
cardType: RedisProgram.xtype, cardType: RedisProgram.xtype,
});
}); });
}); });

Loading…
Cancel
Save