Skip to content

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

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

上级 8c834991
显示空白字符变更
内嵌 并排
正在显示 包含 469 行增加 和 444 行删除
app_Web/src/components/app-panel-field/app-panel-field.vue
浏览文件 @ d2a70bb6
<template>
<div :class="classes">
<div v-if="Object.is(labelPos,'NONE') || !labelPos" class="editor">
<div :class="valueCheck == true ?'':'editorstyle'">
<slot ></slot>
<span :class="error ? 'errorstyle':''">{{error}}</span>
<div :class="curClassName" :style="curStyle">
<div v-if="Object.is(labelPos, 'NONE') || !labelPos" class="editor">
<div :class="valueCheck == true ? '' : 'editorstyle'">
<slot></slot>
<span :class="error ? 'errorstyle' : ''">{{ error }}</span>
</div>
</div>
<div v-if="!Object.is(labelPos,'NONE')" class="app-panel-field-label">
<span v-if="required" style="color:red;">* </span>
{{isEmptyCaption ? '' : caption}}
<div v-if="!Object.is(labelPos, 'NONE')" class="app-panel-field-label">
<span v-if="required" style="color: red">* </span>
<span v-if="showCaption">{{caption}}</span>
</div>
<div v-if="Object.is(labelPos,'BOTTOM') || Object.is(labelPos,'TOP') || Object.is(labelPos,'LEFT') || Object.is(labelPos,'RIGHT')" class="editor">
<div :class="valueCheck == true ?'':'editorstyle'">
<slot ></slot>
<span :class="error ? 'errorstyle':''">{{error}}</span>
<div
v-if="
Object.is(labelPos, 'BOTTOM') ||
Object.is(labelPos, 'TOP') ||
Object.is(labelPos, 'LEFT') ||
Object.is(labelPos, 'RIGHT')
"
class="editor"
>
<div :class="valueCheck == true ? '' : 'editorstyle'">
<slot></slot>
<span :class="error ? 'errorstyle' : ''">{{ error }}</span>
</div>
</div>
</div>
......@@ -29,113 +37,130 @@ export default class AppPanelField extends Vue {
* @type {string}
* @memberof AppPanelField
*/
@Prop() public caption!: string;
@Prop() public name!: string;
/**
* 错误信息
* 标题
*
* @type {string}
* @memberof AppPanelField
*/
@Prop() public error?: string;
@Prop() public caption!: string;
/**
* 标签位置
* 下标
*
* @type {(string | 'BOTTOM' | 'LEFT' | 'NONE' | 'RIGHT' | 'TOP')}
* @type {string}
* @memberof AppPanelField
*/
@Prop() public labelPos?:
| string
| "BOTTOM"
| "LEFT"
| "NONE"
| "RIGHT"
| "TOP";
@Prop({ default: 0 }) public index?: number;
/**
* 标签是否空白
* 编辑器值
*
* @type {boolean}
* @type {any}
* @memberof AppPanelField
*/
@Prop() public isEmptyCaption?: boolean;
@Prop() public value!: any;
/**
* 列表项名称
* 布局模型详情
*
* @type {string}
* @type {*}
* @memberof AppPanelField
*/
@Prop() public name!: string;
@Prop() public layoutModelDetails!: any;
/**
* 面板数据
* 项名称
*
* @type {any}
* @memberof AppPanelField
*/
@Prop() public data!: any;
get itemName() {
return this.index ? `${this.name}_${this.index}` : this.name;
}
/**
* 编辑器值
* 显示标题
*
* @type {any}
* @memberof AppPanelField
*/
@Prop() public value !: any;
get showCaption() {
const layoutModel = this.layoutModelDetails[this.itemName];
if (layoutModel) {
return layoutModel.isShowCaption;
}
}
/**
* 值规则
* 类名
*
* @type {string}
* @memberof AppPanelField
*/
@Prop() public itemRules!: any;
get curClassName() {
const layoutModel = this.layoutModelDetails[this.itemName];
if (layoutModel) {
let posClass = "";
switch (layoutModel.labelPos) {
case "TOP":
posClass = "label-top";
break;
case "LEFT":
posClass = "label-left";
break;
case "BOTTOM":
posClass = "label-bottom";
break;
case "RIGHT":
posClass = "label-right";
break;
case "NONE":
posClass = "label-none";
break;
}
return `app-panel-field ${posClass} ${this.itemName} ${layoutModel.sysCss}`;
}
}
/**
* 是否必填
* 样式
*
* @type {boolean}
* @memberof AppPanelField
*/
public required: boolean = false;
get curStyle() {
const layoutModel = this.layoutModelDetails[this.itemName];
if (layoutModel) {
return layoutModel.getElementStyle();
}
}
/**
* 值规则数组
* 标签位置
*
* @type {any[]}
* @memberof AppPanelField
*/
public rules: any[] = [];
get labelPos() {
const layoutModel = this.layoutModelDetails[this.itemName];
if (layoutModel) {
return layoutModel.labelPos || "LEFT";
}
return "LEFT";
}
/**
* 值规则监控
* 必填
*
* @param {*} newVal
* @param {*} oldVal
* @memberof AppPanelField
*/
@Watch("itemRules", { deep: true })
onItemRulesChange(newVal: any, oldVal: any) {
if (newVal) {
try {
this.rules = [];
const _rules: any[] = newVal;
this.rules = [..._rules];
this.rules.some((rule: any) => {
if (rule.hasOwnProperty("required")) {
this.required = rule.required;
return true;
}
return false;
});
} catch (error) {}
get required() {
const layoutModel = this.layoutModelDetails[this.itemName];
if (layoutModel) {
return layoutModel.required;
}
}
/**
* 编辑器样式
* 值校验
*
* @type {boolean}
* @memberof AppPanelField
......@@ -150,63 +175,13 @@ export default class AppPanelField extends Vue {
* @memberof AppPanelField
*/
@Watch("value")
ItemValueRules(newVal: any, oldVal: any) {
if(this.required && !newVal) {
itemValueRules(newVal: any, oldVal: any) {
if (this.required && !newVal) {
this.valueCheck = false;
}else{
} else {
this.valueCheck = true;
}
}
/**
* 计算样式
*
* @readonly
* @type {string []}
* @memberof AppPanelField
*/
get classes(): string[] {
let posClass = "";
switch (this.labelPos) {
case "TOP":
posClass = "label-top";
break;
case "LEFT":
posClass = "label-left";
break;
case "BOTTOM":
posClass = "label-bottom";
break;
case "RIGHT":
posClass = "label-right";
break;
case "NONE":
posClass = "label-none";
break;
}
return [ "app-panel-field", posClass ];
}
/**
* vue 生命周期
*
* @memberof AppPanelField
*/
public mounted() {
if (this.itemRules) {
try {
const _rules: any[] = this.itemRules;
this.rules = [..._rules];
this.rules.some((rule: any) => {
if (rule.hasOwnProperty("required")) {
this.required = rule.required;
return true;
}
return false;
});
} catch (error) {}
}
}
}
</script>
<style lang='less'>
......
app_Web/src/pages/sample/ibizcustomer-usr2-pickup-view-layout/ibizcustomer-usr2-pickup-view-layout-base.vue
浏览文件 @ d2a70bb6
......@@ -269,7 +269,7 @@ export default class IBIZCustomerUsr2PickupView_layoutBase extends Vue {
*/
public layoutItems:any = {
pickupviewpanel:{ name: 'pickupviewpanel', type: 'VIEWLAYOUT', caption: 'PICKUPVIEWPANEL部件', isShowCaption: true, sysCss: '', itemType: 'CTRLPOS', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'', layoutPos:'CENTER', layoutHeight:0, heightMode:'FULL', layoutWidth:0, widthMode:'FULL', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll_main1', panel: this },
container_scroll_main1:{ name: 'container_scroll_main1', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:100, widthMode:'PX', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['pickupviewpanel'] , dataRegionType: 'INHERIT' },
container_scroll_main1:{ name: 'container_scroll_main1', type: 'VIEWLAYOUT', caption: '面板容器', titleBarCloseMode: 0, isShowCaption: true, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'CENTER', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, parentName: 'container_scroll1', panel: this , details:['pickupviewpanel'] , dataRegionType: 'INHERIT' },
container_scroll1:{ name: 'container_scroll1', type: 'VIEWLAYOUT', caption: '滚动条容器', titleBarCloseMode: 0, isShowCaption: false, sysCss: '', itemType: 'CONTAINER', itemStyle: 'DEFAULT', visible: true, disabled: false, layout:'BORDER', layoutPos:'', layoutHeight:0, heightMode:'', layoutWidth:0, widthMode:'', spacingBottom:'', spacingLeft:'', spacingRight:'', spacingTop:'', hAlignSelf:'', vAlignSelf:'', flexGrow:0, flexParams:{align:'',dir:'',vAlign:''}, panel: this , details:['container_scroll_main1'] , dataRegionType: 'INHERIT' }
};
......
app_Web/src/pages/sample/index/page-register.ts
浏览文件 @ d2a70bb6
......@@ -207,7 +207,6 @@ export const PageComponents = {
Vue.component('ibizuniproduct-pickup-grid-view', () => import('@pages/sample/ibizuniproduct-pickup-grid-view/ibizuniproduct-pickup-grid-view.vue'));
Vue.component('ibizorder-detail-edit-view', () => import('@pages/sample/ibizorder-detail-edit-view/ibizorder-detail-edit-view.vue'));
Vue.component('ibizorder-detail-sedit-view9', () => import('@pages/sample/ibizorder-detail-sedit-view9/ibizorder-detail-sedit-view9.vue'));
Vue.component('ibizcustomer-pickup-tree-view-layout', () => import('@pages/sample/ibizcustomer-pickup-tree-view-layout/ibizcustomer-pickup-tree-view-layout.vue'));
Vue.component('ibizcustomer-pickup-tree-view', () => import('@pages/sample/ibizcustomer-pickup-tree-view/ibizcustomer-pickup-tree-view.vue'));
Vue.component('ibizhardware-index-pickup-view', () => import('@pages/sample/ibizhardware-index-pickup-view/ibizhardware-index-pickup-view.vue'));
Vue.component('ibizcpuedit-view', () => import('@pages/sample/ibizcpuedit-view/ibizcpuedit-view.vue'));
......
app_Web/src/pages/sample/index/router.ts
浏览文件 @ d2a70bb6
......@@ -3170,20 +3170,6 @@ const router = new Router({
},
component: () => import('@pages/sample/ibizorder-detail-sedit-view9/ibizorder-detail-sedit-view9.vue'),
},
{
path: 'ibizcustomers/:ibizcustomer?/pickuptreeview_layout/:pickuptreeview_layout?',
meta: {
caption: 'entities.ibizcustomer.views.pickuptreeview_layout.caption',
info:'',
parameters: [
{ pathName: 'index', parameterName: 'index' },
{ pathName: 'ibizcustomers', parameterName: 'ibizcustomer' },
{ pathName: 'pickuptreeview_layout', parameterName: 'pickuptreeview_layout' },
],
requireAuth: true,
},
component: () => import('@pages/sample/ibizcustomer-pickup-tree-view-layout/ibizcustomer-pickup-tree-view-layout.vue'),
},
{
path: 'ibizcustomers/:ibizcustomer?/pickuptreeview/:pickuptreeview?',
meta: {
......@@ -3446,19 +3432,6 @@ const router = new Router({
},
component: () => import('@pages/sample/ibizcustomer-pickup-grid-view/ibizcustomer-pickup-grid-view.vue'),
},
{
path: '/ibizcustomers/:ibizcustomer?/pickuptreeview_layout/:pickuptreeview_layout?',
meta: {
caption: 'entities.ibizcustomer.views.pickuptreeview_layout.caption',
info:'',
parameters: [
{ pathName: 'ibizcustomers', parameterName: 'ibizcustomer' },
{ pathName: 'pickuptreeview_layout', parameterName: 'pickuptreeview_layout' },
],
requireAuth: true,
},
component: () => import('@pages/sample/ibizcustomer-pickup-tree-view-layout/ibizcustomer-pickup-tree-view-layout.vue'),
},
{
path: '/ibizappviews/:ibizappview?/editview/:editview?',
meta: {
......
app_Web/src/pages/ungroup/app-index-view/router.ts
浏览文件 @ d2a70bb6
......@@ -170,19 +170,6 @@ const router = new Router({
},
component: () => import('@pages/sample/ibizcustomer-pickup-grid-view/ibizcustomer-pickup-grid-view.vue'),
},
{
path: '/ibizcustomers/:ibizcustomer?/pickuptreeview_layout/:pickuptreeview_layout?',
meta: {
caption: 'entities.ibizcustomer.views.pickuptreeview_layout.caption',
info:'',
parameters: [
{ pathName: 'ibizcustomers', parameterName: 'ibizcustomer' },
{ pathName: 'pickuptreeview_layout', parameterName: 'pickuptreeview_layout' },
],
requireAuth: true,
},
component: () => import('@pages/sample/ibizcustomer-pickup-tree-view-layout/ibizcustomer-pickup-tree-view-layout.vue'),
},
{
path: '/ibizappviews/:ibizappview?/editview/:editview?',
meta: {
......
app_Web/src/store/modules/view-action/state.ts
浏览文件 @ d2a70bb6
......@@ -95,15 +95,6 @@ export const viewstate: any = {
refviews: [
],
},
{
viewtag: '091e4dfadeea5cf542e5e01a758a3b93',
viewmodule: 'Sample',
viewname: 'IBIZCustomerPickupTreeView_layout',
viewaction: '',
viewdatachange: false,
refviews: [
],
},
{
viewtag: '0a96057cbca72b445776fb056be79ea8',
viewmodule: 'Sample',
......@@ -2152,7 +2143,7 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'091e4dfadeea5cf542e5e01a758a3b93',
'2dd50b1b88cf8062b625ee8b0b4fa9d7',
],
},
{
......
app_Web/src/styles/default.less
浏览文件 @ d2a70bb6
......@@ -310,6 +310,11 @@
.ibiz-page-tag .tag-tabs .el-tabs .el-tabs__nav {
padding: 0;
}
.app-ctrl-pos.toolbar {
.ivu-btn {
margin: 6px 0 4px 4px;
}
}
}
.app-view-layout__appindexview {
padding: 0;
......
app_Web/src/widgets/ibizbook/default-searchform/default-searchform-base.vue
浏览文件 @ d2a70bb6
......@@ -671,7 +671,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
public load(opt: any = {}): void {
if(!this.loadAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCustomView_layout' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
return;
}
const arg: any = { ...opt };
......@@ -707,7 +707,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
public loadDraft(opt: any = {},mode?:string): void {
if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCustomView_layout' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
return;
}
const arg: any = { ...opt } ;
......
app_Web/src/widgets/ibizbook/guide-borrow-form-form/guide-borrow-form-form-base.vue
浏览文件 @ d2a70bb6
......@@ -1308,7 +1308,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
*/
public load(opt: any = {}): void {
if(!this.loadAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
return;
}
const arg: any = { ...opt };
......@@ -1343,7 +1343,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
*/
public loadDraft(opt: any = {}): void {
if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
return;
}
const arg: any = { ...opt } ;
......@@ -1404,7 +1404,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if(!action){
let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
return;
}
Object.assign(arg,{viewparams:this.viewparams});
......@@ -1512,7 +1512,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if(!action){
let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
return;
}
Object.assign(arg,{viewparams:this.viewparams});
......@@ -1586,7 +1586,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
return new Promise((resolve: any, reject: any) => {
if(!this.removeAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
return;
}
const arg: any = opt[0];
......
app_Web/src/widgets/ibizbook/guide-return-form-form/guide-return-form-form-base.vue
浏览文件 @ d2a70bb6
......@@ -1274,7 +1274,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
*/
public load(opt: any = {}): void {
if(!this.loadAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
return;
}
const arg: any = { ...opt };
......@@ -1309,7 +1309,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
*/
public loadDraft(opt: any = {}): void {
if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
return;
}
const arg: any = { ...opt } ;
......@@ -1370,7 +1370,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if(!action){
let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
return;
}
Object.assign(arg,{viewparams:this.viewparams});
......@@ -1478,7 +1478,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if(!action){
let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
return;
}
Object.assign(arg,{viewparams:this.viewparams});
......@@ -1552,7 +1552,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
return new Promise((resolve: any, reject: any) => {
if(!this.removeAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
return;
}
const arg: any = opt[0];
......
app_Web/src/widgets/ibizbook/guide-view-form-form/guide-view-form-form-base.vue
浏览文件 @ d2a70bb6
......@@ -1377,7 +1377,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
*/
public load(opt: any = {}): void {
if(!this.loadAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
return;
}
const arg: any = { ...opt };
......@@ -1412,7 +1412,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
*/
public loadDraft(opt: any = {}): void {
if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
return;
}
const arg: any = { ...opt } ;
......@@ -1473,7 +1473,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if(!action){
let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
return;
}
Object.assign(arg,{viewparams:this.viewparams});
......@@ -1581,7 +1581,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if(!action){
let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
return;
}
Object.assign(arg,{viewparams:this.viewparams});
......@@ -1655,7 +1655,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
return new Promise((resolve: any, reject: any) => {
if(!this.removeAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
return;
}
const arg: any = opt[0];
......
app_Web/src/widgets/ibizcustomer/usr2-pickup-view-layoutpickupviewpanel-pickupviewpanel/usr2-pickup-view-layoutpickupviewpanel-pickupviewpanel-base.vue
浏览文件 @ d2a70bb6
......@@ -195,7 +195,7 @@ export default class Usr2PickupView_layoutpickupviewpanelBase extends Vue implem
* @memberof Usr2PickupView_layoutpickupviewpanelBase
*/
public view: any = {
viewname: 'ibizcustomer-pickup-tree-view-layout',
viewname: 'ibizcustomer-usr2-pickup-view',
data: {},
}
......
app_Web/src/widgets/ibizorder-detail/main-grid/main-grid-base.vue
浏览文件 @ d2a70bb6
......@@ -914,7 +914,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public load(opt: any = {}, pageReset: boolean = false): void {
if(!this.fetchAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return;
}
if(pageReset){
......@@ -1009,7 +1009,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public async remove(datas: any[]): Promise<any> {
if(!this.removeAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
return;
}
let _datas:any[] = [];
......@@ -1115,7 +1115,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public addBatch(arg: any = {}): void {
if(!this.fetchAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return;
}
if(!arg){
......@@ -1995,7 +1995,7 @@ export default class MainBase extends Vue implements ControlInterface {
try {
if(Object.is(item.rowDataState, 'create')){
if(!this.createAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.createAction') as string) });
}else{
Object.assign(item,{viewparams:this.viewparams});
let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
......@@ -2003,7 +2003,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
}else if(Object.is(item.rowDataState, 'update')){
if(!this.updateAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
}else{
Object.assign(item,{viewparams:this.viewparams});
if(item.ibizorderdetail){
......@@ -2070,7 +2070,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailSGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderDetailGridView9'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
return;
}
let _this = this;
......
app_Web/src/widgets/ibizorder-detail/main-grid/main-grid-model.ts
浏览文件 @ d2a70bb6
......@@ -96,7 +96,6 @@ export default class MainModel {
name: 'ibizorderdetail',
prop: 'ibizorderdetailid',
},
{
name:'size',
prop:'size',
......
app_Web/src/widgets/ibizorder/main-grid/main-grid-base.vue
浏览文件 @ d2a70bb6
......@@ -299,7 +299,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @param {*} [$event] 事件源
* @param {*} [xData] 执行行为所需当前部件
* @param {*} [actionContext] 执行行为上下文
* @memberof IBIZOrderPickupGridViewBase
* @memberof IBIZOrderSF1GridViewBase
*/
public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
if (args.length === 0) {
......@@ -421,6 +421,20 @@ export default class MainBase extends Vue implements ControlInterface {
return this.selections[0];
}
/**
* 打开新建数据视图
*
* @type {any}
* @memberof MainBase
*/
@Prop() public newdata: any;
/**
* 打开编辑数据视图
*
* @type {any}
* @memberof MainBase
*/
@Prop() public opendata: any;
/**
* 是否嵌入关系界面
......@@ -953,7 +967,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public load(opt: any = {}, pageReset: boolean = false): void {
if(!this.fetchAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return;
}
if(pageReset){
......@@ -1048,7 +1062,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public async remove(datas: any[]): Promise<any> {
if(!this.removeAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
return;
}
let _datas:any[] = [];
......@@ -1154,7 +1168,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public addBatch(arg: any = {}): void {
if(!this.fetchAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
return;
}
if(!arg){
......@@ -2071,7 +2085,7 @@ export default class MainBase extends Vue implements ControlInterface {
try {
if(Object.is(item.rowDataState, 'create')){
if(!this.createAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
}else{
Object.assign(item,{viewparams:this.viewparams});
let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
......@@ -2079,7 +2093,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
}else if(Object.is(item.rowDataState, 'update')){
if(!this.updateAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
}else{
Object.assign(item,{viewparams:this.viewparams});
if(item.ibizorder){
......@@ -2146,7 +2160,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSF1GridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
return;
}
let _this = this;
......
app_Web/src/widgets/ibizorder/main-grid/main-grid-model.ts
浏览文件 @ d2a70bb6
......@@ -104,6 +104,21 @@ export default class MainModel {
prop: 'n_ibizordername_like',
dataType: 'QUERYPARAM'
},
{
name: 'n_orderstate_eq',
prop: 'n_orderstate_eq',
dataType: 'QUERYPARAM'
},
{
name: 'n_ordertime_gt',
prop: 'n_ordertime_gt',
dataType: 'QUERYPARAM'
},
{
name: 'n_ordertime_lt',
prop: 'n_ordertime_lt',
dataType: 'QUERYPARAM'
},
{
name:'size',
......
app_Web/src/widgets/ibizorder/sform-form/sform-form-base.vue
浏览文件 @ d2a70bb6
......@@ -1553,7 +1553,7 @@ export default class SFormBase extends Vue implements ControlInterface {
*/
public load(opt: any = {}): void {
if(!this.loadAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderTestCLEditView2' + (this.$t('app.formpage.notconfig.loadaction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSEditView3' + (this.$t('app.formpage.notconfig.loadaction') as string) });
return;
}
const arg: any = { ...opt };
......@@ -1588,7 +1588,7 @@ export default class SFormBase extends Vue implements ControlInterface {
*/
public loadDraft(opt: any = {}): void {
if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderTestCLEditView2' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSEditView3' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
return;
}
const arg: any = { ...opt } ;
......@@ -1650,7 +1650,7 @@ export default class SFormBase extends Vue implements ControlInterface {
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if(!action){
let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderTestCLEditView2' + (this.$t('app.formpage.notconfig.actionname') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSEditView3' + (this.$t('app.formpage.notconfig.actionname') as string) });
return;
}
Object.assign(arg,{viewparams:this.viewparams});
......@@ -1758,7 +1758,7 @@ export default class SFormBase extends Vue implements ControlInterface {
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if(!action){
let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderTestCLEditView2' + (this.$t('app.formpage.notconfig.actionname') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSEditView3' + (this.$t('app.formpage.notconfig.actionname') as string) });
return;
}
Object.assign(arg,{viewparams:this.viewparams});
......@@ -1835,7 +1835,7 @@ export default class SFormBase extends Vue implements ControlInterface {
public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
return new Promise((resolve: any, reject: any) => {
if(!this.removeAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderTestCLEditView2' + (this.$t('app.formpage.notconfig.removeaction') as string) });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZOrderSEditView3' + (this.$t('app.formpage.notconfig.removeaction') as string) });
return;
}
const arg: any = opt[0];
......
demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZCustomerUsr2PickupView_layout.json
浏览文件 @ d2a70bb6
......@@ -30,11 +30,37 @@
"lanResTag" : "DE.LNAME.IBIZCUSTOMER"
},
"caption" : "客户",
"codeName" : "IBIZCustomerPickupTreeView_layout",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZCustomerPickupTreeView_layout.json",
"codeName" : "IBIZCustomerUsr2PickupView",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZCustomerUsr2PickupView.json",
"name" : "IBIZCustomerUsr2PickupView",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
},
"getPSAppViewEngines" : [ {
"engineCat" : "VIEW",
"engineType" : "PickupView",
"name" : "engine",
"getPSUIEngineParams" : [ {
"ctrlName" : "pickupviewpanel",
"name" : "PICKUPVIEWPANEL",
"paramType" : "CTRL"
} ]
} ],
"getPSControls" : [ {
"codeName" : "Usr2PickupViewpickupviewpanel",
"controlType" : "PICKUPVIEWPANEL",
"getEmbeddedPSAppDEView" : {
"accUserMode" : 2,
"getCapPSLanguageRes" : {
"lanResTag" : "DE.LNAME.IBIZCUSTOMER"
},
"caption" : "客户",
"codeName" : "IBIZCustomerPickupTreeView",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZCustomerPickupTreeView.json",
"height" : 500,
"mDCtrlActiveMode" : 2,
"name" : "IBIZCustomerPickupTreeView_layout",
"name" : "IBIZCustomerPickupTreeView",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
......@@ -280,8 +306,8 @@
"modelid" : "9315d1e615ea222d35c5444c302d3a77",
"modeltype" : "PSDETREEVIEW"
} ],
"getPSDEViewCodeName" : "PickupTreeView_layout",
"getPSDEViewId" : "9B091CA1-EE0B-4D85-BC03-6D1C379E4203",
"getPSDEViewCodeName" : "PickupTreeView",
"getPSDEViewId" : "702f3e21fa6fff77cb54ea007059d37f",
"getPSViewLayoutPanel" : {
"codeName" : "Layoutpanel",
"controlStyle" : "APPDEPICKUPTREEVIEW",
......@@ -305,7 +331,51 @@
"enableFilter" : false,
"expandSearchForm" : true,
"pickupMode" : true,
"modelid" : "091e4dfadeea5cf542e5e01a758a3b93",
"modelid" : "6a079bac1a6eeb580654cd04e6b1a8b8",
"modeltype" : "PSAPPDEVIEW"
},
"hookEventNames" : [ "SELECTIONCHANGE", "LOAD", "ACTIVATED" ],
"name" : "pickupviewpanel",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
},
"getPSControlLogics" : [ {
"eventNames" : "SELECTIONCHANGE;LOAD;ACTIVATED",
"logicTag" : "pickupviewpanel",
"logicType" : "APPVIEWENGINE",
"name" : "engine_pickupviewpanel",
"getPSAppViewEngine" : {
"modelref" : true,
"id" : "engine"
}
} ],
"getPSControlParam" : {
"id" : "PICKUPVIEWPANEL"
}
} ],
"getPSDEViewCodeName" : "Usr2PickupView",
"getPSDEViewId" : "3cec9e89ad2bef1ce183afa656480c70",
"getPSViewLayoutPanel" : {
"codeName" : "Layoutpanel",
"controlStyle" : "APPDEPICKUPVIEW",
"controlType" : "VIEWLAYOUTPANEL",
"name" : "layoutpanel",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZCustomer.json"
},
"getPSControlParam" : { },
"layoutBodyOnly" : true,
"layoutPanel" : true,
"useDefaultLayout" : true
},
"title" : "客户实体数据选择视图(树视图)",
"viewStyle" : "DEFAULT",
"viewType" : "DEPICKUPVIEW",
"enableDP" : true,
"showCaptionBar" : false,
"modelid" : "2dd50b1b88cf8062b625ee8b0b4fa9d7",
"modeltype" : "PSAPPDEVIEW"
},
"hookEventNames" : [ "SELECTIONCHANGE", "LOAD", "ACTIVATED" ],
......@@ -359,7 +429,6 @@
},
"getPSPanelItems" : [ {
"caption" : "面板容器",
"contentWidth" : 100.0,
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container_scroll_main1",
......@@ -368,9 +437,7 @@
},
"getPSLayoutPos" : {
"layout" : "BORDER",
"layoutPos" : "CENTER",
"width" : 100,
"widthMode" : "PX"
"layoutPos" : "CENTER"
},
"getPSPanelItems" : [ {
"caption" : "PICKUPVIEWPANEL部件",
......
demo-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ d2a70bb6
......@@ -278,7 +278,7 @@
<!--输出实体[IBIZCUSTOMER]数据结构 -->
<changeSet author="a_LAB01_df847bdfd" id="tab-ibizcustomer-188-10">
<changeSet author="a_LAB01_df847bdfd" id="tab-ibizcustomer-194-10">
<createTable tableName="T_IBIZCUSTOMER">
<column name="CREATEMAN" remarks="" type="VARCHAR(60)">
</column>
......
demo-core/src/main/resources/liquibase/view.xml
浏览文件 @ d2a70bb6
......@@ -19,7 +19,7 @@
</createView>
</changeSet>
<!--输出实体[IBIZCUSTOMER]视图结构信息 runOnChange="true" 当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
<changeSet author="a_LAB01_df847bdfd" id="view-ibizcustomer-188-4" runOnChange="true">
<changeSet author="a_LAB01_df847bdfd" id="view-ibizcustomer-194-4" runOnChange="true">
<createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZCUSTOMER">
<![CDATA[ SELECT t1.[ADDRESS], t1.[CREATEDATE], t1.[CREATEMAN], t1.[CUSTOMERUID], t1.[IBIZCUSTOMERID], t1.[IBIZCUSTOMERNAME], t1.[SN], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZCUSTOMER] t1 ]]>
</createView>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或