Skip to content

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

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

上级 5154a883
隐藏空白字符变更
内嵌 并排
正在显示 包含 17 行增加 和 44 行删除
app_web/src/locale/lanres/entities/meta-dynamic-model/meta-dynamic-model_BO_CN_base.ts
浏览文件 @ ad1d0e3c
...@@ -46,10 +46,9 @@ function getLocaleResourceBase(){ ...@@ -46,10 +46,9 @@ function getLocaleResourceBase(){
main_grid: { main_grid: {
columns: { columns: {
configid: commonLogic.appcommonhandle("ID",null), configid: commonLogic.appcommonhandle("ID",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
configname: commonLogic.appcommonhandle("名称",null), configname: commonLogic.appcommonhandle("名称",null),
systemid: commonLogic.appcommonhandle("系统标识",null), systemid: commonLogic.appcommonhandle("系统标识",null),
pdynainstid: commonLogic.appcommonhandle("ID",null), dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
}, },
nodata:commonLogic.appcommonhandle("",null), nodata:commonLogic.appcommonhandle("",null),
uiactions: { uiactions: {
......
app_web/src/locale/lanres/entities/meta-dynamic-model/meta-dynamic-model_en_US_base.ts
浏览文件 @ ad1d0e3c
...@@ -46,10 +46,9 @@ function getLocaleResourceBase(){ ...@@ -46,10 +46,9 @@ function getLocaleResourceBase(){
main_grid: { main_grid: {
columns: { columns: {
configid: commonLogic.appcommonhandle("ID",null), configid: commonLogic.appcommonhandle("ID",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
configname: commonLogic.appcommonhandle("名称",null), configname: commonLogic.appcommonhandle("名称",null),
systemid: commonLogic.appcommonhandle("系统标识",null), systemid: commonLogic.appcommonhandle("系统标识",null),
pdynainstid: commonLogic.appcommonhandle("ID",null), dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
}, },
nodata:commonLogic.appcommonhandle("",null), nodata:commonLogic.appcommonhandle("",null),
uiactions: { uiactions: {
......
app_web/src/locale/lanres/entities/meta-dynamic-model/meta-dynamic-model_zh_CN_base.ts
浏览文件 @ ad1d0e3c
...@@ -46,10 +46,9 @@ function getLocaleResourceBase(){ ...@@ -46,10 +46,9 @@ function getLocaleResourceBase(){
main_grid: { main_grid: {
columns: { columns: {
configid: commonLogic.appcommonhandle("ID",null), configid: commonLogic.appcommonhandle("ID",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
configname: commonLogic.appcommonhandle("名称",null), configname: commonLogic.appcommonhandle("名称",null),
systemid: commonLogic.appcommonhandle("系统标识",null), systemid: commonLogic.appcommonhandle("系统标识",null),
pdynainstid: commonLogic.appcommonhandle("ID",null), dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
}, },
nodata:commonLogic.appcommonhandle("",null), nodata:commonLogic.appcommonhandle("",null),
uiactions: { uiactions: {
......
app_web/src/widgets/meta-dynamic-model/main-grid/main-grid-base.vue
浏览文件 @ ad1d0e3c
...@@ -34,18 +34,6 @@ ...@@ -34,18 +34,6 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('dynainstid')">
<el-table-column show-overflow-tooltip :prop="'dynainstid'" :label="$t('entities.metadynamicmodel.main_grid.columns.dynainstid')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.metadynamicmodel.main_grid.columns.dynainstid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.dynainstid}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('configname')"> <template v-if="getColumnState('configname')">
<el-table-column show-overflow-tooltip :prop="'configname'" :label="$t('entities.metadynamicmodel.main_grid.columns.configname')" :width="100" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'configname'" :label="$t('entities.metadynamicmodel.main_grid.columns.configname')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
...@@ -70,15 +58,15 @@ ...@@ -70,15 +58,15 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('pdynainstid')"> <template v-if="getColumnState('dynainstid')">
<el-table-column show-overflow-tooltip :prop="'pdynainstid'" :label="$t('entities.metadynamicmodel.main_grid.columns.pdynainstid')" :width="100" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'dynainstid'" :label="$t('entities.metadynamicmodel.main_grid.columns.dynainstid')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}"> <template v-slot:header="{column}">
<span class="column-header "> <span class="column-header ">
{{$t('entities.metadynamicmodel.main_grid.columns.pdynainstid')}} {{$t('entities.metadynamicmodel.main_grid.columns.dynainstid')}}
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<span>{{row.pdynainstid}}</span> <span>{{row.dynainstid}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
...@@ -648,15 +636,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -648,15 +636,6 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit: false, isEnableRowEdit: false,
enableCond: 3 , enableCond: 3 ,
}, },
{
name: 'dynainstid',
label: '动态实例标识',
langtag: 'entities.metadynamicmodel.main_grid.columns.dynainstid',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{ {
name: 'configname', name: 'configname',
label: '名称', label: '名称',
...@@ -676,9 +655,9 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -676,9 +655,9 @@ export default class MainBase extends Vue implements ControlInterface {
enableCond: 3 , enableCond: 3 ,
}, },
{ {
name: 'pdynainstid', name: 'dynainstid',
label: 'ID', label: '动态实例标识',
langtag: 'entities.metadynamicmodel.main_grid.columns.pdynainstid', langtag: 'entities.metadynamicmodel.main_grid.columns.dynainstid',
show: true, show: true,
unit: 'PX', unit: 'PX',
isEnableRowEdit: false, isEnableRowEdit: false,
...@@ -1380,7 +1359,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1380,7 +1359,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase * @memberof MainBase
*/ */
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) { public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['configid','dynainstid','configname','systemid','pdynainstid']; let allColumns:Array<any> = ['configid','configname','systemid','dynainstid'];
if(row && row.children) { if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) { if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1]; return [1, allColumns.length+1];
...@@ -1461,10 +1440,9 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1461,10 +1440,9 @@ export default class MainBase extends Vue implements ControlInterface {
groupById: Number((i+1)*100), groupById: Number((i+1)*100),
group: group.label, group: group.label,
configid:'', configid:'',
dynainstid:'',
configname:'', configname:'',
systemid:'', systemid:'',
pdynainstid:'', dynainstid:'',
children: children children: children
} }
groupTree.push(tree); groupTree.push(tree);
...@@ -1492,10 +1470,9 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1492,10 +1470,9 @@ export default class MainBase extends Vue implements ControlInterface {
groupById: Number((allGroup.length+1)*100), groupById: Number((allGroup.length+1)*100),
group: this.$t('app.gridpage.other'), group: this.$t('app.gridpage.other'),
configid:'', configid:'',
dynainstid:'',
configname:'', configname:'',
systemid:'', systemid:'',
pdynainstid:'', dynainstid:'',
children: child children: child
} }
if(child && child.length > 0){ if(child && child.length > 0){
...@@ -1543,10 +1520,9 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1543,10 +1520,9 @@ export default class MainBase extends Vue implements ControlInterface {
groupById: Number((groupIndex+1)*100), groupById: Number((groupIndex+1)*100),
group: group, group: group,
configid:'', configid:'',
dynainstid:'',
configname:'', configname:'',
systemid:'', systemid:'',
pdynainstid:'', dynainstid:'',
children: children, children: children,
} }
groupTree.push(tree); groupTree.push(tree);
......
ibzlite-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ ad1d0e3c
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
<!--输出实体[META_DYNAMICMODEL]数据结构 --> <!--输出实体[META_DYNAMICMODEL]数据结构 -->
<changeSet author="root" id="tab-meta_dynamicmodel-26-12"> <changeSet author="root" id="tab-meta_dynamicmodel-29-12">
<createTable tableName="IBZDYNAMICMODEL"> <createTable tableName="IBZDYNAMICMODEL">
<column name="DYNAINSTID" remarks="" type="VARCHAR(100)"> <column name="DYNAINSTID" remarks="" type="VARCHAR(100)">
</column> </column>
...@@ -448,10 +448,10 @@ ...@@ -448,10 +448,10 @@
<!--输出实体[DST_VIEW]外键关系 --> <!--输出实体[DST_VIEW]外键关系 -->
<!--输出实体[META_DATASET]外键关系 --> <!--输出实体[META_DATASET]外键关系 -->
<!--输出实体[META_DYNAMICMODEL]外键关系 --> <!--输出实体[META_DYNAMICMODEL]外键关系 -->
<changeSet author="root" id="fk-meta_dynamicmodel-26-18"> <changeSet author="root" id="fk-meta_dynamicmodel-29-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"/> <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>
<changeSet author="root" id="fk-meta_dynamicmodel-26-19"> <changeSet author="root" id="fk-meta_dynamicmodel-29-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"/> <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> </changeSet>
<!--输出实体[META_ENTITY]外键关系 --> <!--输出实体[META_ENTITY]外键关系 -->
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或