Skip to content

I
ibzlite
提交 67cca046 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

zoo457790531 发布系统代码 [ibz-lite，应用]

上级 a924cef5
隐藏空白字符变更
内嵌 并排
正在显示 包含 140 行增加 和 65 行删除
app_web/public/assets/json/data-dictionary.json
浏览文件 @ 67cca046
......@@ -76,6 +76,37 @@
"appdedataset":"FetchDefault",
"items": []
},
{
"srfkey": "DynamicModelStatus",
"emptytext": "未定义",
"codelisttype":"static",
"items": [
{
"id": "0",
"label": "未激活",
"text": "未激活",
"class":"",
"data":"",
"codename":"Item_0",
"color": "rgba(245, 158, 18, 1)",
"value": "0",
"disabled": false
}
, {
"id": "1",
"label": "已激活",
"text": "已激活",
"class":"",
"data":"",
"codename":"Item_1",
"color": "rgba(100, 235, 22, 1)",
"value": "1",
"disabled": false
}
]
},
{
"srfkey": "AppType",
"emptytext": "未定义",
......
app_web/src/locale/lanres/codelist/codelist_BO_CN_base.ts
浏览文件 @ 67cca046
......@@ -16,6 +16,11 @@ function getLocaleResourceBase(){
DstAppList: {
"empty": commonLogic.appcommonhandle("",null),
},
DynamicModelStatus: {
"0": commonLogic.appcommonhandle("未激活",null),
"1": commonLogic.appcommonhandle("已激活",null),
"empty": commonLogic.appcommonhandle("",null)
},
AppType: {
"INNER": commonLogic.appcommonhandle("内置应用",null),
"THIRD-PARTY": commonLogic.appcommonhandle("第三方应用",null),
......
app_web/src/locale/lanres/codelist/codelist_en_US_base.ts
浏览文件 @ 67cca046
......@@ -16,6 +16,11 @@ function getLocaleResourceBase(){
DstAppList: {
"empty": commonLogic.appcommonhandle("",null),
},
DynamicModelStatus: {
"0": commonLogic.appcommonhandle("未激活",null),
"1": commonLogic.appcommonhandle("已激活",null),
"empty": commonLogic.appcommonhandle("",null)
},
AppType: {
"INNER": commonLogic.appcommonhandle("内置应用",null),
"THIRD-PARTY": commonLogic.appcommonhandle("第三方应用",null),
......
app_web/src/locale/lanres/codelist/codelist_zh_CN_base.ts
浏览文件 @ 67cca046
......@@ -16,6 +16,11 @@ function getLocaleResourceBase(){
DstAppList: {
"empty": commonLogic.appcommonhandle("",null),
},
DynamicModelStatus: {
"0": commonLogic.appcommonhandle("未激活",null),
"1": commonLogic.appcommonhandle("已激活",null),
"empty": commonLogic.appcommonhandle("",null),
},
AppType: {
"INNER": commonLogic.appcommonhandle("内置应用",null),
"THIRD-PARTY": commonLogic.appcommonhandle("第三方应用",null),
......
app_web/src/locale/lanres/entities/meta-dynamic-model/meta-dynamic-model_BO_CN_base.ts
浏览文件 @ 67cca046
......@@ -27,8 +27,6 @@ function getLocaleResourceBase(){
tabpanel1: commonLogic.appcommonhandle("",null),
group1: commonLogic.appcommonhandle("动态模型基本信息",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
group2: commonLogic.appcommonhandle("操作信息",null),
formpage2: commonLogic.appcommonhandle("其它",null),
srforikey: commonLogic.appcommonhandle("",null),
srfkey: commonLogic.appcommonhandle("ID",null),
srfmajortext: commonLogic.appcommonhandle("名称",null),
......@@ -49,6 +47,7 @@ function getLocaleResourceBase(){
configname: commonLogic.appcommonhandle("名称",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
status: commonLogic.appcommonhandle("状态",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......
app_web/src/locale/lanres/entities/meta-dynamic-model/meta-dynamic-model_en_US_base.ts
浏览文件 @ 67cca046
......@@ -27,8 +27,6 @@ function getLocaleResourceBase(){
tabpanel1: commonLogic.appcommonhandle("",null),
group1: commonLogic.appcommonhandle("动态模型基本信息",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
group2: commonLogic.appcommonhandle("操作信息",null),
formpage2: commonLogic.appcommonhandle("其它",null),
srforikey: commonLogic.appcommonhandle("",null),
srfkey: commonLogic.appcommonhandle("ID",null),
srfmajortext: commonLogic.appcommonhandle("名称",null),
......@@ -49,6 +47,7 @@ function getLocaleResourceBase(){
configname: commonLogic.appcommonhandle("名称",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
status: commonLogic.appcommonhandle("状态",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......
app_web/src/locale/lanres/entities/meta-dynamic-model/meta-dynamic-model_zh_CN_base.ts
浏览文件 @ 67cca046
......@@ -27,8 +27,6 @@ function getLocaleResourceBase(){
tabpanel1: commonLogic.appcommonhandle("",null),
group1: commonLogic.appcommonhandle("动态模型基本信息",null),
formpage1: commonLogic.appcommonhandle("基本信息",null),
group2: commonLogic.appcommonhandle("操作信息",null),
formpage2: commonLogic.appcommonhandle("其它",null),
srforikey: commonLogic.appcommonhandle("",null),
srfkey: commonLogic.appcommonhandle("ID",null),
srfmajortext: commonLogic.appcommonhandle("名称",null),
......@@ -49,6 +47,7 @@ function getLocaleResourceBase(){
configname: commonLogic.appcommonhandle("名称",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
status: commonLogic.appcommonhandle("状态",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......
app_web/src/mock/codelist/codelist.ts
浏览文件 @ 67cca046
......@@ -84,6 +84,37 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
"appdedataset":"FetchDefault",
"items": []
},
{
srfkey: "DynamicModelStatus",
emptytext: "未定义",
"codelisttype":"static",
items: [
{
id: "0",
label: "未激活",
text: "未激活",
"class":"",
"data":"",
"codename":"Item_0",
"color": "rgba(245, 158, 18, 1)",
value: "0",
disabled: false,
},
{
id: "1",
label: "已激活",
text: "已激活",
"class":"",
"data":"",
"codename":"Item_1",
"color": "rgba(100, 235, 22, 1)",
value: "1",
disabled: false,
},
]
},
{
srfkey: "AppType",
emptytext: "未定义",
......
app_web/src/widgets/meta-dynamic-model/main-form/main-form-base.vue
浏览文件 @ 67cca046
......@@ -2,17 +2,7 @@
<i-form :model="this.data" class='app-form' ref='form' id='metadynamicmodel_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.metadynamicmodel.main_form.details.formpage1')
])
}">
<i-col v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<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.metadynamicmodel.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<row>
<i-col v-show="detailsModel.configname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
......@@ -74,27 +64,6 @@
</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.metadynamicmodel.main_form.details.formpage2')
])
}">
<i-col v-show="detailsModel.group2.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group :uiService="appUIService" :data="transformData(data)" :manageContainerStatus="detailsModel.group2.manageContainerStatus" :isManageContainer="detailsModel.group2.isManageContainer" @managecontainerclick="manageContainerClick('group2')" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.metadynamicmodel.main_form.details.group2')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<row>
</row>
</app-form-group>
</i-col>
</tab-pane>
</tabs>
</row>
</i-form>
</template>
......@@ -672,10 +641,6 @@ export default class MainBase extends Vue implements ControlInterface {
group1: new FormGroupPanelModel({ caption: '动态模型基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.metadynamicmodel.main_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: [] })
,
formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, isControlledContent: false })
,
group2: new FormGroupPanelModel({ caption: '操作信息', detailType: 'GROUPPANEL', name: 'group2', visible: true, isShowCaption: true, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.metadynamicmodel.main_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: [] })
,
formpage2: new FormPageModel({ caption: '其它', detailType: 'FORMPAGE', name: 'formpage2', visible: true, isShowCaption: true, form: this, isControlledContent: false })
,
srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
......@@ -697,7 +662,6 @@ export default class MainBase extends Vue implements ControlInterface {
,
configid: new FormItemModel({ caption: 'ID', detailType: 'FORMITEM', name: 'configid', 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 }] }),
};
/**
......@@ -888,8 +852,6 @@ export default class MainBase extends Vue implements ControlInterface {
}
/**
......
app_web/src/widgets/meta-dynamic-model/main-grid/main-grid-base.vue
浏览文件 @ 67cca046
......@@ -70,6 +70,20 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('status')">
<el-table-column show-overflow-tooltip :prop="'status'" :label="$t('entities.metadynamicmodel.main_grid.columns.status')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.metadynamicmodel.main_grid.columns.status')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.status" tag='DynamicModelStatus' codelistType='STATIC' ></codelist>
</template>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState">
<el-table-column></el-table-column>
</template>
......@@ -663,6 +677,15 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'status',
label: '状态',
langtag: 'entities.metadynamicmodel.main_grid.columns.status',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
]
/**
......@@ -1153,6 +1176,14 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public async formatExcelData(filterVal:any, jsonData:any) {
let codelistColumns:Array<any> = [
{
name: 'status',
srfkey: 'DynamicModelStatus',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
];
let _this = this;
for (const codelist of codelistColumns) {
......@@ -1359,7 +1390,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['configid','configname','systemid','dynainstid'];
let allColumns:Array<any> = ['configid','configname','systemid','dynainstid','status'];
if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1443,6 +1474,7 @@ export default class MainBase extends Vue implements ControlInterface {
configname:'',
systemid:'',
dynainstid:'',
status:'',
children: children
}
groupTree.push(tree);
......@@ -1473,6 +1505,7 @@ export default class MainBase extends Vue implements ControlInterface {
configname:'',
systemid:'',
dynainstid:'',
status:'',
children: child
}
if(child && child.length > 0){
......@@ -1523,6 +1556,7 @@ export default class MainBase extends Vue implements ControlInterface {
configname:'',
systemid:'',
dynainstid:'',
status:'',
children: children,
}
groupTree.push(tree);
......
app_web/src/widgets/meta-dynamic-model/main-grid/main-grid-model.ts
浏览文件 @ 67cca046
......@@ -36,6 +36,11 @@ export default class MainModel {
prop: 'system_id',
dataType: 'PICKUP',
},
{
name: 'status',
prop: 'status',
dataType: 'SSCODELIST',
},
{
name: 'configid',
prop: 'configid',
......
ibzlite-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 67cca046
......@@ -4,7 +4,7 @@
<!--输出实体[BLADE_VISUAL]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-blade_visual-55-1">
<changeSet author="root" id="tab-blade_visual-55-1">
<createTable tableName="blade_visual">
<column name="ID" remarks="" type="BIGINT">
<constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_ID"/>
......@@ -36,7 +36,7 @@
<!--输出实体[BLADE_VISUAL_CATEGORY]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-blade_visual_category-23-2">
<changeSet author="root" id="tab-blade_visual_category-23-2">
<createTable tableName="blade_visual_category">
<column name="ID" remarks="" type="BIGINT">
<constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CATEGORY_ID"/>
......@@ -52,7 +52,7 @@
<!--输出实体[BLADE_VISUAL_CONFIG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-blade_visual_config-18-3">
<changeSet author="root" id="tab-blade_visual_config-18-3">
<createTable tableName="blade_visual_config">
<column name="ID" remarks="" type="BIGINT">
<constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CONFIG_ID"/>
......@@ -68,7 +68,7 @@
<!--输出实体[BLADE_VISUAL_MAP]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-blade_visual_map-18-4">
<changeSet author="root" id="tab-blade_visual_map-18-4">
<createTable tableName="blade_visual_map">
<column name="ID" remarks="" type="BIGINT">
<constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_MAP_ID"/>
......@@ -86,7 +86,7 @@
<!--输出实体[DST_COMPONENT]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_component-59-5">
<changeSet author="root" id="tab-dst_component-59-5">
<createTable tableName="IBZCOMPONENT">
<column name="CID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_COMPONENT_CID"/>
......@@ -112,7 +112,7 @@
<!--输出实体[DST_CONFIG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_config-32-6">
<changeSet author="root" id="tab-dst_config-32-6">
<createTable tableName="IBZCFG">
<column name="CFGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_CONFIG_CFGID"/>
......@@ -134,7 +134,7 @@
<!--输出实体[DST_DATASOURCE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_datasource-75-7">
<changeSet author="root" id="tab-dst_datasource-75-7">
<createTable tableName="IBZDATASOURCE">
<column name="DSID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_DATASOURCE_DSID"/>
......@@ -152,7 +152,7 @@
<!--输出实体[DST_ROUTER]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_router-37-8">
<changeSet author="root" id="tab-dst_router-37-8">
<createTable tableName="IBZROUTER">
<column name="ROUTERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_ROUTER_ROUTERID"/>
......@@ -178,7 +178,7 @@
<!--输出实体[DST_SYSTEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_system-45-9">
<changeSet author="root" id="tab-dst_system-45-9">
<createTable tableName="IBZPSSYSTEM">
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_SYSTEM_PSSYSTEMID"/>
......@@ -198,7 +198,7 @@
<!--输出实体[DST_VIEW]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_view-46-10">
<changeSet author="root" id="tab-dst_view-46-10">
<createTable tableName="IBZVIEW">
<column name="VIEWID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_VIEW_VIEWID"/>
......@@ -222,7 +222,7 @@
<!--输出实体[META_DATASET]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_dataset-33-11">
<changeSet author="root" id="tab-meta_dataset-33-11">
<createTable tableName="IBZDATASET">
<column name="DATASETID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
......@@ -244,7 +244,7 @@
<!--输出实体[META_DYNAMICMODEL]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_dynamicmodel-33-12">
<changeSet author="root" id="tab-meta_dynamicmodel-33-12">
<createTable tableName="IBZDYNAMICMODEL">
<column name="DYNAINSTID" remarks="" type="VARCHAR(100)">
</column>
......@@ -266,7 +266,7 @@
<!--输出实体[META_ENTITY]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_entity-105-13">
<changeSet author="root" id="tab-meta_entity-105-13">
<createTable tableName="IBZENTITY">
<column name="ENTITYID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
......@@ -298,7 +298,7 @@
<!--输出实体[META_FIELD]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_field-153-14">
<changeSet author="root" id="tab-meta_field-153-14">
<createTable tableName="IBZFIELD">
<column name="FIELDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
......@@ -362,7 +362,7 @@
<!--输出实体[META_MODEL]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_model-44-15">
<changeSet author="root" id="tab-meta_model-44-15">
<createTable tableName="IBZMODEL">
<column name="MODELID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>
......@@ -388,7 +388,7 @@
<!--输出实体[META_MODULE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_module-34-16">
<changeSet author="root" id="tab-meta_module-34-16">
<createTable tableName="IBZMODULE">
<column name="MODULEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_MODULE_MODULEID"/>
......@@ -406,7 +406,7 @@
<!--输出实体[META_RELATION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_relation-106-17">
<changeSet author="root" id="tab-meta_relation-106-17">
<createTable tableName="IBZRELATION">
<column name="RELATIONID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>
......@@ -448,10 +448,10 @@
<!--输出实体[DST_VIEW]外键关系 -->
<!--输出实体[META_DATASET]外键关系 -->
<!--输出实体[META_DYNAMICMODEL]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-33-18">
<changeSet author="root" id="fk-meta_dynamicmodel-33-18">
<addForeignKeyConstraint baseColumnNames="SYSTEMID" baseTableName="IBZDYNAMICMODEL" constraintName="DER1N_META_DYNAMICMODEL_DST_SY" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PSSYSTEMID" referencedTableName="IBZPSSYSTEM" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-33-19">
<changeSet author="root" id="fk-meta_dynamicmodel-33-19">
<addForeignKeyConstraint baseColumnNames="PDYNAINSTID" baseTableName="IBZDYNAMICMODEL" constraintName="DER1N_META_DYNAMICMODEL_META_D" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONFIGID" referencedTableName="IBZDYNAMICMODEL" validate="true"/>
</changeSet>
<!--输出实体[META_ENTITY]外键关系 -->
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或