Skip to content

功
功能演示系统
提交 2e006310 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

kuaikuai 发布系统代码 [后台服务，演示应用]

上级 c4ffc30e
显示空白字符变更
内嵌 并排
正在显示 包含 317 行增加 和 68 行删除
app_Web/public/assets/json/view-config.json
浏览文件 @ 2e006310
......@@ -856,7 +856,7 @@
"viewtag": "7d37165f2f535b4a6d2116188fe83d18"
},
"ibizorderdashboardview": {
"title": "订单数据看板视图",
"title": "数据看板",
"caption": "订单",
"viewtype": "DEPORTALVIEW",
"viewmodule": "Sample",
......
app_Web/src/locale/lanres/entities/ibizbook/ibizbook_en_US_base.ts
浏览文件 @ 2e006310
......@@ -582,9 +582,17 @@ function getLocaleResourceBase(){
},
exporandimportgrid_grid: {
columns: {
ibizbookid: commonLogic.appcommonhandle("图书标识",null),
ibizbookname: commonLogic.appcommonhandle("图书名称",null),
updateman: commonLogic.appcommonhandle("更新人",null),
updatedate: commonLogic.appcommonhandle("更新时间",null),
author: commonLogic.appcommonhandle("图书作者",null),
type: commonLogic.appcommonhandle("图书类型",null),
press: commonLogic.appcommonhandle("图书出版社",null),
price: commonLogic.appcommonhandle("图书价格",null),
subtext: commonLogic.appcommonhandle("图书描述",null),
booknumber: commonLogic.appcommonhandle("图书数量",null),
tag: commonLogic.appcommonhandle("标签",null),
borrowway: commonLogic.appcommonhandle("借阅方式",null),
sailstate: commonLogic.appcommonhandle("图书销售状态",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......
app_Web/src/locale/lanres/entities/ibizbook/ibizbook_zh_CN_base.ts
浏览文件 @ 2e006310
......@@ -582,9 +582,17 @@ function getLocaleResourceBase(){
},
exporandimportgrid_grid: {
columns: {
ibizbookid: commonLogic.appcommonhandle("图书标识",null),
ibizbookname: commonLogic.appcommonhandle("图书名称",null),
updateman: commonLogic.appcommonhandle("更新人",null),
updatedate: commonLogic.appcommonhandle("更新时间",null),
author: commonLogic.appcommonhandle("图书作者",null),
type: commonLogic.appcommonhandle("图书类型",null),
press: commonLogic.appcommonhandle("图书出版社",null),
price: commonLogic.appcommonhandle("图书价格",null),
subtext: commonLogic.appcommonhandle("图书描述",null),
booknumber: commonLogic.appcommonhandle("图书数量",null),
tag: commonLogic.appcommonhandle("标签",null),
borrowway: commonLogic.appcommonhandle("借阅方式",null),
sailstate: commonLogic.appcommonhandle("图书销售状态",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......
app_Web/src/locale/lanres/entities/ibizorder/ibizorder_en_US_base.ts
浏览文件 @ 2e006310
......@@ -141,7 +141,7 @@ function getLocaleResourceBase(){
},
dashboardview: {
caption: commonLogic.appcommonhandle("订单",null),
title: commonLogic.appcommonhandle("订单数据看板视图",null),
title: commonLogic.appcommonhandle("数据看板",null),
},
sf1editview: {
caption: commonLogic.appcommonhandle("编辑表单新建默认值",null),
......
app_Web/src/locale/lanres/entities/ibizorder/ibizorder_zh_CN_base.ts
浏览文件 @ 2e006310
......@@ -141,7 +141,7 @@ function getLocaleResourceBase(){
},
dashboardview: {
caption: commonLogic.appcommonhandle("订单",null),
title: commonLogic.appcommonhandle("订单数据看板视图",null),
title: commonLogic.appcommonhandle("数据看板",null),
},
sf1editview: {
caption: commonLogic.appcommonhandle("编辑表单新建默认值",null),
......
app_Web/src/mock/viewconfig/viewconfig.ts
浏览文件 @ 2e006310
......@@ -864,7 +864,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtag": "7d37165f2f535b4a6d2116188fe83d18"
},
"ibizorderdashboardview": {
"title": "订单数据看板视图",
"title": "数据看板",
"caption": "订单",
"viewtype": "DEPORTALVIEW",
"viewmodule": "Sample",
......
app_Web/src/pages/sample/micro-component-edit-view/micro-component-edit-view-base.vue
浏览文件 @ 2e006310
<template>
<div class="view-container deeditview micro-component-edit-view">
<app-studioaction :viewTitle="$t(model.srfCaption)" viewName="microcomponenteditview"></app-studioaction>
<card class='view-card ' :disHover="true" :bordered="false">
<card class='view-card view-no-caption ' :disHover="true" :bordered="false">
<div slot='title' class="header-container">
<span class='caption-info'>{{$t(model.srfCaption)}}</span>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem3.visabled" :disabled="toolBarModels.tbitem3.disabled" class=' deepskyblueToolBar' v-loading:i-button @click="toolbar_click({ tag: 'tbitem3' }, $event)">
......
app_Web/src/widgets/ibizbook/expor-and-import-grid-grid/expor-and-import-grid-grid-base.vue
浏览文件 @ 2e006310
......@@ -21,8 +21,20 @@
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('ibizbookid')">
<el-table-column show-overflow-tooltip :prop="'ibizbookid'" :label="$t('entities.ibizbook.exporandimportgrid_grid.columns.ibizbookid')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizbook.exporandimportgrid_grid.columns.ibizbookid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.ibizbookid}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('ibizbookname')">
<el-table-column show-overflow-tooltip :prop="'ibizbookname'" :label="$t('entities.ibizbook.exporandimportgrid_grid.columns.ibizbookname')" :width="150" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'ibizbookname'" :label="$t('entities.ibizbook.exporandimportgrid_grid.columns.ibizbookname')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizbook.exporandimportgrid_grid.columns.ibizbookname')}}
......@@ -33,29 +45,117 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('updateman')">
<el-table-column show-overflow-tooltip :prop="'updateman'" :label="$t('entities.ibizbook.exporandimportgrid_grid.columns.updateman')" :width="150" :align="'left'" :sortable="'custom'">
<template v-if="getColumnState('author')">
<el-table-column show-overflow-tooltip :prop="'author'" :label="$t('entities.ibizbook.exporandimportgrid_grid.columns.author')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizbook.exporandimportgrid_grid.columns.updateman')}}
{{$t('entities.ibizbook.exporandimportgrid_grid.columns.author')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.author}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('type')">
<el-table-column show-overflow-tooltip :prop="'type'" :label="$t('entities.ibizbook.exporandimportgrid_grid.columns.type')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizbook.exporandimportgrid_grid.columns.type')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.updateman" tag='SysOperator' codelistType='DYNAMIC' ></codelist>
<codelist :value="row.type" tag='BookType' codelistType='STATIC' ></codelist>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('press')">
<el-table-column show-overflow-tooltip :prop="'press'" :label="$t('entities.ibizbook.exporandimportgrid_grid.columns.press')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizbook.exporandimportgrid_grid.columns.press')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.press}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('updatedate')">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.ibizbook.exporandimportgrid_grid.columns.updatedate')" :width="150" :align="'left'" :sortable="'custom'">
<template v-if="getColumnState('price')">
<el-table-column show-overflow-tooltip :prop="'price'" :label="$t('entities.ibizbook.exporandimportgrid_grid.columns.price')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizbook.exporandimportgrid_grid.columns.updatedate')}}
{{$t('entities.ibizbook.exporandimportgrid_grid.columns.price')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<app-format-data format="YYYY-MM-DD HH:mm:ss" :data="row.updatedate"></app-format-data>
<app-format-data dataType="FLOAT" precision="2" :data="row.price"></app-format-data>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('subtext')">
<el-table-column show-overflow-tooltip :prop="'subtext'" :label="$t('entities.ibizbook.exporandimportgrid_grid.columns.subtext')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizbook.exporandimportgrid_grid.columns.subtext')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.subtext}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('booknumber')">
<el-table-column show-overflow-tooltip :prop="'booknumber'" :label="$t('entities.ibizbook.exporandimportgrid_grid.columns.booknumber')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizbook.exporandimportgrid_grid.columns.booknumber')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.booknumber}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('tag')">
<el-table-column show-overflow-tooltip :prop="'tag'" :label="$t('entities.ibizbook.exporandimportgrid_grid.columns.tag')" :width="100" :align="'left'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizbook.exporandimportgrid_grid.columns.tag')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.tag}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('borrowway')">
<el-table-column show-overflow-tooltip :prop="'borrowway'" :label="$t('entities.ibizbook.exporandimportgrid_grid.columns.borrowway')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizbook.exporandimportgrid_grid.columns.borrowway')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.borrowway" tag='CodeList25' codelistType='STATIC' ></codelist>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('sailstate')">
<el-table-column show-overflow-tooltip :prop="'sailstate'" :label="$t('entities.ibizbook.exporandimportgrid_grid.columns.sailstate')" :min-width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizbook.exporandimportgrid_grid.columns.sailstate')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<codelist :value="row.sailstate" tag='BookSailState' codelistType='STATIC' ></codelist>
</template>
</template>
</el-table-column>
</template>
......@@ -616,6 +716,15 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
* @memberof ExporAndImportGridBase
*/
public allColumns: any[] = [
{
name: 'ibizbookid',
label: '图书标识',
langtag: 'entities.ibizbook.exporandimportgrid_grid.columns.ibizbookid',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'ibizbookname',
label: '图书名称',
......@@ -626,23 +735,86 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
enableCond: 3 ,
},
{
name: 'updateman',
label: '更新人',
langtag: 'entities.ibizbook.exporandimportgrid_grid.columns.updateman',
name: 'author',
label: '图书作者',
langtag: 'entities.ibizbook.exporandimportgrid_grid.columns.author',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'type',
label: '图书类型',
langtag: 'entities.ibizbook.exporandimportgrid_grid.columns.type',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'press',
label: '图书出版社',
langtag: 'entities.ibizbook.exporandimportgrid_grid.columns.press',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'price',
label: '图书价格',
langtag: 'entities.ibizbook.exporandimportgrid_grid.columns.price',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'subtext',
label: '图书描述',
langtag: 'entities.ibizbook.exporandimportgrid_grid.columns.subtext',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'booknumber',
label: '图书数量',
langtag: 'entities.ibizbook.exporandimportgrid_grid.columns.booknumber',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'updatedate',
label: '更新时间',
langtag: 'entities.ibizbook.exporandimportgrid_grid.columns.updatedate',
name: 'tag',
label: '标签',
langtag: 'entities.ibizbook.exporandimportgrid_grid.columns.tag',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'borrowway',
label: '借阅方式',
langtag: 'entities.ibizbook.exporandimportgrid_grid.columns.borrowway',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'sailstate',
label: '图书销售状态',
langtag: 'entities.ibizbook.exporandimportgrid_grid.columns.sailstate',
show: true,
unit: 'STAR',
isEnableRowEdit: false,
enableCond: 3 ,
},
]
/**
......@@ -1144,9 +1316,25 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
public async formatExcelData(filterVal:any, jsonData:any) {
let codelistColumns:Array<any> = [
{
name: 'updateman',
srfkey: 'SysOperator',
codelistType : 'DYNAMIC',
name: 'type',
srfkey: 'BookType',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
{
name: 'borrowway',
srfkey: 'CodeList25',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
{
name: 'sailstate',
srfkey: 'BookSailState',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
......@@ -1361,7 +1549,7 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
* @memberof ExporAndImportGridBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['ibizbookname','updateman','updatedate'];
let allColumns:Array<any> = ['ibizbookid','ibizbookname','author','type','press','price','subtext','booknumber','tag','borrowway','sailstate'];
if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1441,9 +1629,17 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
const tree: any ={
groupById: Number((i+1)*100),
group: group.label,
ibizbookid:'',
ibizbookname:'',
updateman:'',
updatedate:'',
author:'',
type:'',
press:'',
price:'',
subtext:'',
booknumber:'',
tag:'',
borrowway:'',
sailstate:'',
children: children
}
groupTree.push(tree);
......@@ -1470,9 +1666,17 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
const Tree: any = {
groupById: Number((allGroup.length+1)*100),
group: this.$t('app.gridpage.other'),
ibizbookid:'',
ibizbookname:'',
updateman:'',
updatedate:'',
author:'',
type:'',
press:'',
price:'',
subtext:'',
booknumber:'',
tag:'',
borrowway:'',
sailstate:'',
children: child
}
if(child && child.length > 0){
......@@ -1519,9 +1723,17 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
const tree: any ={
groupById: Number((groupIndex+1)*100),
group: group,
ibizbookid:'',
ibizbookname:'',
updateman:'',
updatedate:'',
author:'',
type:'',
press:'',
price:'',
subtext:'',
booknumber:'',
tag:'',
borrowway:'',
sailstate:'',
children: children,
}
groupTree.push(tree);
......@@ -1939,10 +2151,16 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
});
}
} else if(Object.is(errorMessage[index].data.errorKey, 'DuplicateKeyException')){
let name: string = this.service.getNameByProp("ibizbookid");
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),
......@@ -2051,6 +2269,7 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
return;
}
let tempContext: any = this.$util.deepCopy(this.context);
Object.is(tempContext, { ibizbook: data.ibizbookid });
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/ibizbook/expor-and-import-grid-grid/expor-and-import-grid-grid-model.ts
浏览文件 @ 2e006310
......@@ -27,24 +27,34 @@ export default class ExporAndImportGridModel {
}else{
return [
{
name: 'ibizbookname',
prop: 'ibizbookname',
name: 'subtext',
prop: 'subtext',
dataType: 'TEXT',
},
{
name: 'press',
prop: 'press',
dataType: 'TEXT',
},
{
name: 'tag',
prop: 'tag',
dataType: 'LONGTEXT',
},
{
name: 'ibizbookid',
prop: 'ibizbookid',
dataType: 'GUID',
},
{
name: 'updateman',
prop: 'updateman',
name: 'sailstate',
prop: 'sailstate',
dataType: 'TEXT',
},
{
name: 'updatedate',
prop: 'updatedate',
dataType: 'DATETIME',
name: 'type',
prop: 'type',
dataType: 'TEXT',
},
{
name: 'srfmstag',
......@@ -65,6 +75,31 @@ export default class ExporAndImportGridModel {
dataType: 'GUID',
isEditable:true
},
{
name: 'author',
prop: 'author',
dataType: 'TEXT',
},
{
name: 'ibizbookname',
prop: 'ibizbookname',
dataType: 'TEXT',
},
{
name: 'price',
prop: 'price',
dataType: 'FLOAT',
},
{
name: 'booknumber',
prop: 'booknumber',
dataType: 'INT',
},
{
name: 'borrowway',
prop: 'borrowway',
dataType: 'SSCODELIST',
},
{
name: 'ibizbook',
prop: 'ibizbookid',
......
config.xml
浏览文件 @ 2e006310
......@@ -37,11 +37,6 @@
git clone -b master $para2 demosys/
export NODE_OPTIONS=--max-old-space-size=4096
cd demosys/
mvn clean package -Pweb
cd demo-app/demo-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/demo-app-web.yaml iBizDemo --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
demo-app/demo-app-web/src/main/docker/Dockerfile
浏览文件 @ 2e006310
......@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-app-web.jar
EXPOSE 51001
EXPOSE 8080
ADD demo-app-web.jar /demo-app-web.jar
demo-app/demo-app-web/src/main/docker/demo-app-web.yaml
浏览文件 @ 2e006310
......@@ -3,24 +3,9 @@ services:
demo-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-app-web:latest
ports:
- "51001:51001"
- "8080:8080"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=51001
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
- SPRING_DATASOURCE_PASSWORD=3d6@460A
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
- NACOS=172.16.240.110:8848
- SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
- SEATA_ENABLED=true
deploy:
resources:
limits:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或