提交 31c72e16 编写于 作者: ibizdev's avatar ibizdev

lxm1993 发布系统代码 [TrainSys,网页端]

上级 36c14e08
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
"@interactjs/actions": "^1.10.11", "@interactjs/actions": "^1.10.11",
"@interactjs/modifiers": "^1.10.11", "@interactjs/modifiers": "^1.10.11",
"@interactjs/dev-tools": "^1.10.11", "@interactjs/dev-tools": "^1.10.11",
"@ibiz/dynamic-model-api": "1.0.6", "@ibiz/dynamic-model-api": "1.0.7",
"@ibiz/model-location": "^0.0.4", "@ibiz/model-location": "^0.0.4",
"xgplayer":"2.31.4", "xgplayer":"2.31.4",
"xlsx": "^0.16.9" "xlsx": "^0.16.9"
......
...@@ -266,17 +266,18 @@ export class PanelDetailModel { ...@@ -266,17 +266,18 @@ export class PanelDetailModel {
* @memberof PanelDetailModel * @memberof PanelDetailModel
*/ */
public getDetailClass() { public getDetailClass() {
let detailClass = `app-${this.panelType.toLowerCase()}-${this.panelItemModel?.itemType.toLowerCase()}`; let detailClass = [];
detailClass += ` ${this.panelType.toLowerCase()}-${this.panelItemModel?.itemType.toLowerCase()}-${this.panelItemModel?.name.toLowerCase()}`; detailClass.push({[`app-${this.panelType.toLowerCase()}-${this.panelItemModel?.itemType.toLowerCase()}`]:true});
detailClass.push({[`${this.panelType.toLowerCase()}-${this.panelItemModel?.itemType.toLowerCase()}-${this.panelItemModel?.name.toLowerCase()}`]:true});
if (this.panelType !== 'VIEWLAYOUTPANEL') { if (this.panelType !== 'VIEWLAYOUTPANEL') {
detailClass += ` panel-${this.panelItemModel?.itemType.toLowerCase()}`; detailClass.push({[`panel-${this.panelItemModel?.itemType.toLowerCase()}`]:true});
} }
if (this.panelItemModel?.getPSSysCss?.()) { if (this.panelItemModel?.getPSSysCss?.()) {
detailClass += ` ${this.panelItemModel?.getPSSysCss?.()?.cssName}`; detailClass.push({[`${this.panelItemModel?.getPSSysCss?.()?.cssName}`]:true});
} }
// 容器类型面板 // 容器类型面板
if (this.panelItemModel?.showCaption) { if (this.panelItemModel?.showCaption) {
detailClass += ` show-caption`; detailClass.push({'show-caption':true});
} }
return detailClass; return detailClass;
} }
......
...@@ -21,3 +21,29 @@ ...@@ -21,3 +21,29 @@
cursor: initial; cursor: initial;
} }
.more-dropdown {
.more-dropdown-content {
&:hover {
background-color: #ecf5ff;
color: #66b1ff;
}
padding: 4px 16px;
line-height: 36px;
i {
margin-right: 6px;
}
}
.ivu-select-dropdown {
width: 270px;
top: 90px !important;
left: -270px !important;
p {
height: auto;
line-height: 36px;
color: inherit;
}
}
}
\ No newline at end of file
<template> <template>
<dropdown v-if="itemLevel === 0" :transfer="true" trigger='click'> <dropdown :class="{'more-dropdown': isMore}" v-if="itemLevel === 0" :visible="visible" :transfer="!isMore" trigger='click'>
<app-button <app-button
v-if="!isMore"
:disabled="item.disabled" :disabled="item.disabled"
:loading="loading" :loading="loading"
iconcls='fa fa-file-excel-o' iconcls='fa fa-file-excel-o'
:caption="caption" :caption="caption"
> >
</app-button> </app-button>
<div class="more-dropdown-content" v-else @click="clickVisible">
<menu-icon v-if="item.showIcon" :item='item' />
<span v-if="item.showCaption" class='caption'>{{item.caption}}</span>
</div>
<dropdown-menu slot='list'> <dropdown-menu slot='list'>
<dropdown-item> <dropdown-item>
<p @click="exportExcel($event, 'maxRowCount')"> <p @click="exportExcel($event, 'maxRowCount')">
...@@ -46,6 +51,23 @@ import { Vue, Component, Prop, Watch } from 'vue-property-decorator'; ...@@ -46,6 +51,23 @@ import { Vue, Component, Prop, Watch } from 'vue-property-decorator';
}) })
export default class AppExportExcel extends Vue { export default class AppExportExcel extends Vue {
/**
* 工具栏显示类型
*
* @type {string}
* @memberof AppExportExcel
*/
@Prop({ default: 'button'})
showType!: string;
/**
* 是否是存在多个下拉选项的工具栏
*
* @type {boolean}
* @memberof AppExportExcel
*/
isMore: boolean = this.showType === 'more'
/** /**
* 工具栏项 * 工具栏项
* *
......
...@@ -217,6 +217,13 @@ export class AppPanelBase extends PanelControlBase { ...@@ -217,6 +217,13 @@ export class AppPanelBase extends PanelControlBase {
Object.assign(detailStyle, boxLayoutStyle); Object.assign(detailStyle, boxLayoutStyle);
// 获取盒子样式表 // 获取盒子样式表
let detailClass = this.layoutDetailsModel[name]?.getDetailClass(); let detailClass = this.layoutDetailsModel[name]?.getDetailClass();
// 合并盒子动态样式表
if(container.dynaClass){
const context = this.context;
const viewparams = this.viewparams;
const data = this.data;
detailClass.push(...eval(container.dynaClass))
}
if (layout && Object.is(layout, 'BORDER')) { if (layout && Object.is(layout, 'BORDER')) {
// 存在三种情况(1:该容器为多数据容器; 2: 父容器为多数据容器; 3: 正常容器) // 存在三种情况(1:该容器为多数据容器; 2: 父容器为多数据容器; 3: 正常容器)
return ( return (
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
} }
} }
.view-toolbar-transfer.ivu-select-dropdown.ivu-dropdown-transfer { .view-toolbar-transfer.ivu-select-dropdown.ivu-dropdown-transfer, .view-toolbar-transfer {
padding: 10px 0; padding: 10px 0;
.ivu-dropdown-menu { .ivu-dropdown-menu {
...@@ -44,3 +44,7 @@ ...@@ -44,3 +44,7 @@
} }
} }
} }
.view-toolbar-transfer {
padding-right: 4px;
}
\ No newline at end of file
...@@ -97,9 +97,7 @@ export class ViewToolbar extends Vue { ...@@ -97,9 +97,7 @@ export class ViewToolbar extends Vue {
* @memberof ViewToolbar * @memberof ViewToolbar
*/ */
@Emit('item-click') @Emit('item-click')
public itemClick(uiAction: any, e?: MouseEvent): void { public itemClick(uiAction: any, e?: MouseEvent): void { }
e?.stopPropagation();
}
/** /**
* @description span按钮点击 * @description span按钮点击
...@@ -145,6 +143,21 @@ export class ViewToolbar extends Vue { ...@@ -145,6 +143,21 @@ export class ViewToolbar extends Vue {
if (item.items && item.items.length > 0) { if (item.items && item.items.length > 0) {
return this.renderMenuGroup(item); return this.renderMenuGroup(item);
} }
// 当在分组中时,ui 呈现异常 无法放在 el-tooltip 中
if (item.uiaction && item.uiaction.uIActionTag === 'ExportExcel') {
if(item.visabled) {
return (
<app-export-excel
item={item}
caption={item.caption}
on-exportexcel={(e: MouseEvent) => this.spanClick(item, e)}
showType='more'>
</app-export-excel>
)
}else {
return null
}
}
return <dropdown-item disabled={item.disabled} name={item.name}>{this.renderMenuItem(item,false)}</dropdown-item>; return <dropdown-item disabled={item.disabled} name={item.name}>{this.renderMenuItem(item,false)}</dropdown-item>;
}); });
} }
...@@ -306,7 +319,7 @@ export class ViewToolbar extends Vue { ...@@ -306,7 +319,7 @@ export class ViewToolbar extends Vue {
} }
if (Object.is(item.itemType, 'ITEMS') && item.items && item.items.length > 0) { if (Object.is(item.itemType, 'ITEMS') && item.items && item.items.length > 0) {
return ( return (
<dropdown transfer transfer-class-name="view-toolbar-transfer" v-show={item.visabled} trigger='click' on-on-click={(name: string) => throttle(this.itemClick,[{ tag: name }],this)}> <dropdown class="view-toolbar-transfer" placement="bottom-end" v-show={item.visabled} trigger='click'>
<el-tooltip disabled={!item.tooltip}> <el-tooltip disabled={!item.tooltip}>
<app-button <app-button
showCaption={item.showCaption} showCaption={item.showCaption}
......
...@@ -740,6 +740,13 @@ export class AppDefaultViewLayout extends ControlContainer { ...@@ -740,6 +740,13 @@ export class AppDefaultViewLayout extends ControlContainer {
Object.assign(detailStyle, boxStyle); Object.assign(detailStyle, boxStyle);
// 获取盒子样式表 // 获取盒子样式表
const detailClass = this.layoutDetailsModel[name]?.getDetailClass(); const detailClass = this.layoutDetailsModel[name]?.getDetailClass();
// 合并盒子动态样式表
if(container.dynaClass){
const context = this.context;
const viewparams = this.viewparams;
const data = this.layoutData[name];
detailClass.push(...eval(container.dynaClass))
}
if (layout && Object.is(layout, 'BORDER')) { if (layout && Object.is(layout, 'BORDER')) {
// 存在三种情况(1:该容器为多数据容器; 2: 父容器为多数据容器; 3: 正常容器) // 存在三种情况(1:该容器为多数据容器; 2: 父容器为多数据容器; 3: 正常容器)
return ( return (
......
...@@ -29,31 +29,31 @@ ...@@ -29,31 +29,31 @@
<dependency> <dependency>
<groupId>net.ibizsys.plugin</groupId> <groupId>net.ibizsys.plugin</groupId>
<artifactId>ibiz-plugin-cloud</artifactId> <artifactId>ibiz-plugin-cloud</artifactId>
<version>8.1.0.188</version> <version>8.1.0.196</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.ibizsys.plugin</groupId> <groupId>net.ibizsys.plugin</groupId>
<artifactId>ibiz-plugin-redis</artifactId> <artifactId>ibiz-plugin-redis</artifactId>
<version>8.1.0.188</version> <version>8.1.0.196</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.ibizsys.plugin</groupId> <groupId>net.ibizsys.plugin</groupId>
<artifactId>ibiz-plugin-mybatisplus-spring-boot-starter</artifactId> <artifactId>ibiz-plugin-mybatisplus-spring-boot-starter</artifactId>
<version>8.1.0.188</version> <version>8.1.0.196</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.ibizsys.plugin</groupId> <groupId>net.ibizsys.plugin</groupId>
<artifactId>ibiz-plugin-zookeeper</artifactId> <artifactId>ibiz-plugin-zookeeper</artifactId>
<version>8.1.0.188</version> <version>8.1.0.196</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.ibizsys.plugin</groupId> <groupId>net.ibizsys.plugin</groupId>
<artifactId>ibiz-plugin-poi</artifactId> <artifactId>ibiz-plugin-poi</artifactId>
<version>8.1.0.188</version> <version>8.1.0.196</version>
</dependency> </dependency>
</dependencies> </dependencies>
......
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
</changeSet> </changeSet>
<!--输出实体[REGINFO]数据结构 --> <!--输出实体[REGINFO]数据结构 -->
<changeSet author="root" id="tab-reginfo-62-8"> <changeSet author="root" id="tab-reginfo-65-8">
<createTable tableName="T_REGINFO"> <createTable tableName="T_REGINFO">
<column name="UPDATEDATE" remarks="" type="DATETIME"> <column name="UPDATEDATE" remarks="" type="DATETIME">
</column> </column>
......
...@@ -57,6 +57,39 @@ ...@@ -57,6 +57,39 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
}, },
"getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_ua98d563_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "表格界面_行编辑开关操作"
}
}, {
"logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u479f517_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "表格界面_编辑操作"
}
} ],
"getPSAppViewUIActions" : [ {
"name" : "表格界面_行编辑开关操作",
"getPSUIAction" : {
"modelref" : true,
"id" : "ToggleRowEdit"
},
"xDataControlName" : "grid"
}, {
"name" : "表格界面_编辑操作",
"getPSUIAction" : {
"modelref" : true,
"id" : "Edit"
},
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid"
} ],
"getPSControlLogics" : [ { "getPSControlLogics" : [ {
"eventNames" : "ROWDBLCLICK;SELECTIONCHANGE;REMOVE;LOAD;BEFORELOAD", "eventNames" : "ROWDBLCLICK;SELECTIONCHANGE;REMOVE;LOAD;BEFORELOAD",
"logicTag" : "grid", "logicTag" : "grid",
...@@ -174,6 +207,70 @@ ...@@ -174,6 +207,70 @@
"widthUnit" : "PX", "widthUnit" : "PX",
"enableRowEdit" : true, "enableRowEdit" : true,
"enableSort" : true "enableSort" : true
}, {
"align" : "RIGHT",
"caption" : "操作",
"codeName" : "uagridcolumn1",
"columnType" : "UAGRIDCOLUMN",
"name" : "uagridcolumn1",
"noPrivDisplayMode" : 1,
"getPSDEUIActionGroup" : {
"name" : "操作列",
"getPSUIActionGroupDetails" : [ {
"detailType" : "DEUIACTION",
"name" : "ua98d563",
"getPSUIAction" : {
"caption" : "行编辑",
"codeName" : "ToggleRowEdit",
"fullCodeName" : "ToggleRowEdit",
"name" : "表格界面_行编辑开关操作",
"getPSSysImage" : {
"glyph" : "xf0ce@FontAwesome",
"cssClass" : "fa fa-table"
},
"predefinedType" : "GRIDVIEW_ROWEDITACTION",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleRowEdit",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : false
}, {
"detailType" : "DEUIACTION",
"name" : "u479f517",
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"getCapPSLanguageRes" : {
"lanResTag" : "TBB.TEXT.*.EDIT"
},
"caption" : "编辑",
"codeName" : "Edit",
"fullCodeName" : "Edit",
"name" : "表格界面_编辑操作",
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
},
"predefinedType" : "GRIDVIEW_EDITACTION",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"lanResTag" : "TBB.TOOLTIP.*.EDIT"
},
"uIActionMode" : "SYS",
"uIActionTag" : "Edit",
"uIActionType" : "DEUIACTION"
},
"addSeparator" : true,
"showCaption" : true,
"showIcon" : true
} ]
},
"width" : 100,
"widthUnit" : "PX",
"enableSort" : false
} ], } ],
"getPSDEGridDataItems" : [ { "getPSDEGridDataItems" : [ {
"dataType" : 25, "dataType" : 25,
......
...@@ -399,6 +399,39 @@ ...@@ -399,6 +399,39 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
}, },
"getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_ua98d563_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "表格界面_行编辑开关操作"
}
}, {
"logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u479f517_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "表格界面_编辑操作"
}
} ],
"getPSAppViewUIActions" : [ {
"name" : "表格界面_行编辑开关操作",
"getPSUIAction" : {
"modelref" : true,
"id" : "ToggleRowEdit"
},
"xDataControlName" : "grid"
}, {
"name" : "表格界面_编辑操作",
"getPSUIAction" : {
"modelref" : true,
"id" : "Edit"
},
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid"
} ],
"getPSControlHandler" : { "getPSControlHandler" : {
"getPSHandlerActions" : [ { "getPSHandlerActions" : [ {
"actionName" : "Get", "actionName" : "Get",
...@@ -603,6 +636,70 @@ ...@@ -603,6 +636,70 @@
"widthUnit" : "PX", "widthUnit" : "PX",
"enableRowEdit" : true, "enableRowEdit" : true,
"enableSort" : true "enableSort" : true
}, {
"align" : "RIGHT",
"caption" : "操作",
"codeName" : "uagridcolumn1",
"columnType" : "UAGRIDCOLUMN",
"name" : "uagridcolumn1",
"noPrivDisplayMode" : 1,
"getPSDEUIActionGroup" : {
"name" : "操作列",
"getPSUIActionGroupDetails" : [ {
"detailType" : "DEUIACTION",
"name" : "ua98d563",
"getPSUIAction" : {
"caption" : "行编辑",
"codeName" : "ToggleRowEdit",
"fullCodeName" : "ToggleRowEdit",
"name" : "表格界面_行编辑开关操作",
"getPSSysImage" : {
"glyph" : "xf0ce@FontAwesome",
"cssClass" : "fa fa-table"
},
"predefinedType" : "GRIDVIEW_ROWEDITACTION",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleRowEdit",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : false
}, {
"detailType" : "DEUIACTION",
"name" : "u479f517",
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"getCapPSLanguageRes" : {
"lanResTag" : "TBB.TEXT.*.EDIT"
},
"caption" : "编辑",
"codeName" : "Edit",
"fullCodeName" : "Edit",
"name" : "表格界面_编辑操作",
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
},
"predefinedType" : "GRIDVIEW_EDITACTION",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"lanResTag" : "TBB.TOOLTIP.*.EDIT"
},
"uIActionMode" : "SYS",
"uIActionTag" : "Edit",
"uIActionType" : "DEUIACTION"
},
"addSeparator" : true,
"showCaption" : true,
"showIcon" : true
} ]
},
"width" : 100,
"widthUnit" : "PX",
"enableSort" : false
} ], } ],
"getPSDEGridDataItems" : [ { "getPSDEGridDataItems" : [ {
"dataType" : 25, "dataType" : 25,
......
...@@ -1857,6 +1857,39 @@ ...@@ -1857,6 +1857,39 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
}, },
"getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_ua98d563_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "表格界面_行编辑开关操作"
}
}, {
"logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u479f517_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "表格界面_编辑操作"
}
} ],
"getPSAppViewUIActions" : [ {
"name" : "表格界面_行编辑开关操作",
"getPSUIAction" : {
"modelref" : true,
"id" : "ToggleRowEdit"
},
"xDataControlName" : "grid"
}, {
"name" : "表格界面_编辑操作",
"getPSUIAction" : {
"modelref" : true,
"id" : "Edit"
},
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid"
} ],
"getPSControlHandler" : { "getPSControlHandler" : {
"getPSHandlerActions" : [ { "getPSHandlerActions" : [ {
"actionName" : "Get", "actionName" : "Get",
...@@ -2061,6 +2094,70 @@ ...@@ -2061,6 +2094,70 @@
"widthUnit" : "PX", "widthUnit" : "PX",
"enableRowEdit" : true, "enableRowEdit" : true,
"enableSort" : true "enableSort" : true
}, {
"align" : "RIGHT",
"caption" : "操作",
"codeName" : "uagridcolumn1",
"columnType" : "UAGRIDCOLUMN",
"name" : "uagridcolumn1",
"noPrivDisplayMode" : 1,
"getPSDEUIActionGroup" : {
"name" : "操作列",
"getPSUIActionGroupDetails" : [ {
"detailType" : "DEUIACTION",
"name" : "ua98d563",
"getPSUIAction" : {
"caption" : "行编辑",
"codeName" : "ToggleRowEdit",
"fullCodeName" : "ToggleRowEdit",
"name" : "表格界面_行编辑开关操作",
"getPSSysImage" : {
"glyph" : "xf0ce@FontAwesome",
"cssClass" : "fa fa-table"
},
"predefinedType" : "GRIDVIEW_ROWEDITACTION",
"timeout" : 60000,
"uIActionMode" : "SYS",
"uIActionTag" : "ToggleRowEdit",
"uIActionType" : "DEUIACTION",
"enableToggleMode" : true
},
"addSeparator" : false,
"showCaption" : true,
"showIcon" : false
}, {
"detailType" : "DEUIACTION",
"name" : "u479f517",
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"getCapPSLanguageRes" : {
"lanResTag" : "TBB.TEXT.*.EDIT"
},
"caption" : "编辑",
"codeName" : "Edit",
"fullCodeName" : "Edit",
"name" : "表格界面_编辑操作",
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
},
"predefinedType" : "GRIDVIEW_EDITACTION",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"lanResTag" : "TBB.TOOLTIP.*.EDIT"
},
"uIActionMode" : "SYS",
"uIActionTag" : "Edit",
"uIActionType" : "DEUIACTION"
},
"addSeparator" : true,
"showCaption" : true,
"showIcon" : true
} ]
},
"width" : 100,
"widthUnit" : "PX",
"enableSort" : false
} ], } ],
"getPSDEGridDataItems" : [ { "getPSDEGridDataItems" : [ {
"dataType" : 25, "dataType" : 25,
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册