Skip to content

T
TrainSys
提交 f1150dc3 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

fangzhihao 发布系统代码 [TrainSys，网页端]

上级 388d9503
隐藏空白字符变更
内嵌 并排
正在显示 包含 165 行增加 和 109 行删除
app_Web/packages/ibiz-plugin/src/components/app-code-editor/app-code-editor.tsx
浏览文件 @ f1150dc3
......@@ -61,6 +61,24 @@ export class AppCodeEditor extends Vue {
@Prop({type: Boolean, default: true})
isMinimap!: boolean;
/**
* 是否显示行号
*
* @type {boolean}
* @memberof AppCodeEditor
*/
@Prop({type: Boolean, default: true})
showLineNum!: boolean;
/**
* 是否显示语言区
*
* @type {boolean}
* @memberof AppCodeEditor
*/
@Prop({type: Boolean, default: true})
showLanguage!: boolean;
/**
* 是否能够更换语言
*
......@@ -166,6 +184,7 @@ export class AppCodeEditor extends Vue {
theme: this.theme,
language: this.presentLanguage,
readOnly: this.isReadOnly,
lineNumbers: this.showLineNum ? 'on' : 'off',
minimap: { enabled: this.isMinimap },
});
this.registerEvent();
......@@ -266,7 +285,7 @@ export class AppCodeEditor extends Vue {
render(h: CreateElement) {
return (
<div class='app-code-editor'>
<div class={{ 'app-code-editor__header': true, [this.theme]: true }}>
<div class={{ 'app-code-editor__header': true, [this.theme]: true, 'app-code-editor__header--hidden': !this.showLanguage }}>
<div class='app-code-editor__header__left__toolbar'>
<i-select
v-model={this.presentLanguage}
......
app_Web/packages/ibiz-vue/src/components/control/app-common-control/app-portlet-base.tsx
浏览文件 @ f1150dc3
......@@ -244,6 +244,7 @@ export class AppPortletBase extends PortletControlBase {
viewparam: JSON.stringify(this.viewparams),
},
},
class: "view-container2",
on: {
'viewIsMounted': () => {
this.setIsMounted(portletAppView?.name);
......
app_Web/packages/ibiz-vue/src/components/editor/code-editor/code-editor.tsx
浏览文件 @ f1150dc3
......@@ -63,6 +63,12 @@ export default class CodeEditor extends EditorBase {
if (params.LANGUAGE) {
param.language = params.LANGUAGE;
}
if (params.showLanguage) {
param.showLanguage = this.handleBoolean(params.showLanguage);
}
if (params.showLineNum) {
param.showLineNum = this.handleBoolean(params.showLineNum);
}
return Object.assign(params, param);
}
......
app_Web/packages/ibiz-vue/src/styles/components/common/app-code-editor.less
浏览文件 @ f1150dc3
......@@ -18,6 +18,9 @@
font-size: 12px;
font-weight: 800;
justify-content: space-between;
&.app-code-editor__header--hidden {
display: none;
}
}
.app-code-editor__header__left__toolbar{
......@@ -33,6 +36,9 @@
background: transparent;
color: rgb(157, 165, 180);
}
.ivu-select-arrow {
top: 16px;
}
}
.app-code-editor__header__right__toolbar{
.toolbar-item {
......
app_Web/packages/ibiz-vue/src/styles/components/common/app-form-group.less
浏览文件 @ f1150dc3
......@@ -9,10 +9,15 @@
.ivu-card-head {
padding: 4px;
}
.ivu-card-extra {
display: flex;
top: 0px;
.ivu-card {
height: 100%;
.ivu-card-extra {
display: flex;
top: 0px;
}
.ivu-card-body {
padding: 8px;
}
}
.app-form-group__action__extract {
display: flex;
......
app_Web/packages/ibiz-vue/src/styles/components/common/app-form-item.less
浏览文件 @ f1150dc3
.app-form-item {
height: 100%;
padding: 0 6px;
.app-form-item__tip,.app-form-item__show-tip{
i,img{
margin-right: 4px;
}
}
.app-form-item__label {
padding: 6px 8px 6px 0px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-size: 14px;
font-weight: 600;
}
&.label--top, &.label--bottom {
>.app-form-item__label {
display: block;
}
}
&.label--left, &.label--right {
//todo 编辑器样式名待修改
>.app-form-item__label {
height: 36px;
}
}
&.label--left {
>.app-form-item__label {
float: left;
text-align: right;
}
}
&.label--right {
>.app-form-item__label {
float: right;
padding: 6px 0px 6px 10px;
}
}
&.label--none {
>.app-form-item__label {
display: none;
}
}
height: 100%;
padding: 0 6px;
.app-form-item__tip,.app-form-item__show-tip{
>i,img{
margin-right: 4px;
}
}
.app-form-item__label {
padding: 6px 8px 6px 8px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-size: 14px;
font-weight: 600;
}
&.label--top, &.label--bottom {
>.app-form-item__label {
display: block;
}
}
&.label--left, &.label--right {
//todo 编辑器样式名待修改
>.app-form-item__label {
height: 36px;
}
}
&.label--left {
>.app-form-item__label {
float: left;
text-align: right;
}
}
&.label--right {
>.app-form-item__label {
float: right;
text-align: left;
}
}
&.label--none {
>.app-form-item__label {
display: none;
}
}
}
.app-form-item__content {
display: block;
height: 100%;
.ivu-form-item-content {
height: 100%;
min-height: 36px;
.ivu-form-item-error-tip{
padding-top: 0;
}
}
> .ivu-form-item {
height: 100%;
margin-bottom: 16px;
}
display: block;
height: 100%;
.ivu-form-item-content {
height: 100%;
min-height: 36px;
.ivu-form-item-error-tip{
padding-top: 0;
}
}
> .ivu-form-item {
height: 100%;
margin-bottom: 16px;
}
}
\ No newline at end of file
app_Web/packages/ibiz-vue/src/styles/components/common/app-message-popover.less
浏览文件 @ f1150dc3
......@@ -50,24 +50,19 @@
.el-row {
display: flex;
.el-col {
flex-grow: 1;
div:first-child {
font-weight: 500;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
div:nth-child(n+2) {
font-size: 12px;
}
}
}
.el-col {
flex-grow: 1;
}
.process-definition-name:first-child {
font-weight: 500;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.process-definition-name:nth-child(n+2) {
font-size: 12px;
}
}
}
\ No newline at end of file
app_Web/packages/ibiz-vue/src/styles/components/control/app-default-portlet.less
浏览文件 @ f1150dc3
......@@ -11,9 +11,6 @@
height: calc(100% - 58px);
overflow: auto;
}
.view-container,.control-container,.view-content {
height: 100%;
}
> .app-control-portlet__content.portlet--no-title {
width: 100%;
height: 100%;
......
app_Web/packages/ibiz-vue/src/styles/components/control/app-default-searchform.less
浏览文件 @ f1150dc3
......@@ -5,13 +5,6 @@
width: 100%;
border: 0;
}
.app-form-item.label--left,
.app-form-item.label--right {
>.app-form-item__label {
position: relative;
top: -5px;
}
}
.app-form-item__content > .ivu-form-item {
margin-bottom: 8px;
}
......
app_Web/packages/ibiz-vue/src/styles/objects/control-container.less
浏览文件 @ f1150dc3
......@@ -23,13 +23,14 @@
}
.control-content {
height: 100%;
flex-grow: 1;
min-height: 0;
min-width: 0;
padding: 4px;
overflow: auto;
}
.control-footer {
height: 50px;
width: 100%;
padding: 4px;
}
......
app_Web/packages/ibiz-vue/src/styles/objects/view-container.less
浏览文件 @ f1150dc3
......@@ -64,18 +64,23 @@
// 视图内容
.view-content {
flex-grow: 1;
min-height: 0;
min-width: 0;
width: 100%;
height: 0;
padding: 4px;
flex-grow: 1;
.flex(column, normal, normal);
}
.view-content__left,
.view-content__right,
.view-content__body {
.view-content__right{
height: 100%;
}
.view-content__body{
flex-grow: 1;
min-height: 0;
min-width: 0;
}
.view-footer {
padding: 4px;
......
app_Web/packages/ibiz-vue/src/styles/objects/view-container2.less
浏览文件 @ f1150dc3
// 嵌入视图容器布局
.view-container2 {
padding: 4px;
.view-content__left,
.view-content__right,
.view-content__body {
flex-grow: 1;
min-height: 0;
min-width: 0;
}
}
\ No newline at end of file
app_Web/packages/ibiz-vue/src/widgets/grid-control-base.tsx
浏览文件 @ f1150dc3
......@@ -2058,6 +2058,9 @@ export class GridControlBase extends MDControlBase implements GridControlInterfa
* @memberof GridControlBase
*/
public rowClick(row: any, column?: any, event?: any, isExecute: boolean = false): void {
if (column?.columnKey && column.columnKey.includes('uagridcolumn')) {
return
}
if (this.ctrlTriggerLogicMap.get(`${this.realCtrlSeparator}row-click`)) {
return;
}
......@@ -2106,6 +2109,9 @@ export class GridControlBase extends MDControlBase implements GridControlInterfa
* @memberof GridControlBase
*/
public rowDBLClick(row: any, column?: any, event?: any): void {
if (column?.columnKey && column.columnKey.includes('uagridcolumn')) {
return
}
this.handleCtrlEvents('onrowdblclick', { action: 'RowDBLClick', data: row }).then((res: boolean) => {
if (res) {
if (this.ctrlTriggerLogicMap.get(`${this.realCtrlSeparator}row-dblclick`)) {
......
app_Web/public/assets/theme/default.less
浏览文件 @ f1150dc3
......@@ -2071,20 +2071,19 @@ body {
.popover__show-more {
color: @color-primary-base;
}
.popover__content {
border-bottom: 1px solid @color-primary-base;
.popover__content__avatar {
// border: 0px solid @border-color;
border: 0px solid @color-primary-base;
span{
background-color: @color-primary-base!important;
color: @color-primary-contrast!important;
}
}
.popover__content__caption {
// border: 0px @border-color solid;
.process-definition-name:hover {
// color: @hover-color;
color: @color-primary-base;
}
}
}
......
trainsys-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ f1150dc3
......@@ -169,7 +169,7 @@
</changeSet>
<!--输出实体[PHONE]数据结构 -->
<changeSet author="root" id="tab-phone-53-6">
<changeSet author="root" id="tab-phone-54-6">
<createTable tableName="T_PHONE">
<column name="PHONEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_PHONE"/>
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone/PSFORMS/Main.json
浏览文件 @ f1150dc3
......@@ -185,6 +185,21 @@
"name" : "PHONETYPE",
"codeName" : "Phonetype"
},
"getPSDEFDGroupLogics" : [ {
"groupOP" : "AND",
"logicCat" : "ITEMENABLE",
"logicType" : "GROUP",
"name" : "表单成员[phonetype][表单项启用]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "phonename",
"logicType" : "SINGLE",
"name" : "phonename 等于(=) (10)",
"value" : "10"
} ],
"relatedDetailNames" : [ "phonename" ],
"notMode" : false
} ],
"getPSEditor" : {
"editorType" : "DROPDOWNLIST",
"name" : "phonetype",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneEditView.json
浏览文件 @ f1150dc3
......@@ -1171,6 +1171,21 @@
"name" : "PHONETYPE",
"codeName" : "Phonetype"
},
"getPSDEFDGroupLogics" : [ {
"groupOP" : "AND",
"logicCat" : "ITEMENABLE",
"logicType" : "GROUP",
"name" : "表单成员[phonetype][表单项启用]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "phonename",
"logicType" : "SINGLE",
"name" : "phonename 等于(=) (10)",
"value" : "10"
} ],
"relatedDetailNames" : [ "phonename" ],
"notMode" : false
} ],
"getPSEditor" : {
"editorType" : "DROPDOWNLIST",
"name" : "phonetype",
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或