Browse Source

Merge pull request 'KERNEL-6540 类型引用规范化' (#3) from youki/demo-tabledata-redis:master into master

Reviewed-on: fanruan/demo-tabledata-redis#3
master
richie 4 years ago
parent
commit
428d99baa3
  1. 14
      src/main/resources/com/fr/plugin/db/redis/web/redis.js
  2. 30
      src/web/babel.config.js
  3. 6
      src/web/index.html
  4. 15
      src/web/package.json
  5. 4
      src/web/src/index.edit.ts
  6. 2
      src/web/src/less/background.less
  7. 2
      src/web/src/less/font.less
  8. 2
      src/web/src/less/utils.less
  9. 33
      src/web/src/modules/app.dataset.ts
  10. 21
      src/web/src/modules/app.edit.ts
  11. 41
      src/web/src/modules/app.program.ts
  12. 21
      src/web/src/modules/app.show.ts
  13. 8
      src/web/src/modules/components/database_index/database_index.service.ts
  14. 7
      src/web/src/modules/components/database_index/database_index.ts
  15. 5
      src/web/src/modules/components/form_item/form_item.ts
  16. 15
      src/web/src/modules/components/pool/pool.ts
  17. 15
      src/web/src/modules/components/pool/pool_edit.ts
  18. 19
      src/web/src/modules/components/proxy/proxy.ts
  19. 19
      src/web/src/modules/components/proxy/proxy_edit.ts
  20. 9
      src/web/src/modules/table_list/list_item.ts
  21. 25
      src/web/src/modules/table_list/table_list.ts
  22. 81
      src/web/src/ui/fineui.ts
  23. 1
      src/web/src/ui/index.ts
  24. 1
      src/web/tsconfig.json
  25. 2
      src/web/types/globals.d.ts
  26. 2
      src/web/webpack/webpack.common.js

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

File diff suppressed because one or more lines are too long

30
src/web/babel.config.js

@ -1,29 +1 @@
module.exports = function(api) { module.exports = require('@fui/babel-preset-fineui').configs.base;
api.cache(true);
const presets = [
[
'@babel/preset-env',
{
targets: {
ie: 9,
chrome: 47,
},
},
],
'@babel/preset-typescript',
];
const plugins = [
[
'@babel/plugin-proposal-decorators',
{
legacy: true,
},
],
'@babel/plugin-proposal-class-properties',
];
return {
presets,
plugins,
};
};

6
src/web/index.html

@ -6,7 +6,7 @@
<!--核心css文件--> <!--核心css文件-->
<link <link
rel="preload" rel="preload"
href="./node_modules/fineui/dist/font/iconfont.woff" href="./node_modules/@fui/core/dist/font/iconfont.woff"
as="font" as="font"
type="font/woff" type="font/woff"
crossorigin="" crossorigin=""
@ -14,7 +14,7 @@
<link <link
rel="stylesheet" rel="stylesheet"
type="text/css" type="text/css"
href="./node_modules/fineui/dist/2.0/fineui.min.css" href="./node_modules/@fui/core/dist/2.0/fineui.min.css"
/> />
<link <link
rel="stylesheet" rel="stylesheet"
@ -26,7 +26,7 @@
<body id="body"> <body id="body">
<div id="wrapper"></div> <div id="wrapper"></div>
<script src="./assets/scripts/dec.js"></script> <script src="./assets/scripts/dec.js"></script>
<script src="./node_modules/fineui/dist/fineui.js"></script> <script src="./node_modules/@fui/core/dist/fineui.js"></script>
<script src="./node_modules/@fui/materials/docs/materials.min.js"></script> <script src="./node_modules/@fui/materials/docs/materials.min.js"></script>
</body> </body>
</html> </html>

15
src/web/package.json

@ -7,11 +7,12 @@
"author": "alan", "author": "alan",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@fui/materials": "^10.0.0", "@fui/babel-preset-fineui": "^1.0.0",
"@fui/core": "^2.0.0",
"@fui/materials": "10.0.0-release - 10.0.0-release.99999999999999",
"@types/jss": "9.5.8", "@types/jss": "9.5.8",
"autoprefixer": "^9.6.1", "autoprefixer": "^9.6.1",
"es6-promise": "4.2.6", "es6-promise": "4.2.6",
"fineui": "^2.0.20200628140334",
"fork-ts-checker-webpack-plugin": "^1.5.1", "fork-ts-checker-webpack-plugin": "^1.5.1",
"jss": "9.8.7", "jss": "9.8.7",
"jss-plugin-global": "10.0.0-alpha.7", "jss-plugin-global": "10.0.0-alpha.7",
@ -20,15 +21,9 @@
"optimize-css-assets-webpack-plugin": "^5.0.3" "optimize-css-assets-webpack-plugin": "^5.0.3"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "7.4.5",
"@babel/plugin-proposal-class-properties": "^7.5.0",
"@babel/plugin-proposal-decorators": "7.4.4",
"@babel/polyfill": "7.4.4",
"@babel/preset-env": "7.4.5",
"@babel/preset-typescript": "7.3.3",
"@types/jest": "24.0.11", "@types/jest": "24.0.11",
"@typescript-eslint/eslint-plugin": "1.7.0", "@typescript-eslint/eslint-plugin": "2.33.0",
"@typescript-eslint/parser": "1.7.0", "@typescript-eslint/parser": "2.33.0",
"axios": "0.18.0", "axios": "0.18.0",
"babel-loader": "8.0.6", "babel-loader": "8.0.6",
"body-parser": "1.18.3", "body-parser": "1.18.3",

4
src/web/src/index.edit.ts

@ -1,6 +1,6 @@
import { TableList } from './modules/table_list/table_list'; import { RedisEdit } from './modules/app.edit';
BI.createWidget({ BI.createWidget({
type: TableList.xtype, type: RedisEdit.xtype,
element: '#wrapper', element: '#wrapper',
}); });

2
src/web/src/less/background.less

@ -1,2 +1,2 @@
@import "../../node_modules/fineui/src/less/image.less"; @import "../../node_modules/@fui/core/src/less/image.less";
@import "./lib/background.less"; @import "./lib/background.less";

2
src/web/src/less/font.less

@ -1,4 +1,4 @@
@import "../../node_modules/fineui/src/less/resource/font.less"; @import "../../node_modules/@fui/core/src/less/resource/font.less";
@import "./lib/font.less"; @import "./lib/font.less";
.font(redis-refresh-font, @font-redis-refresh); .font(redis-refresh-font, @font-redis-refresh);

2
src/web/src/less/utils.less

@ -1 +1 @@
@import '../../node_modules/fineui/src/less/visual.less'; @import '../../node_modules/@fui/core/src/less/visual.less';

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

@ -1,5 +1,4 @@
import { shortcut, store } from '@core/core'; import { shortcut, store } from '@core/core';
import { VerticalXtype, HtapeXtype, LabelXtype, IconComboXtype, ComponentsStyleTable, ButtonXtype, IconTextValue_Combo, TextAreaEditorXtype } from 'ui';
import { TableList } from './table_list/table_list'; import { TableList } from './table_list/table_list';
import '../less/index.less'; import '../less/index.less';
import { DatabaseIndex } from './components/database_index/database_index'; import { DatabaseIndex } from './components/database_index/database_index';
@ -50,7 +49,7 @@ export class RedisDataset extends BI.Widget {
const inputType = typeof orderValue === 'string' ? 'formula' : 'int'; const inputType = typeof orderValue === 'string' ? 'formula' : 'int';
return { return {
type: HtapeXtype, type: BI.HTapeLayout.xtype,
tgap: 15, tgap: 15,
items: [{ items: [{
el: { el: {
@ -63,24 +62,24 @@ export class RedisDataset extends BI.Widget {
}, },
width: 300, width: 300,
}, { }, {
type: VerticalXtype, type: BI.VerticalLayout.xtype,
lgap: 5, lgap: 5,
bgap: 10, bgap: 10,
items: [{ items: [{
type: HtapeXtype, type: BI.HTapeLayout.xtype,
height: 22, height: 22,
items: [{ items: [{
el: { el: {
type: LabelXtype, type: BI.Label.xtype,
text: BI.i18nText('Plugin-Redis_DB_Index'), text: BI.i18nText('Plugin-Redis_DB_Index'),
textAlign: 'left', textAlign: 'left',
}, },
width: this.textWidth, width: this.textWidth,
}, { }, {
type: HtapeXtype, type: BI.HTapeLayout.xtype,
items: [{ items: [{
el: { el: {
type: IconComboXtype, type: BI.IconCombo.xtype,
height: 22, height: 22,
width: 28, width: 28,
value: inputType, value: inputType,
@ -116,18 +115,18 @@ export class RedisDataset extends BI.Widget {
}], }],
}], }],
}, { }, {
type: HtapeXtype, type: BI.HTapeLayout.xtype,
height: 200, height: 200,
rgap: 5, rgap: 5,
items: [{ items: [{
el: { el: {
type: LabelXtype, type: BI.Label.xtype,
text: BI.i18nText('Plugin-Redis_Query_Condition'), text: BI.i18nText('Plugin-Redis_Query_Condition'),
textAlign: 'left', textAlign: 'left',
}, },
width: this.textWidth, width: this.textWidth,
}, { }, {
type: TextAreaEditorXtype, type: BI.TextAreaEditor.xtype,
cls: 'bi-border', cls: 'bi-border',
height: 200, height: 200,
allowBlank: true, allowBlank: true,
@ -144,17 +143,17 @@ export class RedisDataset extends BI.Widget {
}], }],
}], }],
}, { }, {
type: HtapeXtype, type: BI.HTapeLayout.xtype,
height: 24, height: 24,
rgap: 5, rgap: 5,
items: [{ items: [{
type: LabelXtype, type: BI.Label.xtype,
height: 24, height: 24,
text: BI.i18nText('Plugin-Redis_Set_Parameter'), text: BI.i18nText('Plugin-Redis_Set_Parameter'),
textAlign: 'left', textAlign: 'left',
}, { }, {
el: { el: {
type: ButtonXtype, type: BI.Button.xtype,
text: BI.i18nText('Plugin-Redis_Refresh'), text: BI.i18nText('Plugin-Redis_Refresh'),
level: 'ignore', level: 'ignore',
handler: () => { handler: () => {
@ -167,7 +166,7 @@ export class RedisDataset extends BI.Widget {
width: 80, width: 80,
}, { }, {
el: { el: {
type: ButtonXtype, type: BI.Button.xtype,
text: BI.i18nText('Plugin-Redis_Preview'), text: BI.i18nText('Plugin-Redis_Preview'),
disabled: !BI.get(this.model, 'ableSave'), disabled: !BI.get(this.model, 'ableSave'),
handler: () => { handler: () => {
@ -180,7 +179,7 @@ export class RedisDataset extends BI.Widget {
width: 80, width: 80,
}], }],
}, { }, {
type: ComponentsStyleTable, type: BI.StyleTable.xtype,
cls: 'param-table', cls: 'param-table',
height: 200, height: 200,
columnSize: [300, 300, ''], columnSize: [300, 300, ''],
@ -198,13 +197,13 @@ export class RedisDataset extends BI.Widget {
const self = this; const self = this;
return this.model.parameters.map((item, index) => [{ return this.model.parameters.map((item, index) => [{
type: LabelXtype, type: BI.Label.xtype,
text: item.name, text: item.name,
textAlign: 'left', textAlign: 'left',
height: 30, height: 30,
lgap: 10, lgap: 10,
}, { }, {
type: IconTextValue_Combo, type: BI.IconTextValueCombo.xtype,
cls: 'field-type-change', cls: 'field-type-change',
height: 30, height: 30,
items: redisField, items: redisField,

21
src/web/src/modules/app.edit.ts

@ -1,6 +1,5 @@
import { shortcut } from '@core/core'; import { shortcut } from '@core/core';
import { POOL_CONFIG, PROXY_CONFIG, BASIC_CONFIG, CONNECT_CHARSET } from '@constants/constant'; import { POOL_CONFIG, PROXY_CONFIG, BASIC_CONFIG, CONNECT_CHARSET } from '@constants/constant';
import { VerticalXtype, TextEditorXtype, TextValueComboXtype, LeftXtype, TextButtonXtype, BarPopOverXtype, EditorXtype } from 'ui';
import { FormItem } from './components/form_item/form_item'; import { FormItem } from './components/form_item/form_item';
import { PoolEdit } from './components/pool/pool_edit'; import { PoolEdit } from './components/pool/pool_edit';
import { ProxyEdit } from './components/proxy/proxy_edit'; import { ProxyEdit } from './components/proxy/proxy_edit';
@ -43,7 +42,7 @@ export class RedisEdit extends BI.Widget {
this.oldPassword = password; this.oldPassword = password;
return { return {
type: VerticalXtype, type: BI.VerticalLayout.xtype,
hgap: 15, hgap: 15,
vgap: 10, vgap: 10,
items: [ items: [
@ -51,7 +50,7 @@ export class RedisEdit extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Host'), name: BI.i18nText('Plugin-Redis_Host'),
forms: [{ forms: [{
type: TextEditorXtype, type: BI.TextEditor.xtype,
width: 300, width: 300,
allowBlank: true, allowBlank: true,
ref: _ref => { ref: _ref => {
@ -64,7 +63,7 @@ export class RedisEdit extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Port'), name: BI.i18nText('Plugin-Redis_Port'),
forms: [{ forms: [{
type: TextEditorXtype, type: BI.TextEditor.xtype,
width: 300, width: 300,
allowBlank: true, allowBlank: true,
ref: _ref => { ref: _ref => {
@ -77,7 +76,7 @@ export class RedisEdit extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Password'), name: BI.i18nText('Plugin-Redis_Password'),
forms: [{ forms: [{
type: EditorXtype, type: BI.Editor.xtype,
cls: 'bi-border', cls: 'bi-border',
height: 20, height: 20,
width: 300, width: 300,
@ -90,17 +89,17 @@ export class RedisEdit extends BI.Widget {
}], }],
}, },
{ {
type: LeftXtype, type: BI.FloatLeftLayout.xtype,
hgap: 20, hgap: 20,
items: [ items: [
{ {
type: TextButtonXtype, type: BI.TextButton.xtype,
cls: 'bi-high-light', cls: 'bi-high-light',
text: BI.i18nText('Plugin-Redis_Pool_Config'), text: BI.i18nText('Plugin-Redis_Pool_Config'),
handler: () => { handler: () => {
const id = BI.UUID(); const id = BI.UUID();
BI.Popovers.create(id, { BI.Popovers.create(id, {
type: BarPopOverXtype, type: BI.BarPopover.xtype,
width: 500, width: 500,
height: 320, height: 320,
header: BI.i18nText('Plugin-Redis_Pool_Config'), header: BI.i18nText('Plugin-Redis_Pool_Config'),
@ -121,13 +120,13 @@ export class RedisEdit extends BI.Widget {
}, },
}, },
{ {
type: TextButtonXtype, type: BI.TextButton.xtype,
cls: 'bi-high-light', cls: 'bi-high-light',
text: BI.i18nText('Plugin-Redis_Proxy_Config'), text: BI.i18nText('Plugin-Redis_Proxy_Config'),
handler: () => { handler: () => {
const id = BI.UUID(); const id = BI.UUID();
BI.Popovers.create(id, { BI.Popovers.create(id, {
type: BarPopOverXtype, type: BI.BarPopover.xtype,
width: 650, width: 650,
height: 320, height: 320,
header: BI.i18nText('Plugin-Redis_Pool_Config'), header: BI.i18nText('Plugin-Redis_Pool_Config'),
@ -153,7 +152,7 @@ export class RedisEdit extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Connection_Form_OriginalCharsetName'), name: BI.i18nText('Plugin-Redis_Connection_Form_OriginalCharsetName'),
forms: [{ forms: [{
type: TextValueComboXtype, type: BI.TextValueCombo.xtype,
width: 300, width: 300,
value: originalCharsetName ? originalCharsetName : '', value: originalCharsetName ? originalCharsetName : '',
items: CONNECT_CHARSET, items: CONNECT_CHARSET,

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

@ -1,5 +1,4 @@
import { shortcut, store } from '@core/core'; import { shortcut, store } from '@core/core';
import { VerticalXtype, HtapeXtype, LabelXtype, IconComboXtype, TextValueComboXtype, TextAreaEditorXtype, ComponentsStyleTable, ButtonXtype, IconTextValue_Combo } from 'ui';
import { TableList } from './table_list/table_list'; import { TableList } from './table_list/table_list';
import '../less/index.less'; import '../less/index.less';
import { DatabaseIndex } from './components/database_index/database_index'; import { DatabaseIndex } from './components/database_index/database_index';
@ -52,7 +51,7 @@ export class RedisProgram extends BI.Widget {
const inputType = typeof orderValue === 'string' ? 'formula' : 'int'; const inputType = typeof orderValue === 'string' ? 'formula' : 'int';
return { return {
type: HtapeXtype, type: BI.HTapeLayout.xtype,
tgap: 15, tgap: 15,
items: [{ items: [{
el: { el: {
@ -65,24 +64,24 @@ export class RedisProgram extends BI.Widget {
}, },
width: 300, width: 300,
}, { }, {
type: VerticalXtype, type: BI.VerticalLayout.xtype,
lgap: 5, lgap: 5,
bgap: 10, bgap: 10,
items: [{ items: [{
type: HtapeXtype, type: BI.HTapeLayout.xtype,
height: 22, height: 22,
items: [{ items: [{
el: { el: {
type: LabelXtype, type: BI.Label.xtype,
text: BI.i18nText('Plugin-Redis_DB_Index'), text: BI.i18nText('Plugin-Redis_DB_Index'),
textAlign: 'left', textAlign: 'left',
}, },
width: this.textWidth, width: this.textWidth,
}, { }, {
type: HtapeXtype, type: BI.HTapeLayout.xtype,
items: [{ items: [{
el: { el: {
type: IconComboXtype, type: BI.IconCombo.xtype,
height: 22, height: 22,
width: 28, width: 28,
value: inputType, value: inputType,
@ -118,18 +117,18 @@ export class RedisProgram extends BI.Widget {
}], }],
}], }],
}, { }, {
type: HtapeXtype, type: BI.HTapeLayout.xtype,
height: 22, height: 22,
rgap: 5, rgap: 5,
items: [{ items: [{
el: { el: {
type: LabelXtype, type: BI.Label.xtype,
text: BI.i18nText('Plugin-Redis_Script_Engine_Type'), text: BI.i18nText('Plugin-Redis_Script_Engine_Type'),
textAlign: 'left', textAlign: 'left',
}, },
width: this.textWidth, width: this.textWidth,
}, { }, {
type: TextValueComboXtype, type: BI.TextValueCombo.xtype,
value: engineType, value: engineType,
ref: (_ref: any) => { ref: (_ref: any) => {
this.engineTypeSelect = _ref; this.engineTypeSelect = _ref;
@ -143,18 +142,18 @@ export class RedisProgram extends BI.Widget {
}], }],
}], }],
}, { }, {
type: HtapeXtype, type: BI.HTapeLayout.xtype,
height: 200, height: 200,
rgap: 5, rgap: 5,
items: [{ items: [{
el: { el: {
type: LabelXtype, type: BI.Label.xtype,
text: BI.i18nText('Plugin-Redis_Script_Query_Text'), text: BI.i18nText('Plugin-Redis_Script_Query_Text'),
textAlign: 'left', textAlign: 'left',
}, },
width: this.textWidth, width: this.textWidth,
}, { }, {
type: TextAreaEditorXtype, type: BI.TextAreaEditor.xtype,
cls: 'bi-border', cls: 'bi-border',
height: 200, height: 200,
allowBlank: true, allowBlank: true,
@ -171,17 +170,17 @@ export class RedisProgram extends BI.Widget {
}], }],
}], }],
}, { }, {
type: HtapeXtype, type: BI.HTapeLayout.xtype,
height: 24, height: 24,
rgap: 5, rgap: 5,
items: [{ items: [{
type: LabelXtype, type: BI.Label.xtype,
height: 24, height: 24,
text: BI.i18nText('Plugin-Redis_Set_Parameter'), text: BI.i18nText('Plugin-Redis_Set_Parameter'),
textAlign: 'left', textAlign: 'left',
}, { }, {
el: { el: {
type: ButtonXtype, type: BI.Button.xtype,
text: BI.i18nText('Plugin-Redis_Refresh'), text: BI.i18nText('Plugin-Redis_Refresh'),
level: 'ignore', level: 'ignore',
handler: () => { handler: () => {
@ -194,7 +193,7 @@ export class RedisProgram extends BI.Widget {
width: 80, width: 80,
}, { }, {
el: { el: {
type: ButtonXtype, type: BI.Button.xtype,
text: BI.i18nText('Plugin-Redis_Preview'), text: BI.i18nText('Plugin-Redis_Preview'),
disabled: !BI.get(this.model, 'ableSave'), disabled: !BI.get(this.model, 'ableSave'),
handler: () => { handler: () => {
@ -207,7 +206,7 @@ export class RedisProgram extends BI.Widget {
width: 80, width: 80,
}], }],
}, { }, {
type: ComponentsStyleTable, type: BI.StyleTable.xtype,
cls: 'param-table', cls: 'param-table',
height: 200, height: 200,
columnSize: [300, 300, ''], columnSize: [300, 300, ''],
@ -225,13 +224,13 @@ export class RedisProgram extends BI.Widget {
const self = this; const self = this;
return this.model.parameters.map((item, index) => [{ return this.model.parameters.map((item, index) => [{
type: LabelXtype, type: BI.Label.xtype,
text: item.name, text: item.name,
textAlign: 'left', textAlign: 'left',
height: 30, height: 30,
lgap: 10, lgap: 10,
}, { }, {
type: IconTextValue_Combo, type: BI.IconTextValueCombo.xtype,
cls: 'field-type-change', cls: 'field-type-change',
height: 30, height: 30,
items: redisField, items: redisField,
@ -243,7 +242,7 @@ export class RedisProgram extends BI.Widget {
}, },
}], }],
}, { }, {
type: LabelXtype, type: BI.Label.xtype,
text: item.name, text: item.name,
textAlign: 'left', textAlign: 'left',
height: 30, height: 30,

21
src/web/src/modules/app.show.ts

@ -1,5 +1,4 @@
import { shortcut } from '@core/core'; import { shortcut } from '@core/core';
import { LabelXtype, VerticalXtype, LeftXtype, TextButtonXtype, BarPopOverXtype } from 'ui';
import { FormItem } from './components/form_item/form_item'; import { FormItem } from './components/form_item/form_item';
import { PoolConfig } from './components/pool/pool'; import { PoolConfig } from './components/pool/pool';
import { ProxyConfig } from './components/proxy/proxy'; import { ProxyConfig } from './components/proxy/proxy';
@ -29,7 +28,7 @@ export class RedisShow extends BI.Widget {
const { host, port, newCharsetName } = basicConfig; const { host, port, newCharsetName } = basicConfig;
return { return {
type: VerticalXtype, type: BI.VerticalLayout.xtype,
hgap: 15, hgap: 15,
vgap: 10, vgap: 10,
items: [ items: [
@ -37,7 +36,7 @@ export class RedisShow extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Host'), name: BI.i18nText('Plugin-Redis_Host'),
forms: [{ forms: [{
type: LabelXtype, type: BI.Label.xtype,
text: host, text: host,
}], }],
}, },
@ -45,7 +44,7 @@ export class RedisShow extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Port'), name: BI.i18nText('Plugin-Redis_Port'),
forms: [{ forms: [{
type: LabelXtype, type: BI.Label.xtype,
text: port, text: port,
}], }],
}, },
@ -53,22 +52,22 @@ export class RedisShow extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Password'), name: BI.i18nText('Plugin-Redis_Password'),
forms: [{ forms: [{
type: LabelXtype, type: BI.Label.xtype,
text: '*****', text: '*****',
}], }],
}, },
{ {
type: LeftXtype, type: BI.FloatLeftLayout.xtype,
hgap: 20, hgap: 20,
items: [ items: [
{ {
type: TextButtonXtype, type: BI.TextButton.xtype,
cls: 'bi-high-light', cls: 'bi-high-light',
text: BI.i18nText('Plugin-Redis_Pool_Config'), text: BI.i18nText('Plugin-Redis_Pool_Config'),
handler: () => { handler: () => {
const id = BI.UUID(); const id = BI.UUID();
BI.Popovers.create(id, { BI.Popovers.create(id, {
type: BarPopOverXtype, type: BI.BarPopover.xtype,
width: 400, width: 400,
height: 300, height: 300,
header: BI.i18nText('Plugin-Redis_Pool_Config'), header: BI.i18nText('Plugin-Redis_Pool_Config'),
@ -81,13 +80,13 @@ export class RedisShow extends BI.Widget {
}, },
}, },
{ {
type: TextButtonXtype, type: BI.TextButton.xtype,
cls: 'bi-high-light', cls: 'bi-high-light',
text: BI.i18nText('Plugin-Redis_Proxy_Config'), text: BI.i18nText('Plugin-Redis_Proxy_Config'),
handler: () => { handler: () => {
const id = BI.UUID(); const id = BI.UUID();
BI.Popovers.create(id, { BI.Popovers.create(id, {
type: BarPopOverXtype, type: BI.BarPopover.xtype,
width: 650, width: 650,
height: 280, height: 280,
header: BI.i18nText('Plugin-Redis_Pool_Config'), header: BI.i18nText('Plugin-Redis_Pool_Config'),
@ -105,7 +104,7 @@ export class RedisShow extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Connection_Form_OriginalCharsetName'), name: BI.i18nText('Plugin-Redis_Connection_Form_OriginalCharsetName'),
forms: [{ forms: [{
type: LabelXtype, type: BI.Label.xtype,
text: newCharsetName ? newCharsetName : BI.i18nText('BI-Basic_Auto'), text: newCharsetName ? newCharsetName : BI.i18nText('BI-Basic_Auto'),
}], }],
}, },

8
src/web/src/modules/components/database_index/database_index.service.ts

@ -1,4 +1,4 @@
import { BarPopoverXtype } from 'ui'; import { FormulaOpeartingPanel } from '@fui/materials';
import { fetchFormulaConfig } from '../../crud/crud.request'; import { fetchFormulaConfig } from '../../crud/crud.request';
/** /**
@ -8,17 +8,17 @@ export function openFormulaPopover<T extends {formula: string}>(value: T, insert
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const id = BI.UUID(); const id = BI.UUID();
let formulaPane: typeof BI.FormulaOpeartingPanel; let formulaPane: FormulaOpeartingPanel;
BI.Popovers.create(id, { BI.Popovers.create(id, {
type: BarPopoverXtype, type: BI.BarPopover.xtype,
width: 900, width: 900,
height: 600, height: 600,
header: BI.i18nText('Plugin-JSON_Function_Definition'), header: BI.i18nText('Plugin-JSON_Function_Definition'),
body: { body: {
type: BI.FormulaOpeartingPanel.xtype, type: BI.FormulaOpeartingPanel.xtype,
configLoader: fetchFormulaConfig, configLoader: fetchFormulaConfig,
ref: (_ref: typeof BI.FormulaOpeartingPanel) => { ref: (_ref: FormulaOpeartingPanel) => {
formulaPane = _ref; formulaPane = _ref;
}, },
inserterType, inserterType,

7
src/web/src/modules/components/database_index/database_index.ts

@ -1,5 +1,4 @@
import { shortcut, store } from '@core/core'; import { shortcut, store } from '@core/core';
import { TabXtype, TextEditorXtype } from 'ui';
import { DatabaseIndexModel } from './database_index.model'; import { DatabaseIndexModel } from './database_index.model';
import { openFormulaPopover } from './database_index.service'; import { openFormulaPopover } from './database_index.service';
@ -26,7 +25,7 @@ export class DatabaseIndex extends BI.Widget {
this.store.setInputType(inputType); this.store.setInputType(inputType);
return { return {
type: TabXtype, type: BI.Tab.xtype,
single: true, single: true,
showIndex: this.model.inputType, showIndex: this.model.inputType,
ref: (_ref: any) => { ref: (_ref: any) => {
@ -35,7 +34,7 @@ export class DatabaseIndex extends BI.Widget {
cardCreator: (index: 'int'|'formula') => { cardCreator: (index: 'int'|'formula') => {
if (index === 'int') { if (index === 'int') {
return { return {
type: TextEditorXtype, type: BI.TextEditor.xtype,
warningTitle: '', warningTitle: '',
value: parseInt(this.model.inputValue as string, 10) || 0, value: parseInt(this.model.inputValue as string, 10) || 0,
validationChecker: (v: string) => this.checkInteger(v), validationChecker: (v: string) => this.checkInteger(v),
@ -53,7 +52,7 @@ export class DatabaseIndex extends BI.Widget {
} }
return { return {
type: TextEditorXtype, type: BI.TextEditor.xtype,
allowBlank: true, allowBlank: true,
value: this.model.inputValue, value: this.model.inputValue,
ref: (_ref: any) => { ref: (_ref: any) => {

5
src/web/src/modules/components/form_item/form_item.ts

@ -1,5 +1,4 @@
import { shortcut } from '@core/core'; import { shortcut } from '@core/core';
import { LabelXtype, LeftXtype } from 'ui';
@shortcut() @shortcut()
export class FormItem extends BI.Widget { export class FormItem extends BI.Widget {
@ -13,10 +12,10 @@ export class FormItem extends BI.Widget {
render () { render () {
return { return {
type: LeftXtype, type: BI.FloatLeftLayout.xtype,
items: [ items: [
{ {
type: LabelXtype, type: BI.Label.xtype,
cls: 'bi-font-bold', cls: 'bi-font-bold',
width: this.options.nameWidth, width: this.options.nameWidth,
textAlign: 'left', textAlign: 'left',

15
src/web/src/modules/components/pool/pool.ts

@ -1,5 +1,4 @@
import { shortcut } from '@core/core'; import { shortcut } from '@core/core';
import { LabelXtype, VerticalXtype, MultiSelectItemXtype } from 'ui';
import { POOL_CONFIG } from '@constants/constant'; import { POOL_CONFIG } from '@constants/constant';
import { FormItem } from '../form_item/form_item'; import { FormItem } from '../form_item/form_item';
@shortcut() @shortcut()
@ -16,7 +15,7 @@ export class PoolConfig extends BI.Widget {
const { maxTotal, maxWait, maxIdle, blockWhenExhausted, lifo, timeout } = this.options.poolConfig; const { maxTotal, maxWait, maxIdle, blockWhenExhausted, lifo, timeout } = this.options.poolConfig;
return { return {
type: VerticalXtype, type: BI.VerticalLayout.xtype,
hgap: 15, hgap: 15,
vgap: 10, vgap: 10,
items: [ items: [
@ -24,7 +23,7 @@ export class PoolConfig extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Pool_Max_Total'), name: BI.i18nText('Plugin-Redis_Pool_Max_Total'),
forms: [{ forms: [{
type: LabelXtype, type: BI.Label.xtype,
text: maxTotal, text: maxTotal,
}], }],
}, },
@ -32,7 +31,7 @@ export class PoolConfig extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Pool_Max_Wait'), name: BI.i18nText('Plugin-Redis_Pool_Max_Wait'),
forms: [{ forms: [{
type: LabelXtype, type: BI.Label.xtype,
text: maxWait, text: maxWait,
}], }],
}, },
@ -40,7 +39,7 @@ export class PoolConfig extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Pool_Max_Idle'), name: BI.i18nText('Plugin-Redis_Pool_Max_Idle'),
forms: [{ forms: [{
type: LabelXtype, type: BI.Label.xtype,
text: maxIdle, text: maxIdle,
}], }],
}, },
@ -48,7 +47,7 @@ export class PoolConfig extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Pool_Block_When_Exhausted'), name: BI.i18nText('Plugin-Redis_Pool_Block_When_Exhausted'),
forms: [{ forms: [{
type: MultiSelectItemXtype, type: BI.MultiSelectItem.xtype,
selected: blockWhenExhausted, selected: blockWhenExhausted,
}], }],
}, },
@ -56,7 +55,7 @@ export class PoolConfig extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Pool_Lifo'), name: BI.i18nText('Plugin-Redis_Pool_Lifo'),
forms: [{ forms: [{
type: MultiSelectItemXtype, type: BI.MultiSelectItem.xtype,
selected: lifo, selected: lifo,
}], }],
}, },
@ -64,7 +63,7 @@ export class PoolConfig extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Pool_Timeout'), name: BI.i18nText('Plugin-Redis_Pool_Timeout'),
forms: [{ forms: [{
type: LabelXtype, type: BI.Label.xtype,
text: timeout, text: timeout,
}], }],
}, },

15
src/web/src/modules/components/pool/pool_edit.ts

@ -1,5 +1,4 @@
import { shortcut, store } from '@core/core'; import { shortcut, store } from '@core/core';
import { VerticalXtype, MultiSelectItemXtype, TextEditorXtype } from 'ui';
import { POOL_CONFIG } from '@constants/constant'; import { POOL_CONFIG } from '@constants/constant';
import { FormItem } from '../form_item/form_item'; import { FormItem } from '../form_item/form_item';
import { PoolEditModel } from './pool_edit.model'; import { PoolEditModel } from './pool_edit.model';
@ -33,7 +32,7 @@ export class PoolEdit extends BI.Widget {
this.store.setLifo(lifo); this.store.setLifo(lifo);
return { return {
type: VerticalXtype, type: BI.VerticalLayout.xtype,
hgap: 15, hgap: 15,
vgap: 10, vgap: 10,
items: [ items: [
@ -41,7 +40,7 @@ export class PoolEdit extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Pool_Max_Total'), name: BI.i18nText('Plugin-Redis_Pool_Max_Total'),
forms: [{ forms: [{
type: TextEditorXtype, type: BI.TextEditor.xtype,
width: 300, width: 300,
allowBlank: true, allowBlank: true,
value: maxTotal, value: maxTotal,
@ -54,7 +53,7 @@ export class PoolEdit extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Pool_Max_Wait'), name: BI.i18nText('Plugin-Redis_Pool_Max_Wait'),
forms: [{ forms: [{
type: TextEditorXtype, type: BI.TextEditor.xtype,
width: 300, width: 300,
allowBlank: true, allowBlank: true,
value: maxWait, value: maxWait,
@ -67,7 +66,7 @@ export class PoolEdit extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Pool_Max_Idle'), name: BI.i18nText('Plugin-Redis_Pool_Max_Idle'),
forms: [{ forms: [{
type: TextEditorXtype, type: BI.TextEditor.xtype,
width: 300, width: 300,
allowBlank: true, allowBlank: true,
value: maxIdle, value: maxIdle,
@ -80,7 +79,7 @@ export class PoolEdit extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Pool_Block_When_Exhausted'), name: BI.i18nText('Plugin-Redis_Pool_Block_When_Exhausted'),
forms: [{ forms: [{
type: MultiSelectItemXtype, type: BI.MultiSelectItem.xtype,
selected: blockWhenExhausted, selected: blockWhenExhausted,
ref: (_ref: any) => { ref: (_ref: any) => {
this.form.blockWhenExhausted = _ref; this.form.blockWhenExhausted = _ref;
@ -94,7 +93,7 @@ export class PoolEdit extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Pool_Lifo'), name: BI.i18nText('Plugin-Redis_Pool_Lifo'),
forms: [{ forms: [{
type: MultiSelectItemXtype, type: BI.MultiSelectItem.xtype,
selected: lifo, selected: lifo,
ref: (_ref: any) => { ref: (_ref: any) => {
this.form.lifo = _ref; this.form.lifo = _ref;
@ -108,7 +107,7 @@ export class PoolEdit extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Pool_Timeout'), name: BI.i18nText('Plugin-Redis_Pool_Timeout'),
forms: [{ forms: [{
type: TextEditorXtype, type: BI.TextEditor.xtype,
width: 300, width: 300,
allowBlank: true, allowBlank: true,
value: timeout, value: timeout,

19
src/web/src/modules/components/proxy/proxy.ts

@ -1,5 +1,4 @@
import { shortcut } from '@core/core'; import { shortcut } from '@core/core';
import { LabelXtype, VerticalXtype, MultiSelectItemXtype, CenterAdaptXtype } from 'ui';
import { PROXY_CONFIG } from '@constants/constant'; import { PROXY_CONFIG } from '@constants/constant';
import { FormItem } from '../form_item/form_item'; import { FormItem } from '../form_item/form_item';
@shortcut() @shortcut()
@ -16,7 +15,7 @@ export class ProxyConfig extends BI.Widget {
const { open, host, port, username, password, privateKeyPath } = this.options.proxyConfig; const { open, host, port, username, password, privateKeyPath } = this.options.proxyConfig;
return { return {
type: VerticalXtype, type: BI.VerticalLayout.xtype,
hgap: 15, hgap: 15,
vgap: 10, vgap: 10,
items: [ items: [
@ -24,14 +23,14 @@ export class ProxyConfig extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Proxy_Open'), name: BI.i18nText('Plugin-Redis_Proxy_Open'),
forms: [{ forms: [{
type: CenterAdaptXtype, type: BI.CenterAdaptLayout.xtype,
items: [ items: [
{ {
type: MultiSelectItemXtype, type: BI.MultiSelectItem.xtype,
width: 30, width: 30,
selected: open, selected: open,
}, { }, {
type: LabelXtype, type: BI.Label.xtype,
text: BI.i18nText('Plugin-Redis_Proxy_Description'), text: BI.i18nText('Plugin-Redis_Proxy_Description'),
}, },
], ],
@ -41,7 +40,7 @@ export class ProxyConfig extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Proxy_Host'), name: BI.i18nText('Plugin-Redis_Proxy_Host'),
forms: [{ forms: [{
type: LabelXtype, type: BI.Label.xtype,
text: host, text: host,
}], }],
}, },
@ -49,7 +48,7 @@ export class ProxyConfig extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Proxy_Port'), name: BI.i18nText('Plugin-Redis_Proxy_Port'),
forms: [{ forms: [{
type: LabelXtype, type: BI.Label.xtype,
text: port, text: port,
}], }],
}, },
@ -57,7 +56,7 @@ export class ProxyConfig extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Proxy_Username'), name: BI.i18nText('Plugin-Redis_Proxy_Username'),
forms: [{ forms: [{
type: LabelXtype, type: BI.Label.xtype,
text: username, text: username,
}], }],
}, },
@ -65,7 +64,7 @@ export class ProxyConfig extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Proxy_Password'), name: BI.i18nText('Plugin-Redis_Proxy_Password'),
forms: [{ forms: [{
type: LabelXtype, type: BI.Label.xtype,
text: password, text: password,
}], }],
}, },
@ -73,7 +72,7 @@ export class ProxyConfig extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Proxy_Private_Key_Path'), name: BI.i18nText('Plugin-Redis_Proxy_Private_Key_Path'),
forms: [{ forms: [{
type: LabelXtype, type: BI.Label.xtype,
text: privateKeyPath, text: privateKeyPath,
}], }],
}, },

19
src/web/src/modules/components/proxy/proxy_edit.ts

@ -1,5 +1,4 @@
import { shortcut } from '@core/core'; import { shortcut } from '@core/core';
import { LabelXtype, VerticalXtype, MultiSelectItemXtype, CenterAdaptXtype, TextEditorXtype, EditorXtype } from 'ui';
import { PROXY_CONFIG } from '@constants/constant'; import { PROXY_CONFIG } from '@constants/constant';
import { FormItem } from '../form_item/form_item'; import { FormItem } from '../form_item/form_item';
@shortcut() @shortcut()
@ -30,7 +29,7 @@ export class ProxyEdit extends BI.Widget {
this.oldPassword = password; this.oldPassword = password;
return { return {
type: VerticalXtype, type: BI.VerticalLayout.xtype,
hgap: 15, hgap: 15,
vgap: 10, vgap: 10,
items: [ items: [
@ -38,17 +37,17 @@ export class ProxyEdit extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Proxy_Open'), name: BI.i18nText('Plugin-Redis_Proxy_Open'),
forms: [{ forms: [{
type: CenterAdaptXtype, type: BI.CenterAdaptLayout.xtype,
items: [ items: [
{ {
type: MultiSelectItemXtype, type: BI.MultiSelectItem.xtype,
width: 30, width: 30,
selected: this.isOpen, selected: this.isOpen,
handler: () => { handler: () => {
this.isOpen = !this.isOpen; this.isOpen = !this.isOpen;
}, },
}, { }, {
type: LabelXtype, type: BI.Label.xtype,
text: BI.i18nText('Plugin-Redis_Proxy_Description'), text: BI.i18nText('Plugin-Redis_Proxy_Description'),
}, },
], ],
@ -58,7 +57,7 @@ export class ProxyEdit extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Proxy_Host'), name: BI.i18nText('Plugin-Redis_Proxy_Host'),
forms: [{ forms: [{
type: TextEditorXtype, type: BI.TextEditor.xtype,
width: 300, width: 300,
allowBlank: true, allowBlank: true,
value: host, value: host,
@ -71,7 +70,7 @@ export class ProxyEdit extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Proxy_Port'), name: BI.i18nText('Plugin-Redis_Proxy_Port'),
forms: [{ forms: [{
type: TextEditorXtype, type: BI.TextEditor.xtype,
width: 300, width: 300,
allowBlank: true, allowBlank: true,
value: port, value: port,
@ -84,7 +83,7 @@ export class ProxyEdit extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Proxy_Username'), name: BI.i18nText('Plugin-Redis_Proxy_Username'),
forms: [{ forms: [{
type: TextEditorXtype, type: BI.TextEditor.xtype,
width: 300, width: 300,
allowBlank: true, allowBlank: true,
value: username, value: username,
@ -97,7 +96,7 @@ export class ProxyEdit extends BI.Widget {
type: FormItem.xtype, type: FormItem.xtype,
name: BI.i18nText('Plugin-Redis_Proxy_Password'), name: BI.i18nText('Plugin-Redis_Proxy_Password'),
forms: [{ forms: [{
type: EditorXtype, type: BI.Editor.xtype,
cls: 'bi-border', cls: 'bi-border',
width: 300, width: 300,
height: 20, height: 20,
@ -114,7 +113,7 @@ export class ProxyEdit extends BI.Widget {
name: BI.i18nText('Plugin-Redis_Proxy_Private_Key_Path'), name: BI.i18nText('Plugin-Redis_Proxy_Private_Key_Path'),
forms: [ forms: [
{ {
type: TextEditorXtype, type: BI.TextEditor.xtype,
width: 300, width: 300,
allowBlank: true, allowBlank: true,
value: privateKeyPath, value: privateKeyPath,

9
src/web/src/modules/table_list/list_item.ts

@ -1,5 +1,4 @@
import { shortcut } from '@core/core'; import { shortcut } from '@core/core';
import { HtapeXtype, IconLabelXtype, LabelXtype } from 'ui';
@shortcut() @shortcut()
export class ListItem extends BI.BasicButton { export class ListItem extends BI.BasicButton {
static xtype = 'dec.dcm.connection.plugin.redis.table_list.list_item' static xtype = 'dec.dcm.connection.plugin.redis.table_list.list_item'
@ -13,22 +12,22 @@ export class ListItem extends BI.BasicButton {
const { text, showIcon } = this.options; const { text, showIcon } = this.options;
if(showIcon){ if(showIcon){
return { return {
type: HtapeXtype, type: BI.HTapeLayout.xtype,
items: [{ items: [{
el: { el: {
type: IconLabelXtype, type: BI.IconLabel.xtype,
cls: 'redis-column-font', cls: 'redis-column-font',
}, },
width: 25, width: 25,
}, { }, {
type: LabelXtype, type: BI.Label.xtype,
textAlign: 'left', textAlign: 'left',
text, text,
}], }],
}; };
}else{ }else{
return { return {
type: LabelXtype, type: BI.Label.xtype,
textAlign: 'left', textAlign: 'left',
lgap: 5, lgap: 5,
text, text,

25
src/web/src/modules/table_list/table_list.ts

@ -1,5 +1,4 @@
import { shortcut, store } from '@core/core'; import { shortcut, store } from '@core/core';
import { VtapeXtype, HtapeXtype, LabelXtype, IconButtonXtype, TextValueComboXtype, ButtonXtype, TextEditorXtype, ButtonGroupXtype, VerticalXtype } from 'ui';
import { ListItem } from './list_item'; import { ListItem } from './list_item';
import { TableModelModel } from './table_list.model'; import { TableModelModel } from './table_list.model';
import { fineServletURL } from '@constants/env'; import { fineServletURL } from '@constants/env';
@ -47,14 +46,14 @@ export class TableList extends BI.Widget {
const inputType = typeof orderValue === 'string' ? 'formula' : 'int'; const inputType = typeof orderValue === 'string' ? 'formula' : 'int';
return { return {
type: VtapeXtype, type: BI.VTapeLayout.xtype,
hgap: 10, hgap: 10,
bgap: 5, bgap: 5,
items: [{ items: [{
el: { el: {
type: HtapeXtype, type: BI.HTapeLayout.xtype,
items: [{ items: [{
type: TextValueComboXtype, type: BI.TextValueCombo.xtype,
ref: (_ref: any) => { ref: (_ref: any) => {
this.connectionTextValue = _ref; this.connectionTextValue = _ref;
}, },
@ -68,7 +67,7 @@ export class TableList extends BI.Widget {
}], }],
}, { }, {
el: { el: {
type: IconButtonXtype, type: BI.IconButton.xtype,
cls: 'redis-site-font', cls: 'redis-site-font',
title: BI.i18nText('Plugin-Redis_Data_Connection'), title: BI.i18nText('Plugin-Redis_Data_Connection'),
handler: () => { handler: () => {
@ -78,7 +77,7 @@ export class TableList extends BI.Widget {
width: 25, width: 25,
}, { }, {
el: { el: {
type: IconButtonXtype, type: BI.IconButton.xtype,
cls: 'redis-refresh-font', cls: 'redis-refresh-font',
title: BI.i18nText('Plugin-Redis_Refresh'), title: BI.i18nText('Plugin-Redis_Refresh'),
handler: () => { handler: () => {
@ -91,10 +90,10 @@ export class TableList extends BI.Widget {
height: 25, height: 25,
}, { }, {
el: { el: {
type: HtapeXtype, type: BI.HTapeLayout.xtype,
items: [{ items: [{
el: { el: {
type: LabelXtype, type: BI.Label.xtype,
text: BI.i18nText('Plugin-Redis_Index'), text: BI.i18nText('Plugin-Redis_Index'),
textAlign: 'left', textAlign: 'left',
}, },
@ -109,7 +108,7 @@ export class TableList extends BI.Widget {
width: 24, width: 24,
height: 22, height: 22,
}, { }, {
type: TextEditorXtype, type: BI.TextEditor.xtype,
height: 24, height: 24,
watermark: BI.i18nText('Plugin-Redis_Keys_Pattern'), watermark: BI.i18nText('Plugin-Redis_Keys_Pattern'),
ref: (_ref: any) => { ref: (_ref: any) => {
@ -117,7 +116,7 @@ export class TableList extends BI.Widget {
}, },
}, { }, {
el: { el: {
type: ButtonXtype, type: BI.Button.xtype,
minWidth: 50, minWidth: 50,
text: BI.i18nText('Plugin-Redis_Keys_Pattern_Search'), text: BI.i18nText('Plugin-Redis_Keys_Pattern_Search'),
handler: () => { handler: () => {
@ -129,12 +128,12 @@ export class TableList extends BI.Widget {
}, },
height: 25, height: 25,
}, { }, {
type: VtapeXtype, type: BI.VTapeLayout.xtype,
items: [{ items: [{
type: ButtonGroupXtype, type: BI.ButtonGroup.xtype,
chooseType: BI.Selection.None, chooseType: BI.Selection.None,
layouts: [{ layouts: [{
type: VerticalXtype, type: BI.VerticalLayout.xtype,
}], }],
items: [], items: [],
ref: (_ref: any) => { ref: (_ref: any) => {

81
src/web/src/ui/fineui.ts

@ -1,81 +0,0 @@
export const IconXtype = 'bi.icon';
export const IconTextItemXtype = 'bi.icon_text_item';
export const IconTextIconItemXtype = 'bi.icon_text_icon_item';
export const IconButtonXtype = 'bi.icon_button';
export const IconChangeButtonXtype = 'bi.icon_change_button';
export const TextButtonXtype = 'bi.text_button';
export const DownListComboXtype = 'bi.down_list_combo';
export const LabelXtype = 'bi.label';
export const SmallTextEditorXtype = 'bi.small_text_editor';
export const MultiFileEditorXtype = 'bi.multifile_editor';
export const SignEditorXtype = 'bi.sign_editor';
export const ButtonXtype = 'bi.button';
export const TextEditorXtype = 'bi.text_editor';
export const MultiSelectInsertComboXtype = 'bi.multi_select_insert_combo';
export const MultiSelectComboXtype = 'bi.multi_select_combo';
export const ButtonGroupXtype = 'bi.button_group';
export const AllValueChooserComboXtype = 'bi.all_value_chooser_combo';
export const TextAreaEditorXtype = 'bi.textarea_editor';
export const MultiSelectItemXtype = 'bi.multi_select_item';
export const BarPopOverXtype = 'bi.bar_popover';
export const DynamicDateComboXtype = 'bi.dynamic_date_combo';
export const DynamicDateTimeComboXtype = 'bi.dynamic_date_time_combo';
export const MultiTreeComboXtype = 'bi.multi_tree_combo';
export const RichEditorXtype = 'bi.rich_editor';
export const NicEditorXtype = 'bi.nic_editor';
export const EditorXtype = 'bi.editor';
export const MultiTreePopupViewXtype = 'bi.multi_tree_popup_view';
export const SingleSelectRadioItemXtype = 'bi.single_select_radio_item';
export const SingleSelectInsertComboXtype = 'bi.single_select_insert_combo';
export const SingleSelectComboXtype = 'bi.single_select_combo';
export const TabXtype = 'bi.tab';
export const DynamicYearMonthComboXtype = 'bi.dynamic_year_month_combo';
export const TextXtype = 'bi.text';
export const ComboXtype = 'bi.combo';
export const TimeComboXtype = 'bi.time_combo';
export const IFrameXtype = 'bi.iframe';
export const MultiTreeInsertComboXtype = 'bi.multi_tree_insert_combo';
export const MultiTreeListComboXtype = 'bi.multi_tree_list_combo';
export const MultilayerSingleTreeComboXtype = 'bi.multilayer_single_tree_combo';
export const MultilayerSelectTreeComboXtype = 'bi.multilayer_select_tree_combo';
export const AsyncTreeXtype = 'bi.async_tree';
export const ListAsyncTreeXtype = 'bi.list_async_tree';
export const MultilayerSingleTreePopupXtype = 'bi.multilayer_single_tree_popup';
export const MultilayerSelectTreePopupXtype = 'bi.multilayer_select_tree_popup';
export const IconLabelXtype = 'bi.icon_label';
export const RadioXtype = 'bi.radio';
export const LinearSegmentXtype = 'bi.linear_segment';
export const SearchEditorXtype = 'bi.search_editor';
export const ImgXtype = 'bi.img';
export const BubbleComboXtype = 'bi.bubble_combo';
export const TextBubblePopupBarViewXtype = 'bi.text_bubble_bar_popup_view';
export const TextValueComboXtype = 'bi.text_value_combo';
export const FileXtype = 'bi.file';
export const IconComboXtype = 'bi.icon_combo';
export const NumberEditorXtype = 'bi.number_editor';
export const CodeEditorXtype = 'bi.code_editor';
export const ComponentsStyleTable = 'bi.components.style_table';
export const IconTextValue_Combo = 'bi.icon_text_value_combo';
export const BarPopoverXtype = 'bi.bar_popover';
// 布局
export const VerticalAdaptXtype = 'bi.vertical_adapt';
export const VtapeXtype = 'bi.vtape';
export const CenterAdaptXtype = 'bi.center_adapt';
export const HtapeXtype = 'bi.htape';
export const LayoutXtype = 'bi.layout';
export const AbsoluteXtype = 'bi.absolute';
export const VerticalXtype = 'bi.vertical';
export const LeftXtype = 'bi.left';
export const RightXtype = 'bi.right';
export const HorizontalAdaptXtype = 'bi.horizontal_adapt';
export const AbsoluteCenterAdaptXtype = 'bi.absolute_center_adapt';
export const TableAdaptXtype = 'bi.table_adapt';
export const RightVerticalAdaptXtype = 'bi.right_vertical_adapt';
export const LeftRightVerticalAdaptXtype = 'bi.left_right_vertical_adapt';
export const ListViewXtype = 'bi.list_view';
export const VirtualGroupXtype = 'bi.virtual_group';
export const HorizotalAutoXtype = 'bi.horizontal_auto';
export const HorizotalXtype = 'bi.horizontal';
export const FloatCenterXtype = 'bi.float_center';
export const LeftRightVerticalAdaptLayoutXtype = 'bi.left_right_vertical_adapt';

1
src/web/src/ui/index.ts

@ -1 +0,0 @@
export * from './fineui';

1
src/web/tsconfig.json

@ -18,6 +18,7 @@
// "noUnusedLocals": true, // "noUnusedLocals": true,
// "noUnusedParameters": true, // "noUnusedParameters": true,
// "noImplicitReturns": true, // "noImplicitReturns": true,
"skipLibCheck": true,
"noFallthroughCasesInSwitch": true, "noFallthroughCasesInSwitch": true,
"paths": { "paths": {
"ui": ["./src/ui"], "ui": ["./src/ui"],

2
src/web/types/globals.d.ts vendored

@ -2,7 +2,7 @@ interface Obj {
[key: string]: any; [key: string]: any;
} }
declare let BI: Obj & import('fineui').BI & import('fineui-materials').BI; declare let BI: Obj & import('@fui/core').BI & import('@fui/materials').BI;
declare const Fix: Obj; declare const Fix: Obj;
declare const DecCst: Obj; declare const DecCst: Obj;
declare const Dec: Obj; declare const Dec: Obj;

2
src/web/webpack/webpack.common.js

@ -49,7 +49,7 @@ module.exports = {
options: { options: {
plugins: [vars({ plugins: [vars({
variables: { variables: {
fontUrl: '../node_modules/fineui/dist/font/', fontUrl: '../node_modules/@fui/core/dist/font/',
imageUrl: '/webroot/decision/resources?path=/com/fr/web/resources/dist/images/1x', imageUrl: '/webroot/decision/resources?path=/com/fr/web/resources/dist/images/1x',
image2xUrl: '/webroot/decision/resources?path=/com/fr/web/resources/dist/images/2x', image2xUrl: '/webroot/decision/resources?path=/com/fr/web/resources/dist/images/2x',
} }

Loading…
Cancel
Save