Skip to content

I
ibzdst
提交 ebe6381f 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码 [ibz-dst，应用]

上级 568119fb
显示空白字符变更
内嵌 并排
正在显示 包含 209 行增加 和 132 行删除
app_web/src/locale/lanres/entities/dict-catalog/dict-catalog_BO_CN_base.ts
浏览文件 @ ebe6381f
......@@ -36,6 +36,7 @@ function getLocaleResourceBase(){
group1: commonLogic.appcommonhandle("字典基本信息",null),
druipart1: commonLogic.appcommonhandle("字典项",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
formpage2: commonLogic.appcommonhandle("扩展",null),
srfupdatedate: commonLogic.appcommonhandle("最后修改时间",null),
srforikey: commonLogic.appcommonhandle("",null),
srfkey: commonLogic.appcommonhandle("标识",null),
......@@ -48,6 +49,7 @@ function getLocaleResourceBase(){
cname: commonLogic.appcommonhandle("名称",null),
cgroup: commonLogic.appcommonhandle("分组",null),
memo: commonLogic.appcommonhandle("备注",null),
extparams: commonLogic.appcommonhandle("扩展参数",null),
cid: commonLogic.appcommonhandle("标识",null),
},
uiactions: {
......
app_web/src/locale/lanres/entities/dict-catalog/dict-catalog_en_US_base.ts
浏览文件 @ ebe6381f
......@@ -36,6 +36,7 @@ function getLocaleResourceBase(){
group1: commonLogic.appcommonhandle("字典基本信息",null),
druipart1: commonLogic.appcommonhandle("字典项",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
formpage2: commonLogic.appcommonhandle("扩展",null),
srfupdatedate: commonLogic.appcommonhandle("最后修改时间",null),
srforikey: commonLogic.appcommonhandle("",null),
srfkey: commonLogic.appcommonhandle("标识",null),
......@@ -48,6 +49,7 @@ function getLocaleResourceBase(){
cname: commonLogic.appcommonhandle("名称",null),
cgroup: commonLogic.appcommonhandle("分组",null),
memo: commonLogic.appcommonhandle("备注",null),
extparams: commonLogic.appcommonhandle("扩展参数",null),
cid: commonLogic.appcommonhandle("标识",null),
},
uiactions: {
......
app_web/src/locale/lanres/entities/dict-catalog/dict-catalog_zh_CN_base.ts
浏览文件 @ ebe6381f
......@@ -36,6 +36,7 @@ function getLocaleResourceBase(){
group1: commonLogic.appcommonhandle("字典基本信息",null),
druipart1: commonLogic.appcommonhandle("字典项",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
formpage2: commonLogic.appcommonhandle("扩展",null),
srfupdatedate: commonLogic.appcommonhandle("最后修改时间",null),
srforikey: commonLogic.appcommonhandle("",null),
srfkey: commonLogic.appcommonhandle("标识",null),
......@@ -48,6 +49,7 @@ function getLocaleResourceBase(){
cname: commonLogic.appcommonhandle("名称",null),
cgroup: commonLogic.appcommonhandle("分组",null),
memo: commonLogic.appcommonhandle("备注",null),
extparams: commonLogic.appcommonhandle("扩展参数",null),
cid: commonLogic.appcommonhandle("标识",null),
},
uiactions: {
......
app_web/src/locale/lanres/entities/dst-data-source/dst-data-source_BO_CN_base.ts
浏览文件 @ ebe6381f
......@@ -37,17 +37,18 @@ function getLocaleResourceBase(){
srfuf: commonLogic.appcommonhandle("",null),
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
dsid: commonLogic.appcommonhandle("标识",null),
dsname: commonLogic.appcommonhandle("数据源名称",null),
dstype: commonLogic.appcommonhandle("类型",null),
dscfg: commonLogic.appcommonhandle("配置",null),
formitem: commonLogic.appcommonhandle("说明",null),
dsid: commonLogic.appcommonhandle("标识",null),
},
uiactions: {
},
},
main_grid: {
columns: {
dsid: commonLogic.appcommonhandle("标识",null),
dsname: commonLogic.appcommonhandle("数据源名称",null),
dstype: commonLogic.appcommonhandle("类型",null),
},
......
app_web/src/locale/lanres/entities/dst-data-source/dst-data-source_en_US_base.ts
浏览文件 @ ebe6381f
......@@ -37,17 +37,18 @@ function getLocaleResourceBase(){
srfuf: commonLogic.appcommonhandle("",null),
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
dsid: commonLogic.appcommonhandle("标识",null),
dsname: commonLogic.appcommonhandle("数据源名称",null),
dstype: commonLogic.appcommonhandle("类型",null),
dscfg: commonLogic.appcommonhandle("配置",null),
formitem: commonLogic.appcommonhandle("说明",null),
dsid: commonLogic.appcommonhandle("标识",null),
},
uiactions: {
},
},
main_grid: {
columns: {
dsid: commonLogic.appcommonhandle("标识",null),
dsname: commonLogic.appcommonhandle("数据源名称",null),
dstype: commonLogic.appcommonhandle("类型",null),
},
......
app_web/src/locale/lanres/entities/dst-data-source/dst-data-source_zh_CN_base.ts
浏览文件 @ ebe6381f
......@@ -37,17 +37,18 @@ function getLocaleResourceBase(){
srfuf: commonLogic.appcommonhandle("",null),
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
dsid: commonLogic.appcommonhandle("标识",null),
dsname: commonLogic.appcommonhandle("数据源名称",null),
dstype: commonLogic.appcommonhandle("类型",null),
dscfg: commonLogic.appcommonhandle("配置",null),
formitem: commonLogic.appcommonhandle("说明",null),
dsid: commonLogic.appcommonhandle("标识",null),
},
uiactions: {
},
},
main_grid: {
columns: {
dsid: commonLogic.appcommonhandle("标识",null),
dsname: commonLogic.appcommonhandle("数据源名称",null),
dstype: commonLogic.appcommonhandle("类型",null),
},
......
app_web/src/locale/lanres/entities/meta-model/meta-model_BO_CN_base.ts
浏览文件 @ ebe6381f
......@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
},
},
gridviewtoolbar_toolbar: {
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem2: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
......
app_web/src/locale/lanres/entities/meta-model/meta-model_en_US_base.ts
浏览文件 @ ebe6381f
......@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
},
},
gridviewtoolbar_toolbar: {
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem2: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
......
app_web/src/locale/lanres/entities/meta-model/meta-model_zh_CN_base.ts
浏览文件 @ ebe6381f
......@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
},
},
gridviewtoolbar_toolbar: {
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem2: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
......
app_web/src/pages/lite/meta-model-grid-view/meta-model-grid-view-base.vue
浏览文件 @ ebe6381f
......@@ -13,18 +13,18 @@
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem1_export.visabled" :disabled="toolBarModels.tbitem1_export.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_export' }, $event)">
<i-button v-show="toolBarModels.tbitem1_import.visabled" :disabled="toolBarModels.tbitem1_import.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_import' }, $event)">
<i class=''></i>
<span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.caption')}}</span>
<span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.tip')}}</div>
<div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.tip')}}</div>
</tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem1_import.visabled" :disabled="toolBarModels.tbitem1_import.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_import' }, $event)">
<i-button v-show="toolBarModels.tbitem1_export.visabled" :disabled="toolBarModels.tbitem1_export.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_export' }, $event)">
<i class=''></i>
<span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.caption')}}</span>
<span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.tip')}}</div>
<div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.tip')}}</div>
</tooltip>
<span class='seperator'>|</span>
<tooltip :transfer="true" :max-width="600">
......@@ -384,10 +384,10 @@ export default class MetaModelGridViewBase extends Vue {
* @memberof MetaModelGridView
*/
public toolBarModels: any = {
tbitem1_export: { name: 'tbitem1_export', actiontarget: 'NONE', caption: '模型导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'export', target: 'MULTIKEY' } },
tbitem1_import: { name: 'tbitem1_import', actiontarget: 'NONE', caption: '模型导入', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'import', target: 'NONE' } },
tbitem1_export: { name: 'tbitem1_export', actiontarget: 'NONE', caption: '模型导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'export', target: 'MULTIKEY' } },
tbitem2: { name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
......@@ -764,12 +764,12 @@ export default class MetaModelGridViewBase extends Vue {
* @memberof MetaModelGridViewBase
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem1_export')) {
this.toolbar_tbitem1_export_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem1_import')) {
this.toolbar_tbitem1_import_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem1_export')) {
this.toolbar_tbitem1_export_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2);
}
......@@ -920,7 +920,7 @@ export default class MetaModelGridViewBase extends Vue {
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem1_export_click(params: any = {}, tag?: any, $event?: any) {
public toolbar_tbitem1_import_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
......@@ -938,7 +938,7 @@ export default class MetaModelGridViewBase extends Vue {
}
// 界面行为
const curUIService:MetaModelUIService = new MetaModelUIService();
curUIService.MetaModel_export(datas,contextJO, paramJO, $event, xData,this,"MetaModel");
curUIService.MetaModel_import(datas,contextJO, paramJO, $event, xData,this,"MetaModel");
}
/**
......@@ -949,7 +949,7 @@ export default class MetaModelGridViewBase extends Vue {
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem1_import_click(params: any = {}, tag?: any, $event?: any) {
public toolbar_tbitem1_export_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
......@@ -967,7 +967,7 @@ export default class MetaModelGridViewBase extends Vue {
}
// 界面行为
const curUIService:MetaModelUIService = new MetaModelUIService();
curUIService.MetaModel_import(datas,contextJO, paramJO, $event, xData,this,"MetaModel");
curUIService.MetaModel_export(datas,contextJO, paramJO, $event, xData,this,"MetaModel");
}
/**
......
app_web/src/widgets/dict-catalog/main-form/main-form-base.vue
浏览文件 @ ebe6381f
......@@ -2,6 +2,16 @@
<i-form :model="this.data" class='app-form' ref='form' id='dictcatalog_main' style="" @on-validate="formItemValidate">
<input style="display:none;" />
<row >
<tabs :animated="false" name='main' :value="detailsModel.form.activiedPage"
@on-click="detailsModel.form.clickPage($event)">
<tab-pane v-show="detailsModel.formpage1.visible" name='formpage1' :index="0" tab='main' class=''
:label="(h) =>{
return h('span',{
class:'caption'
},[
$t('entities.dictcatalog.main_form.details.formpage1')
])
}">
<i-col v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.group1.manageContainerStatus" :isManageContainer="detailsModel.group1.isManageContainer" @managecontainerclick="manageContainerClick('group1')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.dictcatalog.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<row>
......@@ -95,6 +105,26 @@
</i-col>
</tab-pane>
<tab-pane v-show="detailsModel.formpage2.visible" name='formpage2' :index="1" tab='main' class=''
:label="(h) =>{
return h('span',{
class:'caption'
},[
$t('entities.dictcatalog.main_form.details.formpage2')
])
}">
<i-col v-show="detailsModel.extparams.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='extparams' :itemRules="this.rules().extparams" class='' :caption="$t('entities.dictcatalog.main_form.details.extparams')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.extparams.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.extparams" :textareaId="this.$util.createUUID()" :disabled="detailsModel.extparams.disabled" type='textarea' textareaStyle="height:200px;" ></input-box>
</app-form-item>
</i-col>
</tab-pane>
</tabs>
</row>
</i-form>
</template>
......@@ -501,6 +531,7 @@ export default class MainBase extends Vue implements ControlInterface {
cname: null,
cgroup: null,
memo: null,
extparams: null,
cid: null,
dictcatalog:null,
};
......@@ -569,6 +600,10 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: this.detailsModel.memo.required, type: 'string', message: '备注 值不能为空', trigger: 'change' },
{ required: this.detailsModel.memo.required, type: 'string', message: '备注 值不能为空', trigger: 'blur' },
],
extparams: [
{ required: this.detailsModel.extparams.required, type: 'string', message: '扩展参数 值不能为空', trigger: 'change' },
{ required: this.detailsModel.extparams.required, type: 'string', message: '扩展参数 值不能为空', trigger: 'blur' },
],
}
}
......@@ -681,6 +716,8 @@ export default class MainBase extends Vue implements ControlInterface {
druipart1: new FormDRUIPartModel({ caption: '字典项', detailType: 'DRUIPART', name: 'druipart1', visible: true, isShowCaption: true, form: this, isControlledContent: false })
,
formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, isControlledContent: false })
,
formpage2: new FormPageModel({ caption: '扩展', detailType: 'FORMPAGE', name: 'formpage2', visible: true, isShowCaption: true, form: this, isControlledContent: false })
,
srfupdatedate: new FormItemModel({ caption: '最后修改时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
......@@ -705,9 +742,12 @@ export default class MainBase extends Vue implements ControlInterface {
cgroup: new FormItemModel({ caption: '分组', detailType: 'FORMITEM', name: 'cgroup', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
memo: new FormItemModel({ caption: '备注', detailType: 'FORMITEM', name: 'memo', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
extparams: new FormItemModel({ caption: '扩展参数', detailType: 'FORMITEM', name: 'extparams', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
cid: new FormItemModel({ caption: '标识', detailType: 'FORMITEM', name: 'cid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
form: new FormTabPanelModel({ caption: 'form', detailType: 'TABPANEL', name: 'form', visible: true, isShowCaption: true, form: this, tabPages: [{ name: 'formpage1', index: 0, visible: true }, { name: 'formpage2', index: 1, visible: true }] }),
};
/**
......@@ -854,6 +894,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'memo', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 extparams 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.extparams')
onExtparamsChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'extparams', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 cid 值
*
......@@ -936,6 +988,8 @@ export default class MainBase extends Vue implements ControlInterface {
}
/**
......
app_web/src/widgets/dict-catalog/main-form/main-form-model.ts
浏览文件 @ ebe6381f
......@@ -75,6 +75,11 @@ export default class MainModel {
prop: 'memo',
dataType: 'TEXT',
},
{
name: 'extparams',
prop: 'ext_params',
dataType: 'LONGTEXT',
},
{
name: 'cid',
prop: 'id',
......
app_web/src/widgets/dst-data-source/main-form/main-form-base.vue
浏览文件 @ ebe6381f
......@@ -5,7 +5,21 @@
<i-col v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.group1.manageContainerStatus" :isManageContainer="detailsModel.group1.isManageContainer" @managecontainerclick="manageContainerClick('group1')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.dstdatasource.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<row>
<i-col v-show="detailsModel.dsname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<i-col v-show="detailsModel.dsid.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='dsid' :itemRules="this.rules().dsid" class='' :caption="$t('entities.dstdatasource.main_form.details.dsid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.dsid.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.dsid"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.dsid.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.dsname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='dsname' :itemRules="this.rules().dsname" class='' :caption="$t('entities.dstdatasource.main_form.details.dsname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.dsname.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.dsname"
......@@ -231,7 +245,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @type {string}
* @memberof MainBase
*/
public formKeyItemName: string = '';
public formKeyItemName: string = 'dsid';
/**
* 是否自动加载
......@@ -467,11 +481,11 @@ export default class MainBase extends Vue implements ControlInterface {
srfuf: null,
srfdeid: null,
srfsourcekey: null,
dsid: null,
dsname: null,
dstype: null,
dscfg: null,
formitem: null,
dsid: null,
dstdatasource:null,
};
......@@ -523,6 +537,10 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public rules() :any {
return {
dsid: [
{ required: this.detailsModel.dsid.required, type: 'string', message: '标识 值不能为空', trigger: 'change' },
{ required: this.detailsModel.dsid.required, type: 'string', message: '标识 值不能为空', trigger: 'blur' },
],
dsname: [
{ required: this.detailsModel.dsname.required, type: 'string', message: '数据源名称 值不能为空', trigger: 'change' },
{ required: this.detailsModel.dsname.required, type: 'string', message: '数据源名称 值不能为空', trigger: 'blur' },
......@@ -663,6 +681,8 @@ export default class MainBase extends Vue implements ControlInterface {
srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
dsid: new FormItemModel({ caption: '标识', detailType: 'FORMITEM', name: 'dsid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 1 })
,
dsname: new FormItemModel({ caption: '数据源名称', detailType: 'FORMITEM', name: 'dsname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
,
......@@ -671,8 +691,6 @@ export default class MainBase extends Vue implements ControlInterface {
dscfg: new FormItemModel({ caption: '配置', detailType: 'FORMITEM', name: 'dscfg', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
formitem: new FormItemModel({ caption: '说明', detailType: 'FORMITEM', name: 'formitem', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
dsid: new FormItemModel({ caption: '标识', detailType: 'FORMITEM', name: 'dsid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
};
......@@ -760,6 +778,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'srfsourcekey', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 dsid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.dsid')
onDsidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'dsid', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 dsname 值
*
......@@ -808,18 +838,6 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'formitem', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 dsid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.dsid')
onDsidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'dsid', newVal: newVal, oldVal: oldVal });
}
/**
* 显示更多模式切换操作
......@@ -1352,6 +1370,7 @@ export default class MainBase extends Vue implements ControlInterface {
const data = response.data;
this.resetDraftFormStates();
this.onFormLoad(data,'loadDraft');
this.data.dsid = null;
data.dstdatasource = null;
this.$emit('load', data);
this.$nextTick(() => {
......
app_web/src/widgets/dst-data-source/main-form/main-form-model.ts
浏览文件 @ ebe6381f
......@@ -50,6 +50,11 @@ export default class MainModel {
{
name: 'srfsourcekey',
},
{
name: 'dsid',
prop: 'ds_id',
dataType: 'TEXT',
},
{
name: 'dsname',
prop: 'ds_name',
......@@ -69,11 +74,6 @@ export default class MainModel {
name: 'formitem',
dataType:'FORMITEM',
},
{
name: 'dsid',
prop: 'ds_id',
dataType: 'TEXT',
},
{
name: 'dstdatasource',
prop: 'ds_id',
......
app_web/src/widgets/dst-data-source/main-form/main-form-service.ts
浏览文件 @ ebe6381f
......@@ -172,6 +172,7 @@ export default class MainService extends ControlService {
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean,isWorkflow?:boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data);
Object.assign(Data,{ds_id: data.dsid, srffrontuf: '1'});
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
......
app_web/src/widgets/dst-data-source/main-grid/main-grid-base.vue
浏览文件 @ ebe6381f
......@@ -22,6 +22,18 @@
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('dsid')">
<el-table-column show-overflow-tooltip :prop="'dsid'" :label="$t('entities.dstdatasource.main_grid.columns.dsid')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.dstdatasource.main_grid.columns.dsid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.dsid}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('dsname')">
<el-table-column show-overflow-tooltip :prop="'dsname'" :label="$t('entities.dstdatasource.main_grid.columns.dsname')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
......@@ -603,6 +615,15 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public allColumns: any[] = [
{
name: 'dsid',
label: '标识',
langtag: 'entities.dstdatasource.main_grid.columns.dsid',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'dsname',
label: '数据源名称',
......@@ -1320,7 +1341,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['dsname','dstype'];
let allColumns:Array<any> = ['dsid','dsname','dstype'];
if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1400,6 +1421,7 @@ export default class MainBase extends Vue implements ControlInterface {
const tree: any ={
groupById: Number((i+1)*100),
group: group.label,
dsid:'',
dsname:'',
dstype:'',
children: children
......@@ -1428,6 +1450,7 @@ export default class MainBase extends Vue implements ControlInterface {
const Tree: any = {
groupById: Number((allGroup.length+1)*100),
group: this.$t('app.gridpage.other'),
dsid:'',
dsname:'',
dstype:'',
children: child
......@@ -1476,6 +1499,7 @@ export default class MainBase extends Vue implements ControlInterface {
const tree: any ={
groupById: Number((groupIndex+1)*100),
group: group,
dsid:'',
dsname:'',
dstype:'',
children: children,
......@@ -1907,10 +1931,16 @@ export default class MainBase extends Vue implements ControlInterface {
});
}
} else if(Object.is(errorMessage[index].data.errorKey, 'DuplicateKeyException')){
let name: string = this.service.getNameByProp("dsid");
if(name){
let desc: any = this.allColumns.find((column: any) =>{
return Object.is(column.name, name);
});
this.$Notice.error({
title: (this.$t('app.commonWords.saveFailed') as string),
desc: errorMessage[index].data.message?errorMessage[index].data.message:(this.$t('app.commonWords.sysException') as string),
title: (this.$t('app.commonWords.createFailed') as string),
desc: (desc ? desc.label : '') + " : " + item[name] + (this.$t('app.commonWords.isExist') as string) + '!',
});
}
}else {
this.$Notice.error({
title: (this.$t('app.commonWords.saveFailed') as string),
......@@ -2019,6 +2049,7 @@ export default class MainBase extends Vue implements ControlInterface {
return;
}
let tempContext: any = this.$util.deepCopy(this.context);
Object.is(tempContext, { dstdatasource: data.dsid });
const arg: any = JSON.parse(JSON.stringify(data));
Object.assign(arg,{viewparams:this.viewparams});
const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(tempContext)),arg, showloading);
......
app_web/src/widgets/dst-data-source/main-grid/main-grid-model.ts
浏览文件 @ ebe6381f
......@@ -36,6 +36,11 @@ export default class MainModel {
prop: 'ds_name',
dataType: 'TEXT',
},
{
name: 'dsid',
prop: 'ds_id',
dataType: 'TEXT',
},
{
name: 'srfmajortext',
prop: 'ds_name',
......
config.xml
浏览文件 @ ebe6381f
......@@ -37,12 +37,6 @@
git clone -b master $para2 ibzdst/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzdst/
mvn clean package -Papi
mvn install -Papi
cd ibzdst-provider/ibzdst-provider-api
mvn -Papi docker:build
mvn -Papi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzdst-provider-api.yaml ibzlab-rt --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
ibzdst-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ ebe6381f
......@@ -4,7 +4,7 @@
<!--输出实体[DA_BUILD]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_build-2-1">
<changeSet author="root" id="tab-da_build-2-1">
<createTable tableName="IBZDABUILD">
<column name="BUILDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_BUILD_BUILDID"/>
......@@ -32,7 +32,7 @@
<!--输出实体[DA_CHART]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_chart-2-2">
<changeSet author="root" id="tab-da_chart-2-2">
<createTable tableName="IBZDACHART">
<column name="CHARTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_CHART_CHARTID"/>
......@@ -54,7 +54,7 @@
<!--输出实体[DA_METRIC]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_metric-24-3">
<changeSet author="root" id="tab-da_metric-24-3">
<createTable tableName="IBZDAMETRIC">
<column name="DA_METRICID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_METRIC_DA_METRICID"/>
......@@ -82,7 +82,7 @@
<!--输出实体[DA_REPORT]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_report-16-4">
<changeSet author="root" id="tab-da_report-16-4">
<createTable tableName="IBZDAREPORT">
<column name="REPORTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_REPORT_REPORTID"/>
......@@ -102,7 +102,7 @@
<!--输出实体[DICT_CATALOG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dict_catalog-7-5">
<changeSet author="root" id="tab-dict_catalog-8-5">
<createTable tableName="IBZDICTCATALOG">
<column name="CID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DICT_CATALOG_CID"/>
......@@ -128,7 +128,7 @@
<!--输出实体[DICT_OPTION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dict_option-8-6">
<changeSet author="root" id="tab-dict_option-8-6">
<createTable tableName="IBZDICTOPTION">
<column name="VKEY" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DICT_OPTION_VKEY"/>
......@@ -168,7 +168,7 @@
<!--输出实体[DST_DATASOURCE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_datasource-7-7">
<changeSet author="root" id="tab-dst_datasource-9-7">
<createTable tableName="IBZDATASOURCE">
<column name="DSID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_DATASOURCE_DSID"/>
......@@ -184,7 +184,7 @@
<!--输出实体[DST_SYSTEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_system-1-8">
<changeSet author="root" id="tab-dst_system-1-8">
<createTable tableName="IBZPSSYSTEM">
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_SYSTEM_PSSYSTEMID"/>
......@@ -204,7 +204,7 @@
<!--输出实体[RU_EXECLOG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ru_execlog-1-9">
<changeSet author="root" id="tab-ru_execlog-1-9">
<createTable tableName="IBZRULELOG">
<column name="RU_EXECLOGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_EXECLOG_RU_EXECLOGID"/>
......@@ -234,7 +234,7 @@
<!--输出实体[RU_EXECRESULT]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ru_execresult-1-10">
<changeSet author="root" id="tab-ru_execresult-1-10">
<createTable tableName="IBZRULERESULT">
<column name="RU_EXECRESULTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_EXECRESULT_RU_EXECRESULT"/>
......@@ -274,7 +274,7 @@
<!--输出实体[META_DATASET]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_dataset-1-11">
<changeSet author="root" id="tab-meta_dataset-1-11">
<createTable tableName="IBZDATASET">
<column name="DATASETID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
......@@ -296,7 +296,7 @@
<!--输出实体[META_ENTITY]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_entity-5-12">
<changeSet author="root" id="tab-meta_entity-5-12">
<createTable tableName="IBZENTITY">
<column name="ENTITYID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
......@@ -328,7 +328,7 @@
<!--输出实体[META_FIELD]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_field-11-13">
<changeSet author="root" id="tab-meta_field-11-13">
<createTable tableName="IBZFIELD">
<column name="FIELDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
......@@ -392,7 +392,7 @@
<!--输出实体[META_MODEL]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_model-1-14">
<changeSet author="root" id="tab-meta_model-1-14">
<createTable tableName="IBZMODEL">
<column name="MODELID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>
......@@ -418,7 +418,7 @@
<!--输出实体[META_MODULE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_module-1-15">
<changeSet author="root" id="tab-meta_module-1-15">
<createTable tableName="IBZMODULE">
<column name="MODULEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_MODULE_MODULEID"/>
......@@ -436,7 +436,7 @@
<!--输出实体[META_RELATION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_relation-10-16">
<changeSet author="root" id="tab-meta_relation-10-16">
<createTable tableName="IBZRELATION">
<column name="RELATIONID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>
......@@ -468,7 +468,7 @@
<!--输出实体[RU_ENGINE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ru_engine-1-17">
<changeSet author="root" id="tab-ru_engine-1-17">
<createTable tableName="IBZRULEENGINE">
<column name="ENGINEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_ENGINE_ENGINEID"/>
......@@ -496,7 +496,7 @@
<!--输出实体[RU_ITEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ru_item-13-18">
<changeSet author="root" id="tab-ru_item-13-18">
<createTable tableName="IBZRULE">
<column name="RULEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_ITEM_RULEID"/>
......@@ -532,7 +532,7 @@
<!--输出实体[ETL_TABLE_SYNC]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-etl_table_sync-81-19">
<changeSet author="root" id="tab-etl_table_sync-81-19">
<createTable tableName="IBZTABLESYNC">
<column name="SYNCID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_ETL_TABLE_SYNC_SYNCID"/>
......@@ -587,13 +587,13 @@
<!--输出实体[DA_BUILD]外键关系 -->
<!--输出实体[DA_CHART]外键关系 -->
<!--输出实体[DA_METRIC]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-da_metric-24-20">
<changeSet author="root" id="fk-da_metric-24-20">
<addForeignKeyConstraint baseColumnNames="BUILDID" baseTableName="IBZDAMETRIC" constraintName="DER1N_DA_METRIC_DA_BUILD_BUILD" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="BUILDID" referencedTableName="IBZDABUILD" validate="true"/>
</changeSet>
<!--输出实体[DA_REPORT]外键关系 -->
<!--输出实体[DICT_CATALOG]外键关系 -->
<!--输出实体[DICT_OPTION]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-dict_option-8-21">
<changeSet author="root" id="fk-dict_option-8-21">
<addForeignKeyConstraint baseColumnNames="CID" baseTableName="IBZDICTOPTION" constraintName="DER1N_DICT_OPTION_DICT_CATALOG" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CID" referencedTableName="IBZDICTCATALOG" validate="true"/>
</changeSet>
<!--输出实体[DST_DATASOURCE]外键关系 -->
......
ibzdst-provider/ibzdst-provider-api/src/main/docker/Dockerfile
浏览文件 @ ebe6381f
......@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /ibzdst-provider-api.jar
EXPOSE 40011
EXPOSE 8081
ADD ibzdst-provider-api.jar /ibzdst-provider-api.jar
ibzdst-provider/ibzdst-provider-api/src/main/docker/ibzdst-provider-api-k8s.yaml
浏览文件 @ ebe6381f
......@@ -22,34 +22,7 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-provider-api:latest
imagePullPolicy: Always
ports:
- containerPort: 40011
env:
- name: SPRING_CLOUD_NACOS_DISCOVERY_IP
value: "172.16.180.237"
- name: SERVER_PORT
value: "40011"
- name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
value: "172.16.100.243:8848"
- name: SPRING_REDIS_HOST
value: "172.16.100.243"
- name: SPRING_REDIS_PORT
value: "6379"
- name: SPRING_REDIS_DATABASE
value: "0"
- name: SPRING_DATASOURCE_USERNAME
value: "a_A_5d9d78509"
- name: SPRING_DATASOURCE_PASSWORD
value: "@6dEfb3@"
- name: SPRING_DATASOURCE_URL
value: "jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true&serverTimezone=GMT%2B8"
- name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
value: "com.mysql.jdbc.Driver"
- name: SPRING_DATASOURCE_DEFAULTSCHEMA
value: "a_A_5d9d78509"
- name: NACOS
value: "172.16.100.243:8848"
- name: SPRING_CLOUD_NACOS_DISCOVERY_GROUP
value: "ibizdev"
- containerPort: 8081
volumeMounts:
- name: data
mountPath: /app/file
......@@ -69,9 +42,9 @@ spec:
type: NodePort
ports:
- name: http
port: 40011
targetPort: 40011
nodePort: 40011
port: 8081
targetPort: 8081
nodePort: 8081
protocol: TCP
selector:
app: ibzdst-provider-api
......
ibzdst-provider/ibzdst-provider-api/src/main/docker/ibzdst-provider-api.yaml
浏览文件 @ ebe6381f
......@@ -3,23 +3,9 @@ services:
ibzdst-provider-api:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-provider-api:latest
ports:
- "40011:40011"
- "8081:8081"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=40011
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
- SPRING_DATASOURCE_PASSWORD=@6dEfb3@
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true&serverTimezone=GMT%2B8
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
- NACOS=172.16.100.243:8848
- SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
deploy:
resources:
limits:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或