Skip to content

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

ShineKOT 部署微服务应用 [后台服务，演示应用]

上级 fb47319a
显示空白字符变更
内嵌 并排
正在显示 包含 134 行增加 和 127 行删除
app_Web/src/locale/lanres/entities/ibizbook/ibizbook_en_US.ts
浏览文件 @ debc34dd
...@@ -11,6 +11,7 @@ export default { ...@@ -11,6 +11,7 @@ export default {
price: "图书价格", price: "图书价格",
press: "图书出版社", press: "图书出版社",
type: "图书类型", type: "图书类型",
booknumber: "图书数量",
}, },
views: { views: {
usr2gridview: { usr2gridview: {
...@@ -90,6 +91,7 @@ export default { ...@@ -90,6 +91,7 @@ export default {
type: "图书类型", type: "图书类型",
press: "图书出版社", press: "图书出版社",
price: "图书价格", price: "图书价格",
booknumber: "图书数量",
}, },
nodata:"", nodata:"",
uiactions: { uiactions: {
...@@ -102,6 +104,7 @@ export default { ...@@ -102,6 +104,7 @@ export default {
ibizbookname: "图书名称", ibizbookname: "图书名称",
press: "图书出版社", press: "图书出版社",
price: "图书价格", price: "图书价格",
booknumber: "图书数量",
}, },
nodata:"", nodata:"",
uiactions: { uiactions: {
...@@ -164,6 +167,7 @@ export default { ...@@ -164,6 +167,7 @@ export default {
ibizbookname: "图书名称", ibizbookname: "图书名称",
press: "图书出版社", press: "图书出版社",
price: "图书价格", price: "图书价格",
booknumber: "图书数量",
}, },
nodata:"", nodata:"",
uiactions: { uiactions: {
......
app_Web/src/locale/lanres/entities/ibizbook/ibizbook_zh_CN.ts
浏览文件 @ debc34dd
...@@ -10,6 +10,7 @@ export default { ...@@ -10,6 +10,7 @@ export default {
price: "图书价格", price: "图书价格",
press: "图书出版社", press: "图书出版社",
type: "图书类型", type: "图书类型",
booknumber: "图书数量",
}, },
views: { views: {
usr2gridview: { usr2gridview: {
...@@ -89,6 +90,7 @@ export default { ...@@ -89,6 +90,7 @@ export default {
type: "图书类型", type: "图书类型",
press: "图书出版社", press: "图书出版社",
price: "图书价格", price: "图书价格",
booknumber: "图书数量",
}, },
nodata:"", nodata:"",
uiactions: { uiactions: {
...@@ -101,6 +103,7 @@ export default { ...@@ -101,6 +103,7 @@ export default {
ibizbookname: "图书名称", ibizbookname: "图书名称",
press: "图书出版社", press: "图书出版社",
price: "图书价格", price: "图书价格",
booknumber: "图书数量",
}, },
nodata:"", nodata:"",
uiactions: { uiactions: {
...@@ -163,6 +166,7 @@ export default { ...@@ -163,6 +166,7 @@ export default {
ibizbookname: "图书名称", ibizbookname: "图书名称",
press: "图书出版社", press: "图书出版社",
price: "图书价格", price: "图书价格",
booknumber: "图书数量",
}, },
nodata:"", nodata:"",
uiactions: { uiactions: {
......
app_Web/src/widgets/ibizbook/internal-func-grid/internal-func-grid-base.vue
浏览文件 @ debc34dd
...@@ -53,9 +53,7 @@ ...@@ -53,9 +53,7 @@
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<template > <span>{{row.type}}</span>
<codelist :value="row.type" tag='BookType' codelistType='STATIC' ></codelist>
</template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
...@@ -1044,7 +1042,7 @@ export default class InternalFuncBase extends Vue implements ControlInterface { ...@@ -1044,7 +1042,7 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000}, "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}, "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}, "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000} "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
...@@ -1145,14 +1143,6 @@ export default class InternalFuncBase extends Vue implements ControlInterface { ...@@ -1145,14 +1143,6 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
*/ */
public async formatExcelData(filterVal:any, jsonData:any) { public async formatExcelData(filterVal:any, jsonData:any) {
let codelistColumns:Array<any> = [ let codelistColumns:Array<any> = [
{
name: 'type',
srfkey: 'BookType',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]; ];
let _this = this; let _this = this;
for (const codelist of codelistColumns) { for (const codelist of codelistColumns) {
......
app_Web/src/widgets/ibizbook/main2-grid/main2-grid-base.vue
浏览文件 @ debc34dd
...@@ -39,9 +39,7 @@ ...@@ -39,9 +39,7 @@
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<template > <span>{{row.type}}</span>
<codelist :value="row.type" tag='BookType' codelistType='STATIC' ></codelist>
</template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
...@@ -1055,7 +1053,7 @@ export default class Main2Base extends Vue implements ControlInterface { ...@@ -1055,7 +1053,7 @@ export default class Main2Base extends Vue implements ControlInterface {
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000}, "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}, "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}, "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000} "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
...@@ -1156,14 +1154,6 @@ export default class Main2Base extends Vue implements ControlInterface { ...@@ -1156,14 +1154,6 @@ export default class Main2Base extends Vue implements ControlInterface {
*/ */
public async formatExcelData(filterVal:any, jsonData:any) { public async formatExcelData(filterVal:any, jsonData:any) {
let codelistColumns:Array<any> = [ let codelistColumns:Array<any> = [
{
name: 'type',
srfkey: 'BookType',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]; ];
let _this = this; let _this = this;
for (const codelist of codelistColumns) { for (const codelist of codelistColumns) {
......
app_Web/src/widgets/ibizbook/main3-grid/main3-grid-base.vue
浏览文件 @ debc34dd
...@@ -39,9 +39,7 @@ ...@@ -39,9 +39,7 @@
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<template > <span>{{row.type}}</span>
<codelist :value="row.type" tag='BookType' codelistType='STATIC' ></codelist>
</template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
...@@ -1055,7 +1053,7 @@ export default class Main3Base extends Vue implements ControlInterface { ...@@ -1055,7 +1053,7 @@ export default class Main3Base extends Vue implements ControlInterface {
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000}, "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}, "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}, "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000} "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
...@@ -1156,14 +1154,6 @@ export default class Main3Base extends Vue implements ControlInterface { ...@@ -1156,14 +1154,6 @@ export default class Main3Base extends Vue implements ControlInterface {
*/ */
public async formatExcelData(filterVal:any, jsonData:any) { public async formatExcelData(filterVal:any, jsonData:any) {
let codelistColumns:Array<any> = [ let codelistColumns:Array<any> = [
{
name: 'type',
srfkey: 'BookType',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]; ];
let _this = this; let _this = this;
for (const codelist of codelistColumns) { for (const codelist of codelistColumns) {
......
app_Web/src/widgets/ibizbook/main4-grid/main4-grid-base.vue
浏览文件 @ debc34dd
...@@ -31,9 +31,7 @@ ...@@ -31,9 +31,7 @@
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<template > <span>{{row.type}}</span>
<codelist :value="row.type" tag='BookType' codelistType='STATIC' ></codelist>
</template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
...@@ -85,6 +83,18 @@ ...@@ -85,6 +83,18 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('booknumber')">
<el-table-column show-overflow-tooltip :prop="'booknumber'" :label="$t('entities.ibizbook.main4_grid.columns.booknumber')" :width="280" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizbook.main4_grid.columns.booknumber')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.booknumber}}</span>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState"> <template v-if="adaptiveState">
<el-table-column></el-table-column> <el-table-column></el-table-column>
</template> </template>
...@@ -687,6 +697,15 @@ export default class Main4Base extends Vue implements ControlInterface { ...@@ -687,6 +697,15 @@ export default class Main4Base extends Vue implements ControlInterface {
isEnableRowEdit: false, isEnableRowEdit: false,
enableCond: 3 , enableCond: 3 ,
}, },
{
name: 'booknumber',
label: '图书数量',
langtag: 'entities.ibizbook.main4_grid.columns.booknumber',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
] ]
/** /**
...@@ -1046,7 +1065,7 @@ export default class Main4Base extends Vue implements ControlInterface { ...@@ -1046,7 +1065,7 @@ export default class Main4Base extends Vue implements ControlInterface {
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000}, "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}, "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}, "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000} "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
...@@ -1147,14 +1166,6 @@ export default class Main4Base extends Vue implements ControlInterface { ...@@ -1147,14 +1166,6 @@ export default class Main4Base extends Vue implements ControlInterface {
*/ */
public async formatExcelData(filterVal:any, jsonData:any) { public async formatExcelData(filterVal:any, jsonData:any) {
let codelistColumns:Array<any> = [ let codelistColumns:Array<any> = [
{
name: 'type',
srfkey: 'BookType',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]; ];
let _this = this; let _this = this;
for (const codelist of codelistColumns) { for (const codelist of codelistColumns) {
...@@ -1361,7 +1372,7 @@ export default class Main4Base extends Vue implements ControlInterface { ...@@ -1361,7 +1372,7 @@ export default class Main4Base extends Vue implements ControlInterface {
* @memberof Main4Base * @memberof Main4Base
*/ */
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) { public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['type','author','ibizbookname','press','price']; let allColumns:Array<any> = ['type','author','ibizbookname','press','price','booknumber'];
if(row && row.children && row.children.length>0) { if(row && row.children && row.children.length>0) {
if(columnIndex == (this.isSingleSelect ? 0:1)) { if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1]; return [1, allColumns.length+1];
...@@ -1409,6 +1420,7 @@ export default class Main4Base extends Vue implements ControlInterface { ...@@ -1409,6 +1420,7 @@ export default class Main4Base extends Vue implements ControlInterface {
ibizbookname:'', ibizbookname:'',
press:'', press:'',
price:'', price:'',
booknumber:'',
children: children, children: children,
} }
groupTree.push(tree); groupTree.push(tree);
......
app_Web/src/widgets/ibizbook/main4-grid/main4-grid-model.ts
浏览文件 @ debc34dd
...@@ -46,6 +46,11 @@ export default class Main4Model { ...@@ -46,6 +46,11 @@ export default class Main4Model {
prop: 'price', prop: 'price',
dataType: 'CURRENCY', dataType: 'CURRENCY',
}, },
{
name: 'booknumber',
prop: 'booknumber',
dataType: 'INT',
},
{ {
name: 'ibizbookid', name: 'ibizbookid',
prop: 'ibizbookid', prop: 'ibizbookid',
......
app_Web/src/widgets/ibizbook/main5-grid/main5-grid-base.vue
浏览文件 @ debc34dd
...@@ -31,9 +31,7 @@ ...@@ -31,9 +31,7 @@
</span> </span>
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<template > <span>{{row.type}}</span>
<codelist :value="row.type" tag='BookType' codelistType='STATIC' ></codelist>
</template>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
...@@ -85,6 +83,18 @@ ...@@ -85,6 +83,18 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('booknumber')">
<el-table-column show-overflow-tooltip :prop="'booknumber'" :label="$t('entities.ibizbook.main5_grid.columns.booknumber')" :width="280" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizbook.main5_grid.columns.booknumber')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.booknumber}}</span>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState"> <template v-if="adaptiveState">
<el-table-column></el-table-column> <el-table-column></el-table-column>
</template> </template>
...@@ -702,6 +712,15 @@ export default class Main5Base extends Vue implements ControlInterface { ...@@ -702,6 +712,15 @@ export default class Main5Base extends Vue implements ControlInterface {
isEnableRowEdit: false, isEnableRowEdit: false,
enableCond: 3 , enableCond: 3 ,
}, },
{
name: 'booknumber',
label: '图书数量',
langtag: 'entities.ibizbook.main5_grid.columns.booknumber',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
] ]
/** /**
...@@ -1062,7 +1081,7 @@ export default class Main5Base extends Vue implements ControlInterface { ...@@ -1062,7 +1081,7 @@ export default class Main5Base extends Vue implements ControlInterface {
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000}, "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}, "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}, "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000} "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
...@@ -1163,14 +1182,6 @@ export default class Main5Base extends Vue implements ControlInterface { ...@@ -1163,14 +1182,6 @@ export default class Main5Base extends Vue implements ControlInterface {
*/ */
public async formatExcelData(filterVal:any, jsonData:any) { public async formatExcelData(filterVal:any, jsonData:any) {
let codelistColumns:Array<any> = [ let codelistColumns:Array<any> = [
{
name: 'type',
srfkey: 'BookType',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]; ];
let _this = this; let _this = this;
for (const codelist of codelistColumns) { for (const codelist of codelistColumns) {
...@@ -1377,7 +1388,7 @@ export default class Main5Base extends Vue implements ControlInterface { ...@@ -1377,7 +1388,7 @@ export default class Main5Base extends Vue implements ControlInterface {
* @memberof Main5Base * @memberof Main5Base
*/ */
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) { public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['type','author','ibizbookname','press','price']; let allColumns:Array<any> = ['type','author','ibizbookname','press','price','booknumber'];
if(row && row.children && row.children.length>0) { if(row && row.children && row.children.length>0) {
if(columnIndex == (this.isSingleSelect ? 0:1)) { if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1]; return [1, allColumns.length+1];
...@@ -1425,6 +1436,7 @@ export default class Main5Base extends Vue implements ControlInterface { ...@@ -1425,6 +1436,7 @@ export default class Main5Base extends Vue implements ControlInterface {
ibizbookname:'', ibizbookname:'',
press:'', press:'',
price:'', price:'',
booknumber:'',
children: children, children: children,
} }
groupTree.push(tree); groupTree.push(tree);
......
app_Web/src/widgets/ibizbook/main5-grid/main5-grid-model.ts
浏览文件 @ debc34dd
...@@ -46,6 +46,11 @@ export default class Main5Model { ...@@ -46,6 +46,11 @@ export default class Main5Model {
prop: 'price', prop: 'price',
dataType: 'CURRENCY', dataType: 'CURRENCY',
}, },
{
name: 'booknumber',
prop: 'booknumber',
dataType: 'INT',
},
{ {
name: 'ibizbookid', name: 'ibizbookid',
prop: 'ibizbookid', prop: 'ibizbookid',
......
app_Web/src/widgets/ibizbook/new-default-grid/new-default-grid-base.vue
浏览文件 @ debc34dd
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
</app-form-item> </app-form-item>
</template> </template>
<template v-if="!actualIsOpenEdit"> <template v-if="!actualIsOpenEdit">
<codelist :value="row.type" tag='BookType' codelistType='STATIC' ></codelist> <app-span name='type' editorType="TEXTBOX" :value="row.type" dataType="TEXT" precision="0" ></app-span>
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
...@@ -1180,7 +1180,7 @@ export default class NewDefaultBase extends Vue implements ControlInterface { ...@@ -1180,7 +1180,7 @@ export default class NewDefaultBase extends Vue implements ControlInterface {
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000}, "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}, "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}, "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000} "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
...@@ -1281,14 +1281,6 @@ export default class NewDefaultBase extends Vue implements ControlInterface { ...@@ -1281,14 +1281,6 @@ export default class NewDefaultBase extends Vue implements ControlInterface {
*/ */
public async formatExcelData(filterVal:any, jsonData:any) { public async formatExcelData(filterVal:any, jsonData:any) {
let codelistColumns:Array<any> = [ let codelistColumns:Array<any> = [
{
name: 'type',
srfkey: 'BookType',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]; ];
let _this = this; let _this = this;
for (const codelist of codelistColumns) { for (const codelist of codelistColumns) {
......
app_Web/src/widgets/ibizbook/row-edit-grid/row-edit-grid-base.vue
浏览文件 @ debc34dd
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
</app-form-item> </app-form-item>
</template> </template>
<template v-if="!actualIsOpenEdit"> <template v-if="!actualIsOpenEdit">
<codelist :value="row.type" tag='BookType' codelistType='STATIC' ></codelist> <app-span name='type' editorType="TEXTBOX" :value="row.type" dataType="TEXT" precision="0" ></app-span>
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
...@@ -172,6 +172,18 @@ ...@@ -172,6 +172,18 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('booknumber')">
<el-table-column show-overflow-tooltip :prop="'booknumber'" :label="$t('entities.ibizbook.rowedit_grid.columns.booknumber')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.ibizbook.rowedit_grid.columns.booknumber')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.booknumber}}</span>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState"> <template v-if="adaptiveState">
<el-table-column></el-table-column> <el-table-column></el-table-column>
</template> </template>
...@@ -783,6 +795,15 @@ export default class RowEditBase extends Vue implements ControlInterface { ...@@ -783,6 +795,15 @@ export default class RowEditBase extends Vue implements ControlInterface {
isEnableRowEdit: true, isEnableRowEdit: true,
enableCond: 3 , enableCond: 3 ,
}, },
{
name: 'booknumber',
label: '图书数量',
langtag: 'entities.ibizbook.rowedit_grid.columns.booknumber',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
] ]
/** /**
...@@ -1167,7 +1188,7 @@ export default class RowEditBase extends Vue implements ControlInterface { ...@@ -1167,7 +1188,7 @@ export default class RowEditBase extends Vue implements ControlInterface {
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000}, "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}, "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}, "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000} "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
...@@ -1268,14 +1289,6 @@ export default class RowEditBase extends Vue implements ControlInterface { ...@@ -1268,14 +1289,6 @@ export default class RowEditBase extends Vue implements ControlInterface {
*/ */
public async formatExcelData(filterVal:any, jsonData:any) { public async formatExcelData(filterVal:any, jsonData:any) {
let codelistColumns:Array<any> = [ let codelistColumns:Array<any> = [
{
name: 'type',
srfkey: 'BookType',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]; ];
let _this = this; let _this = this;
for (const codelist of codelistColumns) { for (const codelist of codelistColumns) {
...@@ -1482,7 +1495,7 @@ export default class RowEditBase extends Vue implements ControlInterface { ...@@ -1482,7 +1495,7 @@ export default class RowEditBase extends Vue implements ControlInterface {
* @memberof RowEditBase * @memberof RowEditBase
*/ */
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) { public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['ibizbookid','ibizbookname','author','type','press','price']; let allColumns:Array<any> = ['ibizbookid','ibizbookname','author','type','press','price','booknumber'];
if(row && row.children && row.children.length>0) { if(row && row.children && row.children.length>0) {
if(columnIndex == (this.isSingleSelect ? 0:1)) { if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1]; return [1, allColumns.length+1];
...@@ -1531,6 +1544,7 @@ export default class RowEditBase extends Vue implements ControlInterface { ...@@ -1531,6 +1544,7 @@ export default class RowEditBase extends Vue implements ControlInterface {
type:'', type:'',
press:'', press:'',
price:'', price:'',
booknumber:'',
children: children, children: children,
} }
groupTree.push(tree); groupTree.push(tree);
......
app_Web/src/widgets/ibizbook/row-edit-grid/row-edit-grid-model.ts
浏览文件 @ debc34dd
...@@ -50,6 +50,11 @@ export default class RowEditModel { ...@@ -50,6 +50,11 @@ export default class RowEditModel {
dataType: 'CURRENCY', dataType: 'CURRENCY',
isEditable:true isEditable:true
}, },
{
name: 'booknumber',
prop: 'booknumber',
dataType: 'INT',
},
{ {
name: 'ibizbookid', name: 'ibizbookid',
prop: 'ibizbookid', prop: 'ibizbookid',
......
app_Web/src/widgets/ibizbook/row-rules-grid/row-rules-grid-base.vue
浏览文件 @ debc34dd
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</template> </template>
<template v-slot="{row,column,$index}"> <template v-slot="{row,column,$index}">
<template > <template >
<codelist :value="row.type" tag='BookType' codelistType='STATIC' ></codelist> <app-span name='type' editorType="TEXTBOX" :value="row.type" dataType="TEXT" precision="0" ></app-span>
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
...@@ -1077,7 +1077,7 @@ export default class RowRulesBase extends Vue implements ControlInterface { ...@@ -1077,7 +1077,7 @@ export default class RowRulesBase extends Vue implements ControlInterface {
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000}, "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}, "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}, "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000} "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
...@@ -1178,14 +1178,6 @@ export default class RowRulesBase extends Vue implements ControlInterface { ...@@ -1178,14 +1178,6 @@ export default class RowRulesBase extends Vue implements ControlInterface {
*/ */
public async formatExcelData(filterVal:any, jsonData:any) { public async formatExcelData(filterVal:any, jsonData:any) {
let codelistColumns:Array<any> = [ let codelistColumns:Array<any> = [
{
name: 'type',
srfkey: 'BookType',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]; ];
let _this = this; let _this = this;
for (const codelist of codelistColumns) { for (const codelist of codelistColumns) {
......
app_Web/src/widgets/ibizbook/update-default-grid/update-default-grid-base.vue
浏览文件 @ debc34dd
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
</app-form-item> </app-form-item>
</template> </template>
<template v-if="!actualIsOpenEdit"> <template v-if="!actualIsOpenEdit">
<codelist :value="row.type" tag='BookType' codelistType='STATIC' ></codelist> <app-span name='type' editorType="TEXTBOX" :value="row.type" dataType="TEXT" precision="0" ></app-span>
</template> </template>
</template> </template>
</el-table-column> </el-table-column>
...@@ -1180,7 +1180,7 @@ export default class UpdateDefaultBase extends Vue implements ControlInterface { ...@@ -1180,7 +1180,7 @@ export default class UpdateDefaultBase extends Vue implements ControlInterface {
"PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000}, "PRICE":{"headername":"图书价格","isuniqueitem":false,"name":"price","order":1000},
"IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000}, "IBIZBOOKNAME":{"headername":"图书名称","isuniqueitem":false,"name":"ibizbookname","order":1000},
"IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000}, "IBIZBOOKID":{"headername":"图书标识","isuniqueitem":false,"name":"ibizbookid","order":1000},
"TYPE":{"codelist":{"type":"STATIC","tag":"BookType","isnumber":false},"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000} "TYPE":{"headername":"图书类型","isuniqueitem":false,"name":"type","order":1000}
} }
} }
if(Object.keys(importDataModel).length == 0){ if(Object.keys(importDataModel).length == 0){
...@@ -1281,14 +1281,6 @@ export default class UpdateDefaultBase extends Vue implements ControlInterface { ...@@ -1281,14 +1281,6 @@ export default class UpdateDefaultBase extends Vue implements ControlInterface {
*/ */
public async formatExcelData(filterVal:any, jsonData:any) { public async formatExcelData(filterVal:any, jsonData:any) {
let codelistColumns:Array<any> = [ let codelistColumns:Array<any> = [
{
name: 'type',
srfkey: 'BookType',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
]; ];
let _this = this; let _this = this;
for (const codelist of codelistColumns) { for (const codelist of codelistColumns) {
......
config.xml
浏览文件 @ debc34dd
...@@ -37,11 +37,11 @@ ...@@ -37,11 +37,11 @@
git clone -b master $para2 demosys/ git clone -b master $para2 demosys/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd demosys/ cd demosys/
mvn clean package -Pdemoapi mvn clean package -Pweb
cd demo-provider/demo-provider-demoapi cd demo-app/demo-app-web
mvn -Pdemoapi docker:build mvn -Pweb docker:build
mvn -Pdemoapi docker:push mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/demo-provider-demoapi.yaml iBizDemo --with-registry-auth docker -H $para1 stack deploy --compose-file=src/main/docker/demo-app-web.yaml iBizDemo --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
demo-app/demo-app-web/src/main/docker/Dockerfile
浏览文件 @ debc34dd
...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-app-web.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-app-web.jar
EXPOSE 8080 EXPOSE 51001
ADD demo-app-web.jar /demo-app-web.jar ADD demo-app-web.jar /demo-app-web.jar
demo-app/demo-app-web/src/main/docker/demo-app-web.yaml
浏览文件 @ debc34dd
...@@ -3,9 +3,24 @@ services: ...@@ -3,9 +3,24 @@ services:
demo-app-web: demo-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-app-web:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-app-web:latest
ports: ports:
- "8080:8080" - "51001:51001"
networks: networks:
- agent_network - 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: deploy:
resources: resources:
limits: limits:
......
demo-provider/demo-provider-demoapi/src/main/docker/Dockerfile
浏览文件 @ debc34dd
...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-provider-demoapi.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-provider-demoapi.jar
EXPOSE 51000 EXPOSE 8081
ADD demo-provider-demoapi.jar /demo-provider-demoapi.jar ADD demo-provider-demoapi.jar /demo-provider-demoapi.jar
demo-provider/demo-provider-demoapi/src/main/docker/demo-provider-demoapi.yaml
浏览文件 @ debc34dd
...@@ -3,24 +3,9 @@ services: ...@@ -3,24 +3,9 @@ services:
demo-provider-demoapi: demo-provider-demoapi:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest
ports: ports:
- "51000:51000" - "8081:8081"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=51000
- 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: deploy:
resources: resources:
limits: limits:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或