Skip to content

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

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

上级 6edc4a50
隐藏空白字符变更
内嵌 并排
正在显示 包含 386 行增加 和 240 行删除
app_Web/src/engine/view/exp-view-engine.ts
浏览文件 @ b0e80d81
...@@ -8,7 +8,6 @@ import ViewEngine from "./view-engine"; ...@@ -8,7 +8,6 @@ import ViewEngine from "./view-engine";
* @extends {ViewEngine} * @extends {ViewEngine}
*/ */
export class ExpViewEngine extends ViewEngine { export class ExpViewEngine extends ViewEngine {
/** /**
* 导航栏部件 * 导航栏部件
* *
...@@ -39,13 +38,13 @@ export class ExpViewEngine extends ViewEngine { ...@@ -39,13 +38,13 @@ export class ExpViewEngine extends ViewEngine {
/** /**
* 引擎加载 * 引擎加载
* *
* @memberof ExpViewEngine * @memberof ExpViewEngine
*/ */
public load() { public load() {
super.load(); super.load();
if (this.getExpBar() && this.isLoadDefault) { if (this.getExpBar() && this.isLoadDefault) {
const tag = this.getExpBar().name; const tag = this.getExpBar().name;
this.setViewState2({ tag: tag, action: 'load', viewdata: this.view.viewparams }); this.setViewState2({ tag: tag, action: "load", viewdata: this.view.viewparams });
} else { } else {
this.isLoadDefault = true; this.isLoadDefault = true;
} }
...@@ -60,7 +59,7 @@ export class ExpViewEngine extends ViewEngine { ...@@ -60,7 +59,7 @@ export class ExpViewEngine extends ViewEngine {
public search(data: any) { public search(data: any) {
const expBar = this.getExpBar(); const expBar = this.getExpBar();
if (expBar) { if (expBar) {
this.setViewState2({ tag: expBar.name, action: 'load', viewdata: null }); this.setViewState2({ tag: expBar.name, action: "load", viewdata: null });
} }
} }
...@@ -78,12 +77,12 @@ export class ExpViewEngine extends ViewEngine { ...@@ -78,12 +77,12 @@ export class ExpViewEngine extends ViewEngine {
/** /**
* 处理导航视图重绘(有选中项，且导航视图需要刷新则通知嵌入导航视图执行刷新逻辑) * 处理导航视图重绘(有选中项，且导航视图需要刷新则通知嵌入导航视图执行刷新逻辑)
* *
* @memberof ExpViewEngine * @memberof ExpViewEngine
*/ */
public handleNavViewRefresh(tag: string) { public handleNavViewRefresh(tag: string) {
if (this.view && this.view.viewState && this.isRealSelected) { if (this.view && this.view.viewState && this.isRealSelected) {
this.setViewState2({ tag, action: 'load', viewdata: this.view.viewparams }); this.setViewState2({ tag, action: "load", viewdata: this.view.viewparams });
} }
} }
...@@ -91,16 +90,16 @@ export class ExpViewEngine extends ViewEngine { ...@@ -91,16 +90,16 @@ export class ExpViewEngine extends ViewEngine {
* 事件处理 * 事件处理
* *
* @param {string} ctrlName 事件标识 * @param {string} ctrlName 事件标识
* @param {string} eventName * @param {string} eventName
* @param {*} args * @param {*} args
* @memberof ExpViewEngine * @memberof ExpViewEngine
*/ */
public onCtrlEvent(ctrlName: string, eventName: string, args: any) { public onCtrlEvent(ctrlName: string, eventName: string, args: any) {
const expBar = this.getExpBar(); const expBar = this.getExpBar();
if (ctrlName === expBar?.name) { if (expBar && ctrlName === expBar.name) {
this.handleExpBarEvents(eventName, args); this.handleExpBarEvents(eventName, args);
} }
if (ctrlName === expBar?.xDataControlName) { if (expBar && ctrlName === expBar.xDataControlName) {
this.handleXDataControlEvents(eventName, args); this.handleXDataControlEvents(eventName, args);
} }
} }
...@@ -114,15 +113,15 @@ export class ExpViewEngine extends ViewEngine { ...@@ -114,15 +113,15 @@ export class ExpViewEngine extends ViewEngine {
* @memberof ExpViewEngine * @memberof ExpViewEngine
*/ */
protected handleExpBarEvents(eventName: string, args: any) { protected handleExpBarEvents(eventName: string, args: any) {
if (Object.is(eventName, 'load')) { if (Object.is(eventName, "load")) {
this.view.$emit('viewload', args); this.view.$emit("viewload", args);
} }
if (Object.is(eventName, 'selectionchange')) { if (Object.is(eventName, "selectionchange")) {
if (this.isCloseNavView) { if (this.isCloseNavView) {
this.isCloseNavView = false; this.isCloseNavView = false;
return; return;
} }
if (this.view && args && args.srfnavdata && args.srfnavdata.context && args.srfnavdata.context.viewpath) { if (this.view && args && args.srfnavdata && args.srfnavdata.context) {
this.view.navItem = args; this.view.navItem = args;
if (this.view.backSplit !== 0) { if (this.view.backSplit !== 0) {
this.view.split = this.view.backSplit; this.view.split = this.view.backSplit;
...@@ -131,20 +130,20 @@ export class ExpViewEngine extends ViewEngine { ...@@ -131,20 +130,20 @@ export class ExpViewEngine extends ViewEngine {
if (args && args.data && args.data[0]) { if (args && args.data && args.data[0]) {
const selectedData = args.data[0]; const selectedData = args.data[0];
const result = Object.keys(selectedData).find((key: string) => { const result = Object.keys(selectedData).find((key: string) => {
return selectedData[key] !== null && key !== 'srfchecked'; return selectedData[key] !== null && key !== "srfchecked";
}) });
if(result){ if (result) {
this.isRealSelected = true; this.isRealSelected = true;
}else{ } else {
this.isRealSelected = false; this.isRealSelected = false;
} }
} }
this.view.$forceUpdate(); // this.view.$forceUpdate();
} }
this.view.$emit('viewdataschange', args?.data); this.view.$emit("viewdataschange", args && args.data ? args.data : []);
} }
if (Object.is(eventName, 'activated')) { if (Object.is(eventName, "activated")) {
this.view.$emit('viewdatasactivated', args); this.view.$emit("viewdatasactivated", args);
} }
} }
...@@ -157,7 +156,7 @@ export class ExpViewEngine extends ViewEngine { ...@@ -157,7 +156,7 @@ export class ExpViewEngine extends ViewEngine {
* @memberof ExpViewEngine * @memberof ExpViewEngine
*/ */
protected handleXDataControlEvents(eventName: string, args: any) { protected handleXDataControlEvents(eventName: string, args: any) {
if (Object.is(eventName, 'beforeload')) { if (Object.is(eventName, "beforeload")) {
this.handleBeforeLoad(args); this.handleBeforeLoad(args);
} }
} }
...@@ -178,7 +177,7 @@ export class ExpViewEngine extends ViewEngine { ...@@ -178,7 +177,7 @@ export class ExpViewEngine extends ViewEngine {
/** /**
* 获取导航栏 * 获取导航栏
* *
* @return {*} * @return {*}
* @memberof ExpViewEngine * @memberof ExpViewEngine
*/ */
public getExpBar() { public getExpBar() {
...@@ -192,4 +191,4 @@ export class ExpViewEngine extends ViewEngine { ...@@ -192,4 +191,4 @@ export class ExpViewEngine extends ViewEngine {
public destroyed() { public destroyed() {
this.expBar = null; this.expBar = null;
} }
} }
\ No newline at end of file
app_Web/src/pages/sample/ibizorder-grid-exp-view/ibizorder-grid-exp-view-base.vue
浏览文件 @ b0e80d81
...@@ -237,7 +237,6 @@ export default class IBIZOrderGridExpViewBase extends Vue { ...@@ -237,7 +237,6 @@ export default class IBIZOrderGridExpViewBase extends Vue {
* @memberof IBIZOrderGridExpViewBase * @memberof IBIZOrderGridExpViewBase
*/ */
public viewState: Subject<ViewState> = new Subject(); public viewState: Subject<ViewState> = new Subject();
/** /**
* 视图引擎 * 视图引擎
...@@ -575,7 +574,7 @@ export default class IBIZOrderGridExpViewBase extends Vue { ...@@ -575,7 +574,7 @@ export default class IBIZOrderGridExpViewBase extends Vue {
if (_this.loadModel && _this.loadModel instanceof Function) { if (_this.loadModel && _this.loadModel instanceof Function) {
_this.loadModel(); _this.loadModel();
} }
this.initSplit();
} }
...@@ -803,7 +802,24 @@ export default class IBIZOrderGridExpViewBase extends Vue { ...@@ -803,7 +802,24 @@ export default class IBIZOrderGridExpViewBase extends Vue {
* @memberof IBIZOrderGridExpViewBase * @memberof IBIZOrderGridExpViewBase
*/ */
public onSplitChange() { public onSplitChange() {
console.log(111, '分隔值变化', this.split); if (this.split) {
this.$store.commit("setViewSplit", { viewUID: this.viewUID, viewSplit: this.split });
}
}
/**
* 初始化分隔值
*
* @memberof IBIZOrderGridExpViewBase
*/
public initSplit() {
if (this.$store.getters.getViewSplit(this.viewUID)) {
this.split = this.$store.getters.getViewSplit(this.viewUID);
} else {
const containerWidth = (this.$el as any).offsetWidth;
this.split = 500 / containerWidth;
this.$store.commit("setViewSplit", { viewUID: this.viewUID, viewSplit: this.split });
}
} }
} }
......
app_Web/src/pages/sample/index/index-base.vue
浏览文件 @ b0e80d81
...@@ -209,19 +209,248 @@ export default class IndexBase extends Vue { ...@@ -209,19 +209,248 @@ export default class IndexBase extends Vue {
* @memberof IndexBase * @memberof IndexBase
*/ */
public layoutModelDetails:any = { public layoutModelDetails:any = {
nav_tabs1:new PanelCtrlPosModel({ caption: '标签页导航栏', itemType: 'CTRLPOS',visible: true, disabled: false, name: 'nav_tabs1', panel: this }), nav_tabs1:new PanelCtrlPosModel({ name: 'nav_tabs1',
nav_pos1:new PanelCtrlPosModel({ caption: '导航区占位', itemType: 'CTRLPOS',visible: true, disabled: false, name: 'nav_pos1', panel: this }), caption: '标签页导航栏',
container_scroll_main1:new PanelContainerModel({ caption: '面板容器', itemType: 'CONTAINER',visible: true, disabled: false, name: 'container_scroll_main1', panel: this, details:['nav_tabs1','nav_pos1']}), itemType: 'CTRLPOS',
appmenu1:new PanelCtrlPosModel({ caption: '首页菜单', itemType: 'CTRLPOS',visible: true, disabled: false, name: 'appmenu1', panel: this }), visible: true,
container_scroll_left1:new PanelContainerModel({ caption: '面板容器', itemType: 'CONTAINER',visible: true, disabled: false, name: 'container_scroll_left1', panel: this, details:['appmenu1']}), disabled: false,
app_apptitle:new PanelFieldModel({ caption: '应用标题', itemType: 'FIELD',visible: true, disabled: false, name: 'app_apptitle', panel: this }), layout:'BORDER',
container1:new PanelContainerModel({ caption: '面板容器', itemType: 'CONTAINER',visible: true, disabled: false, name: 'container1', panel: this, details:['app_apptitle']}), layoutPos：'CENTER',
container2:new PanelContainerModel({ caption: '面板容器', itemType: 'CONTAINER',visible: true, disabled: false, name: 'container2', panel: this, details:[]}), layoutHeight:'70',
auth_userinfo1:new PanelCtrlPosModel({ caption: '用户信息', itemType: 'CTRLPOS',visible: true, disabled: false, name: 'auth_userinfo1', panel: this }), heightMode:'PX',
container3:new PanelContainerModel({ caption: '面板容器', itemType: 'CONTAINER',visible: true, disabled: false, name: 'container3', panel: this, details:['auth_userinfo1']}), layoutWidth:'',
container_grid1:new PanelContainerModel({ caption: '栅格容器', itemType: 'CONTAINER',visible: true, disabled: false, name: 'container_grid1', panel: this, details:['container1','container2','container3']}), widthMode:'',
container_scroll_header1:new PanelContainerModel({ caption: '面板容器', itemType: 'CONTAINER',visible: true, disabled: false, name: 'container_scroll_header1', panel: this, details:['container_grid1']}), spacingBottom:'',
container_scroll1:new PanelContainerModel({ caption: '滚动条容器', itemType: 'CONTAINER',visible: true, disabled: false, name: 'container_scroll1', panel: this, details:['container_scroll_main1','container_scroll_left1','container_scroll_header1']}) spacingLeft:'',
spacingRight:'',
spacingTop:'',
hAlignSelf:'',
vAlignSelf:'',
panel: this }),
nav_pos1:new PanelCtrlPosModel({ name: 'nav_pos1',
caption: '导航区占位',
itemType: 'CTRLPOS',
visible: true,
disabled: false,
layout:'BORDER',
layoutPos：'CENTER',
layoutHeight:'',
heightMode:'',
layoutWidth:'',
widthMode:'',
spacingBottom:'',
spacingLeft:'',
spacingRight:'',
spacingTop:'',
hAlignSelf:'',
vAlignSelf:'',
panel: this }),
container_scroll_main1:new PanelContainerModel({ name: 'container_scroll_main1',
caption: '面板容器',
itemType: 'CONTAINER',
visible: true,
disabled: false,
layout:'BORDER',
layoutPos：'CENTER',
layoutHeight:'',
heightMode:'',
layoutWidth:'80',
widthMode:'PERCENTAGE',
spacingBottom:'',
spacingLeft:'',
spacingRight:'',
spacingTop:'',
hAlignSelf:'',
vAlignSelf:'',
panel: this,
details:['nav_tabs1','nav_pos1']}),
appmenu1:new PanelCtrlPosModel({ name: 'appmenu1',
caption: '首页菜单',
itemType: 'CTRLPOS',
visible: true,
disabled: false,
layout:'BORDER',
layoutPos：'CENTER',
layoutHeight:'',
heightMode:'',
layoutWidth:'',
widthMode:'',
spacingBottom:'',
spacingLeft:'',
spacingRight:'',
spacingTop:'',
hAlignSelf:'',
vAlignSelf:'',
panel: this }),
container_scroll_left1:new PanelContainerModel({ name: 'container_scroll_left1',
caption: '面板容器',
itemType: 'CONTAINER',
visible: true,
disabled: false,
layout:'BORDER',
layoutPos：'WEST',
layoutHeight:'',
heightMode:'',
layoutWidth:'20',
widthMode:'PERCENTAGE',
spacingBottom:'',
spacingLeft:'',
spacingRight:'',
spacingTop:'',
hAlignSelf:'',
vAlignSelf:'',
panel: this,
details:['appmenu1']}),
app_apptitle:new PanelFieldModel({ name: 'app_apptitle',
caption: '应用标题',
itemType: 'FIELD',
visible: true,
disabled: false,
layout:'SIMPLEFLEX',
layoutPos：'',
layoutHeight:'',
heightMode:'',
layoutWidth:'',
widthMode:'',
spacingBottom:'',
spacingLeft:'',
spacingRight:'',
spacingTop:'',
hAlignSelf:'',
vAlignSelf:'',
panel: this }),
container1:new PanelContainerModel({ name: 'container1',
caption: '面板容器',
itemType: 'CONTAINER',
visible: true,
disabled: false,
layout:'SIMPLEFLEX',
layoutPos：'',
layoutHeight:'',
heightMode:'',
layoutWidth:'',
widthMode:'',
spacingBottom:'',
spacingLeft:'',
spacingRight:'',
spacingTop:'',
hAlignSelf:'',
vAlignSelf:'',
panel: this,
details:['app_apptitle']}),
container2:new PanelContainerModel({ name: 'container2',
caption: '面板容器',
itemType: 'CONTAINER',
visible: true,
disabled: false,
layout:'SIMPLEFLEX',
layoutPos：'',
layoutHeight:'',
heightMode:'',
layoutWidth:'',
widthMode:'',
spacingBottom:'',
spacingLeft:'',
spacingRight:'',
spacingTop:'',
hAlignSelf:'',
vAlignSelf:'',
panel: this,
details:[]}),
auth_userinfo1:new PanelCtrlPosModel({ name: 'auth_userinfo1',
caption: '用户信息',
itemType: 'CTRLPOS',
visible: true,
disabled: false,
layout:'SIMPLEFLEX',
layoutPos：'',
layoutHeight:'',
heightMode:'',
layoutWidth:'',
widthMode:'',
spacingBottom:'',
spacingLeft:'',
spacingRight:'',
spacingTop:'',
hAlignSelf:'',
vAlignSelf:'',
panel: this }),
container3:new PanelContainerModel({ name: 'container3',
caption: '面板容器',
itemType: 'CONTAINER',
visible: true,
disabled: false,
layout:'SIMPLEFLEX',
layoutPos：'',
layoutHeight:'',
heightMode:'',
layoutWidth:'',
widthMode:'',
spacingBottom:'',
spacingLeft:'',
spacingRight:'',
spacingTop:'',
hAlignSelf:'',
vAlignSelf:'',
panel: this,
details:['auth_userinfo1']}),
container_grid1:new PanelContainerModel({ name: 'container_grid1',
caption: '栅格容器',
itemType: 'CONTAINER',
visible: true,
disabled: false,
layout:'BORDER',
layoutPos：'CENTER',
layoutHeight:'',
heightMode:'',
layoutWidth:'',
widthMode:'',
spacingBottom:'',
spacingLeft:'',
spacingRight:'',
spacingTop:'',
hAlignSelf:'',
vAlignSelf:'',
panel: this,
details:['container1','container2','container3']}),
container_scroll_header1:new PanelContainerModel({ name: 'container_scroll_header1',
caption: '面板容器',
itemType: 'CONTAINER',
visible: true,
disabled: false,
layout:'BORDER',
layoutPos：'NORTH',
layoutHeight:'80',
heightMode:'PX',
layoutWidth:'',
widthMode:'',
spacingBottom:'',
spacingLeft:'',
spacingRight:'',
spacingTop:'',
hAlignSelf:'',
vAlignSelf:'',
panel: this,
details:['container_grid1']}),
container_scroll1:new PanelContainerModel({ name: 'container_scroll1',
caption: '滚动条容器',
itemType: 'CONTAINER',
visible: true,
disabled: false,
layout:'FLEX',
layoutPos：'',
layoutHeight:'',
heightMode:'',
layoutWidth:'',
widthMode:'',
spacingBottom:'',
spacingLeft:'',
spacingRight:'',
spacingTop:'',
hAlignSelf:'',
vAlignSelf:'',
panel: this,
details:['container_scroll_main1','container_scroll_left1','container_scroll_header1']})
}; };
......
app_Web/src/widgets/ibizbook/book-calendar-major-state-calendar/book-calendar-major-state-calendar-service.ts
浏览文件 @ b0e80d81
...@@ -93,11 +93,11 @@ export default class BookCalendarMajorStateService extends ControlService { ...@@ -93,11 +93,11 @@ export default class BookCalendarMajorStateService extends ControlService {
_data.push(..._response.data); _data.push(..._response.data);
}); });
// 排序 // 排序
// _data.sort((a:any, b:any)=>{ _data.sort((a:any, b:any)=>{
// let dateA = new Date(Date.parse(a.start?.replace(/-/g, "/"))); let dateA = new Date(Date.parse(a.start?.replace(/-/g, "/")));
// let dateB = new Date(Date.parse(b.start?.replace(/-/g, "/"))); let dateB = new Date(Date.parse(b.start?.replace(/-/g, "/")));
// return dateA > dateB ? 1 : -1 ; return dateA > dateB ? 1 : -1 ;
// }); });
let result = {status: 200, data: _data}; let result = {status: 200, data: _data};
resolve(result); resolve(result);
}).catch((response: any) => { }).catch((response: any) => {
......
app_Web/src/widgets/ibizbook/custom-calendar-calendar/custom-calendar-calendar-service.ts
浏览文件 @ b0e80d81
...@@ -93,11 +93,11 @@ export default class CustomCalendarService extends ControlService { ...@@ -93,11 +93,11 @@ export default class CustomCalendarService extends ControlService {
_data.push(..._response.data); _data.push(..._response.data);
}); });
// 排序 // 排序
// _data.sort((a:any, b:any)=>{ _data.sort((a:any, b:any)=>{
// let dateA = new Date(Date.parse(a.start?.replace(/-/g, "/"))); let dateA = new Date(Date.parse(a.start?.replace(/-/g, "/")));
// let dateB = new Date(Date.parse(b.start?.replace(/-/g, "/"))); let dateB = new Date(Date.parse(b.start?.replace(/-/g, "/")));
// return dateA > dateB ? 1 : -1 ; return dateA > dateB ? 1 : -1 ;
// }); });
let result = {status: 200, data: _data}; let result = {status: 200, data: _data};
resolve(result); resolve(result);
}).catch((response: any) => { }).catch((response: any) => {
......
app_Web/src/widgets/ibizbook/default-searchform/default-searchform-base.vue
浏览文件 @ b0e80d81
...@@ -663,7 +663,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -663,7 +663,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/ */
public load(opt: any = {}): void { public load(opt: any = {}): void {
if(!this.loadAction){ if(!this.loadAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr8GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
return; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -699,7 +699,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -699,7 +699,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/ */
public loadDraft(opt: any = {},mode?:string): void { public loadDraft(opt: any = {},mode?:string): void {
if(!this.loaddraftAction){ if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr8GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
return; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
......
app_Web/src/widgets/ibizbook/group-by-codelist-kan-ban-kanban/group-by-codelist-kan-ban-kanban-base.vue
浏览文件 @ b0e80d81
...@@ -844,10 +844,10 @@ export default class GroupByCodelistKanBanBase extends Vue implements ControlInt ...@@ -844,10 +844,10 @@ export default class GroupByCodelistKanBanBase extends Vue implements ControlInt
* @memberof GroupByCodelistKanBanBase * @memberof GroupByCodelistKanBanBase
*/ */
public uiAction(tag: any, $event: any, group: any) { public uiAction(tag: any, $event: any, group: any) {
// let row = this.selections.length > 0 && group?.items.includes(this.selections[0])? this.selections[0] : {}; let row = this.selections.length > 0 && group?.items.includes(this.selections[0])? this.selections[0] : {};
// if(!row.hasOwnProperty('srfgroup')){ if(!row.hasOwnProperty('srfgroup')){
// Object.assign(row,{srfgroup: group? group.value:null}); Object.assign(row,{srfgroup: group? group.value:null});
// } }
} }
/** /**
......
app_Web/src/widgets/ibizbook/has-panel-kan-ban-kanban/has-panel-kan-ban-kanban-base.vue
浏览文件 @ b0e80d81
...@@ -844,10 +844,10 @@ export default class HasPanelKanBanBase extends Vue implements ControlInterface ...@@ -844,10 +844,10 @@ export default class HasPanelKanBanBase extends Vue implements ControlInterface
* @memberof HasPanelKanBanBase * @memberof HasPanelKanBanBase
*/ */
public uiAction(tag: any, $event: any, group: any) { public uiAction(tag: any, $event: any, group: any) {
// let row = this.selections.length > 0 && group?.items.includes(this.selections[0])? this.selections[0] : {}; let row = this.selections.length > 0 && group?.items.includes(this.selections[0])? this.selections[0] : {};
// if(!row.hasOwnProperty('srfgroup')){ if(!row.hasOwnProperty('srfgroup')){
// Object.assign(row,{srfgroup: group? group.value:null}); Object.assign(row,{srfgroup: group? group.value:null});
// } }
} }
/** /**
......
app_Web/src/widgets/ibizbook/ibizbookmonth-calendar/ibizbookmonth-calendar-service.ts
浏览文件 @ b0e80d81
...@@ -93,11 +93,11 @@ export default class IBIZBOOKMONTHService extends ControlService { ...@@ -93,11 +93,11 @@ export default class IBIZBOOKMONTHService extends ControlService {
_data.push(..._response.data); _data.push(..._response.data);
}); });
// 排序 // 排序
// _data.sort((a:any, b:any)=>{ _data.sort((a:any, b:any)=>{
// let dateA = new Date(Date.parse(a.start?.replace(/-/g, "/"))); let dateA = new Date(Date.parse(a.start?.replace(/-/g, "/")));
// let dateB = new Date(Date.parse(b.start?.replace(/-/g, "/"))); let dateB = new Date(Date.parse(b.start?.replace(/-/g, "/")));
// return dateA > dateB ? 1 : -1 ; return dateA > dateB ? 1 : -1 ;
// }); });
let result = {status: 200, data: _data}; let result = {status: 200, data: _data};
resolve(result); resolve(result);
}).catch((response: any) => { }).catch((response: any) => {
......
app_Web/src/widgets/ibizbook/ibizbookpanel-calendar/ibizbookpanel-calendar-service.ts
浏览文件 @ b0e80d81
...@@ -93,11 +93,11 @@ export default class IBIZBOOKPANELService extends ControlService { ...@@ -93,11 +93,11 @@ export default class IBIZBOOKPANELService extends ControlService {
_data.push(..._response.data); _data.push(..._response.data);
}); });
// 排序 // 排序
// _data.sort((a:any, b:any)=>{ _data.sort((a:any, b:any)=>{
// let dateA = new Date(Date.parse(a.start?.replace(/-/g, "/"))); let dateA = new Date(Date.parse(a.start?.replace(/-/g, "/")));
// let dateB = new Date(Date.parse(b.start?.replace(/-/g, "/"))); let dateB = new Date(Date.parse(b.start?.replace(/-/g, "/")));
// return dateA > dateB ? 1 : -1 ; return dateA > dateB ? 1 : -1 ;
// }); });
let result = {status: 200, data: _data}; let result = {status: 200, data: _data};
resolve(result); resolve(result);
}).catch((response: any) => { }).catch((response: any) => {
......
app_Web/src/widgets/ibizbook/ibizbooktimeline-calendar/ibizbooktimeline-calendar-service.ts
浏览文件 @ b0e80d81
...@@ -93,11 +93,11 @@ export default class IBIZBOOKTIMELINEService extends ControlService { ...@@ -93,11 +93,11 @@ export default class IBIZBOOKTIMELINEService extends ControlService {
_data.push(..._response.data); _data.push(..._response.data);
}); });
// 排序 // 排序
// _data.sort((a:any, b:any)=>{ _data.sort((a:any, b:any)=>{
// let dateA = new Date(Date.parse(a.start?.replace(/-/g, "/"))); let dateA = new Date(Date.parse(a.start?.replace(/-/g, "/")));
// let dateB = new Date(Date.parse(b.start?.replace(/-/g, "/"))); let dateB = new Date(Date.parse(b.start?.replace(/-/g, "/")));
// return dateA > dateB ? 1 : -1 ; return dateA > dateB ? 1 : -1 ;
// }); });
let result = {status: 200, data: _data}; let result = {status: 200, data: _data};
resolve(result); resolve(result);
}).catch((response: any) => { }).catch((response: any) => {
......
app_Web/src/widgets/ibizbook/inter-func-kanban-kanban/inter-func-kanban-kanban-base.vue
浏览文件 @ b0e80d81
...@@ -882,13 +882,13 @@ export default class InterFuncKanbanBase extends Vue implements ControlInterface ...@@ -882,13 +882,13 @@ export default class InterFuncKanbanBase extends Vue implements ControlInterface
* @memberof InterFuncKanbanBase * @memberof InterFuncKanbanBase
*/ */
public uiAction(tag: any, $event: any, group: any) { public uiAction(tag: any, $event: any, group: any) {
// let row = this.selections.length > 0 && group?.items.includes(this.selections[0])? this.selections[0] : {}; let row = this.selections.length > 0 && group?.items.includes(this.selections[0])? this.selections[0] : {};
// if(!row.hasOwnProperty('srfgroup')){ if(!row.hasOwnProperty('srfgroup')){
// Object.assign(row,{srfgroup: group? group.value:null}); Object.assign(row,{srfgroup: group? group.value:null});
// } }
// if(Object.is('openKanbanDocument', tag)) { if(Object.is('openKanbanDocument', tag)) {
// this.kanban_group_u7f86898_click(row, tag, $event); this.kanban_group_u7f86898_click(row, tag, $event);
// } }
} }
/** /**
......
app_Web/src/widgets/ibizbook/quicksearchform-searchform/quicksearchform-searchform-base.vue
浏览文件 @ b0e80d81
...@@ -621,7 +621,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface ...@@ -621,7 +621,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
*/ */
public load(opt: any = {}): void { public load(opt: any = {}): void {
if(!this.loadAction){ if(!this.loadAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
return; return;
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
...@@ -657,7 +657,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface ...@@ -657,7 +657,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
*/ */
public loadDraft(opt: any = {},mode?:string): void { public loadDraft(opt: any = {},mode?:string): void {
if(!this.loaddraftAction){ if(!this.loaddraftAction){
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
return; return;
} }
const arg: any = { ...opt } ; const arg: any = { ...opt } ;
......
app_Web/src/widgets/ibizorder/grid-exp-viewgridexpbar-gridexpbar/grid-exp-viewgridexpbar-gridexpbar-base.vue
浏览文件 @ b0e80d81
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<icon type='ios-home-outline'/>{{ $t('app.gridBar.title') }} <icon type='ios-home-outline'/>{{ $t('app.gridBar.title') }}
</div> </div>
</div> </div>
<div class="container-header"> <div class="exp-bar-action-container">
<div class='search-container'> <div class='search-container'>
<i-input <i-input
v-model="searchText" v-model="searchText"
...@@ -316,23 +316,6 @@ export default class GridExpViewgridexpbarBase extends Vue implements ControlInt ...@@ -316,23 +316,6 @@ export default class GridExpViewgridexpbarBase extends Vue implements ControlInt
public isSingleSelect:boolean = true; public isSingleSelect:boolean = true;
/**
* 呈现模式，可选值：horizontal或者vertical
*
* @public
* @type {(string)}
* @memberof GridExpViewgridexpbarBase
*/
public showMode:string ="horizontal";
/**
* 选中数据
*
* @type {*}
* @memberof GridExpViewgridexpbarBase
*/
public selection: any = {};
/** /**
* 可搜索字段名称 * 可搜索字段名称
* *
...@@ -340,7 +323,7 @@ export default class GridExpViewgridexpbarBase extends Vue implements ControlInt ...@@ -340,7 +323,7 @@ export default class GridExpViewgridexpbarBase extends Vue implements ControlInt
* @type {(string)} * @type {(string)}
* @memberof GridExpViewgridexpbarBase * @memberof GridExpViewgridexpbarBase
*/ */
public placeholder="订单名称"; public placeholder = "订单名称";
/** /**
* 搜素值 * 搜素值
......
app_Web/src/widgets/ibizorder/grid-exp-viewgridexpbar-gridexpbar/grid-exp-viewgridexpbar-gridexpbar.less
浏览文件 @ b0e80d81
.app-grid-exp-bar { .app-grid-exp-bar {
> .ivu-split-horizontal { height: 100%;
> .ivu-split-trigger-con { display: flex;
height: 100%; flex-direction: column;
width: 1px; .grid-exp-bar-header {
} line-height: 50px;
> .ivu-split-pane { border-bottom: 1px solid #ddd;
> div { .grid-exp-bar-title {
height: 100%; font-size: 18px;
overflow: auto; padding-left: 8px;
display: flex; i {
flex-direction: column; font-size: 20px;
.grid-exp-bar-header { margin-top: -2px;
line-height: 50px; }
border-bottom: 1px solid #ddd; }
.grid-exp-bar-title { }
font-size: 18px; .exp-bar-action-container {
padding-left: 8px; display: flex;
i { align-items: center;
font-size: 20px; }
margin-top: -2px; .container-header{
} display: flex;
} justify-content: flex-start;
} align-items: center;
.container-header{ flex-wrap: wrap;
display: flex; .search-container {
justify-content: flex-start; width: 30%;
align-items: center; height: 48px;
flex-wrap: wrap; padding: 10px 10px 10px 0;
.quick-group-container { min-width: 200px;
padding-top: 8px; max-width: 400px;
padding-right: 20px; }
} .toolbar-container{
.search-container { padding: 4px;
width: 30%; }
height: 48px; .quick-group-container {
padding: 10px 10px 10px 0; padding-top: 8px;
min-width: 200px; padding-right: 20px;
max-width: 400px; }
} }
.toolbar-container{ .grid-exp-bar-content {
padding: 4px; flex-grow: 1;
display: flex; overflow: auto;
flex-wrap: wrap; }
align-items: center; }
}
}
.grid-exp-bar-content {
height: calc(100% - 88px);
overflow: auto;
padding: 16px 0;
margin-bottom: 10px;
}
.grid-exp-bar-content2 {
height: calc(100% - 88px);
overflow: auto;
flex-grow: 1;
}
}
}
> .right-pane.ivu-split-pane {
> div {
padding-left: 10px;
}
}
> .left-pane.ivu-split-pane {
padding-right: 10px;
}
}
> .ivu-split-vertical{
> .ivu-split-pane {
> div {
height: 100%;
.grid-exp-bar-header {
line-height: 50px;
border-bottom: 1px solid #ddd;
>div {
font-size: 18px;
i {
font-size: 20px;
margin-top: -2px;
}
}
}
.container-header{
display: flex;
justify-content: flex-start;
align-items: center;
flex-wrap: wrap;
.search-container {
width: 30%;
height: 48px;
padding: 10px 10px 10px 0;
min-width: 200px;
max-width: 400px;
}
.toolbar-container{
padding: 4px;
}
.quick-group-container {
padding-top: 8px;
padding-right: 20px;
}
}
.grid-exp-bar-content {
height: calc(100% - 88px);
overflow: auto;
margin-bottom: 10px;
}
.grid-exp-bar-content2 {
height: calc(100% - 88px);
overflow: auto;
flex-grow: 1;
}
}
}
> .top-pane.ivu-split-pane {
> div {
padding-bottom: 10px;
}
}
> .bottom-pane.ivu-split-pane {
padding-top: 10px;
}
}
}
// this is less // this is less
app_Web/src/widgets/ibizorder/order-calendar-navigation-calendar/order-calendar-navigation-calendar-service.ts
浏览文件 @ b0e80d81
...@@ -93,11 +93,11 @@ export default class OrderCalendarNavigationService extends ControlService { ...@@ -93,11 +93,11 @@ export default class OrderCalendarNavigationService extends ControlService {
_data.push(..._response.data); _data.push(..._response.data);
}); });
// 排序 // 排序
// _data.sort((a:any, b:any)=>{ _data.sort((a:any, b:any)=>{
// let dateA = new Date(Date.parse(a.start?.replace(/-/g, "/"))); let dateA = new Date(Date.parse(a.start?.replace(/-/g, "/")));
// let dateB = new Date(Date.parse(b.start?.replace(/-/g, "/"))); let dateB = new Date(Date.parse(b.start?.replace(/-/g, "/")));
// return dateA > dateB ? 1 : -1 ; return dateA > dateB ? 1 : -1 ;
// }); });
let result = {status: 200, data: _data}; let result = {status: 200, data: _data};
resolve(result); resolve(result);
}).catch((response: any) => { }).catch((response: any) => {
......
app_Web/src/widgets/ibizorder/order-calendar-timeline-navigation-calendar/order-calendar-timeline-navigation-calendar-service.ts
浏览文件 @ b0e80d81
...@@ -93,11 +93,11 @@ export default class OrderCalendarTimelineNavigationService extends ControlServi ...@@ -93,11 +93,11 @@ export default class OrderCalendarTimelineNavigationService extends ControlServi
_data.push(..._response.data); _data.push(..._response.data);
}); });
// 排序 // 排序
// _data.sort((a:any, b:any)=>{ _data.sort((a:any, b:any)=>{
// let dateA = new Date(Date.parse(a.start?.replace(/-/g, "/"))); let dateA = new Date(Date.parse(a.start?.replace(/-/g, "/")));
// let dateB = new Date(Date.parse(b.start?.replace(/-/g, "/"))); let dateB = new Date(Date.parse(b.start?.replace(/-/g, "/")));
// return dateA > dateB ? 1 : -1 ; return dateA > dateB ? 1 : -1 ;
// }); });
let result = {status: 200, data: _data}; let result = {status: 200, data: _data};
resolve(result); resolve(result);
}).catch((response: any) => { }).catch((response: any) => {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或