Skip to content

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

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

上级 6037c969
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 7176 行增加 和 1810 行删除
app_Web/CHANGELOG.md
浏览文件 @ c42ce37f
## v8.0.3 [2022-9-16]
## 2022-09-16
更新前后台都支持，以后台优先[db01c4fb](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/db01c4fb78a16c994db8f27e64d71df9d2271859)（by tony001）
更新表格导出[dc3fea20](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/dc3fea2033996417517fd1a9fd2c1da906f90aa4)（by ShineKOT）
新增按钮动态标题支持[81fce1c5](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/81fce1c505a0661ab9f2363689d9d6ee544406e4)[b8113954](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/b8113954a0c1556706b679ad217f874e87f02ee3)（by ShineKOT）
更新实体逻辑和界面逻辑准备处理参数节点[1ac62032](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/1ac62032f0716188a10b512a31c785bdbe40259d)（by ShineKOT）
代码表翻译服务逻辑调整[272aaaca](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/272aaaca15e61d981efd6468f1515f6ee659a454)（by ShineKOT）
更新代码编辑器[af9badf0](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/af9badf02d7c9be182f0b1fba48977d7bb878c75)[b1a46a2a](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/b1a46a2ae21477c7a41338aa7c10defd19331fb9)[a13ce24f](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/a13ce24f26b33eef462940af6b608829c8a2a828)[d26517ec](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/d26517ecaa8496b6b5a585354f4046318be8bc0a)（by ShineKOT）
flex布局高度调整[723adc23](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/723adc23380e64114b7ff198f92ffb231b5e2390)（by ShineKOT）
新增动态样式[ba2dcafb](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/ba2dcafbca026a4b25d4ce6270655789f84736bd)（by zhangkang）
修复列表模型数据类型错误导致合并数据错误[c66f5d8b](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/c66f5d8b2db33278f5d210784a9cce9248894250)（by ShineKOT）
新增支持快速搜索自定义[bdf47503](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/bdf4750372756b73335449f466c40d5548693d68)（by ShineKOT）
列表视图支持配置列表项的样式表[47188e4a](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/47188e4ac92cfba1c810c4495447e6da313f55c9)（by ShineKOT）
卡片视图支持配置卡片项的样式表[f2193a8b](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/f2193a8b9c52656a93e24887360777397a07f58d)（by ShineKOT）
视图，部件，组件等样式调整
## v8.0.2 [2022-9-09]
## 2022-09-09
修复下拉工具栏显示图标配置失效[62c44fb2](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/62c44fb2f0abf63a5e05d92cc0ea4f127a9692e5)（by ibiz_zhf）
应用标题名称动态适配[4a04ad05](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/4a04ad05e55a376041841613f1ebc3a891e4fc6e)[515de030](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/515de0306d50df84b223048f8bd56de5aea8c02a)（by tony001）
调整菜单项宽度为320px[803be638](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/803be63881b257424ab1759f58971436e02c7b65)（by ibiz_zhf）
新增支持系统样式表动态挂载[d247065b](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/d247065b5f396b92396d0344f945045b7b8e0cce)（by tony001）
修复抽屉中按下鼠标，抽屉外放开鼠标关闭抽屉[295c66ac](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/295c66aca2f40a8632e374990c35f524b6e7d720)[da6731ef](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/da6731efe5e0a14358001670f84afcc9d5a30d9f)（by ShineKOT）
更新分组导出按钮支持导出页数选择[80b19fbc](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/80b19fbccccf395fb72378367cf2614a8178d32a)（by ibiz_zhf）
删除下拉列表的click监听事件，防止重复触发事件[d757b223](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/d757b22300e8842d55a96046d0690bcbba5a603a)（by ibiz_zhf）
更新面板容器动态样式表[d059a72c](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/d059a72c6f3c3f940747d95f0e48554b10c46145)（by tony001）
调整视图标题[c42f8edb](http://172.16.180.229/tony/DYNAMIC_APP_RENDER_RES/commit/c42f8edb5eccc17714a024dce1cd9717e0338e0e)（by tony001）
视图，部件，组件等样式调整
## v8.0.1 [2022-9-02] ## v8.0.1 [2022-9-02]
## 2022-09-02 ## 2022-09-02
......
app_Web/packages/ibiz-vue/src/app-logic/app-backend-action.ts
浏览文件 @ c42ce37f
...@@ -7,6 +7,7 @@ import { ...@@ -7,6 +7,7 @@ import {
} from '@ibiz/dynamic-model-api'; } from '@ibiz/dynamic-model-api';
import { DataServiceHelp, ModelTool, UIActionTool, Util } from 'ibiz-core'; import { DataServiceHelp, ModelTool, UIActionTool, Util } from 'ibiz-core';
import { AppCenterService, AppGlobalService } from '../app-service'; import { AppCenterService, AppGlobalService } from '../app-service';
import { NoticeHandler } from '../utils';
import { AppDEUIAction } from './app-ui-action'; import { AppDEUIAction } from './app-ui-action';
import { UIActionResult } from './appuilogic'; import { UIActionResult } from './appuilogic';
...@@ -215,7 +216,9 @@ export class AppBackEndAction extends AppDEUIAction { ...@@ -215,7 +216,9 @@ export class AppBackEndAction extends AppDEUIAction {
viewLoadingService.isLoading = false; viewLoadingService.isLoading = false;
if (this.actionModel.showBusyIndicator) { if (this.actionModel.showBusyIndicator) {
if (this.actionModel.successMsg) { if (this.actionModel.successMsg) {
actionContext.$success(this.actionModel.successMsg, 'AppBackEndAction'); NoticeHandler.message(response,() =>{
actionContext.$success(this.actionModel.successMsg, 'AppBackEndAction');
})
} }
} }
if ( if (
......
app_Web/packages/ibiz-vue/src/components/common/app-studioaction/app-studioaction.vue
浏览文件 @ c42ce37f
...@@ -248,7 +248,7 @@ export default class AppStudioAction extends Vue { ...@@ -248,7 +248,7 @@ export default class AppStudioAction extends Vue {
if (this.isDevMode) { if (this.isDevMode) {
return ( return (
<div <div
class='app-studio-debug-bar-container' class={{'app-studio-debug-bar-container':true,'isblock':this.sdc.isShowTool,'isnone':!this.sdc.isShowTool}}
ref='debugBar' ref='debugBar'
style={{ display: this.sdc.isShowTool ? 'block' : 'none' }} style={{ display: this.sdc.isShowTool ? 'block' : 'none' }}
> >
......
app_Web/packages/ibiz-vue/src/components/common/context-menu-drag/context-menu-drag.vue
浏览文件 @ c42ce37f
...@@ -9,24 +9,24 @@ ...@@ -9,24 +9,24 @@
v-model="leftDrawerVisiable" v-model="leftDrawerVisiable"
> >
<div class="context-menu-drag"> <div class="context-menu-drag">
<div class="menu-list"> <div class="context-menu__list">
<div class="menu-header"> <div class="context-menu__list__header">
<div class="menuicon"> <div class="header__menuicon">
<Icon type="md-apps" /> <Icon type="md-apps" />
</div> </div>
<div class="content"> <div class="header__content">
<span>{{ $t('components.contextmenudrag.allapp') }}</span> <span>{{ $t('components.contextmenudrag.allapp') }}</span>
</div> </div>
<div class="forward"> <div class="header__forward">
<Icon type="ios-arrow-forward" /> <Icon type="ios-arrow-forward" />
</div> </div>
</div> </div>
<div class="menu-content"> <div class="context-menu__list__content">
<div @click="skipTo(item)" class="menu-content-item" v-for="item in list" :key="item.id"> <div @click="skipTo(item)" class="content__item" v-for="item in list" :key="item.id">
<span class="icon"> <span class="icon">
<Icon type="ios-star" /> <Icon type="ios-star" />
</span> </span>
<span class="title">{{ item.fullName ? item.fullName : item.label }}</span> <span class="caption">{{ item.fullName ? item.fullName : item.label }}</span>
</div> </div>
</div> </div>
</div> </div>
......
app_Web/packages/ibiz-vue/src/components/common/studio-view/studio-view-base.tsx
浏览文件 @ c42ce37f
...@@ -126,8 +126,8 @@ export class StudioViewBase extends Vue { ...@@ -126,8 +126,8 @@ export class StudioViewBase extends Vue {
this.$slots.topMessage ? this.$slots.topMessage : null, this.$slots.topMessage ? this.$slots.topMessage : null,
this.isShowHeader ? ( this.isShowHeader ? (
<div class="view-header" key="view-header"> <div class="view-header" key="view-header">
{this.$slots.title ? <div class="title">{this.$slots.title}</div> : null} {this.$slots.title ? <div class="view-header__title">{this.$slots.title}</div> : null}
{this.$slots.toolbar ? <div class="toolbar">{this.$slots.toolbar}</div> : null} {this.$slots.toolbar ? <div class="view-header__toolbar">{this.$slots.toolbar}</div> : null}
{this.$slots.quickGroupSearch ? ( {this.$slots.quickGroupSearch ? (
<div class="quick-group-search">{this.$slots.quickGroupSearch}</div> <div class="quick-group-search">{this.$slots.quickGroupSearch}</div>
) : null} ) : null}
......
app_Web/packages/ibiz-vue/src/components/common/text-file-upload/text-file-upload.vue
浏览文件 @ c42ce37f
<template> <template>
<div class="file-upload"> <div class="file-upload">
<el-row v-for="(item,index) in uploadFileList" :key="index"> <el-row v-for="(item,index) in uploadFileList" :key="index">
<el-col class="fileMain"> <el-col class="file-upload__contnet">
<i class="el-icon-document"></i> <i class="el-icon-document"></i>
<span>{{item.name}}</span> <span>{{item.name}}</span>
<el-link class="filePreview" v-show="showPreview" type="warning" @click="onPreview(item)"> <el-link class="filePreview" v-show="showPreview" type="warning" @click="onPreview(item)">
...@@ -14,16 +14,16 @@ ...@@ -14,16 +14,16 @@
{{$t('components.diskFileUpload.delete')}} {{$t('components.diskFileUpload.delete')}}
</el-link> </el-link>
</el-col> </el-col>
<el-col class="fileDisable" v-if="!showEdit && !showPreview && !showDelete"> <el-col class="file-upload__disable" v-if="!showEdit && !showPreview && !showDelete">
<i class="el-icon-document-delete"></i> <i class="el-icon-document-delete"></i>
<span>{{item.name}}</span> <span>{{item.name}}</span>
</el-col> </el-col>
</el-row> </el-row>
<div class="fileAdd" @click="uploadFile" v-show="uploadFileList.length < maxLength"> <div class="file-upload__add" @click="uploadFile" v-show="uploadFileList.length < maxLength">
<i class="el-icon-plus"></i> <i class="el-icon-plus"></i>
</div> </div>
<el-upload <el-upload
class="upload" class="file-upload__upload"
ref="upload" ref="upload"
:headers="headers" :headers="headers"
:action="getAction()" :action="getAction()"
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<el-button>{{$t('components.uploadfile.choose')}}</el-button> <el-button>{{$t('components.uploadfile.choose')}}</el-button>
</el-upload> </el-upload>
<!-- 自定义弹框 --> <!-- 自定义弹框 -->
<div class="dialogDiv"> <div class="file-upload__dialog">
<el-dialog <el-dialog
title="请选择模板" title="请选择模板"
center center
......
app_Web/packages/ibiz-vue/src/components/common/upload-file/upload-file.vue
浏览文件 @ c42ce37f
...@@ -19,9 +19,13 @@ ...@@ -19,9 +19,13 @@
:on-format-error="formaterror" :on-format-error="formaterror"
:on-exceeded-size="exceededsize" :on-exceeded-size="exceededsize"
:on-progress="progress"> :on-progress="progress">
<div class="upload-text"> <div class="upload-file__text">
<p>{{$t('components.uploadfile.imgmsg')}}</p> <p>{{$t('components.uploadfile.imgmsg')}}</p>
<p><span class="text-style">{{$t('components.uploadfile.localupload')}}</span>{{$t('components.uploadfile.or')}}<span class="text-style">{{$t('components.uploadfile.imgmsg1')}}</span></p> <p>
<span class="upload-file__text-style">{{$t('components.uploadfile.localupload')}}</span>
{{$t('components.uploadfile.or')}}
<span class="upload-file__text-style">{{$t('components.uploadfile.imgmsg1')}}</span>
</p>
</div> </div>
</upload> </upload>
</div> </div>
......
app_Web/packages/ibiz-vue/src/components/control/app-common-control/app-dataview-base.tsx
浏览文件 @ c42ce37f
...@@ -196,11 +196,21 @@ export class AppDataViewBase extends DataViewControlBase { ...@@ -196,11 +196,21 @@ export class AppDataViewBase extends DataViewControlBase {
width: this.controlInstance.cardWidth > 0 ? `${this.controlInstance.cardWidth}px` : false, width: this.controlInstance.cardWidth > 0 ? `${this.controlInstance.cardWidth}px` : false,
height: this.controlInstance.cardHeight > 0 ? `${this.controlInstance.cardHeight}px` : false height: this.controlInstance.cardHeight > 0 ? `${this.controlInstance.cardHeight}px` : false
}; };
const itemCssName = {
"app-control-dataview__content__item": true,
"is-active": item.srfchecked === 1
}
const itemCss = this.controlInstance.getItemPSSysCss();
if (itemCss) {
Object.assign(itemCssName, {
[itemCss.cssName] : true,
})
}
return ( return (
<el-card <el-card
shadow="hover" shadow="hover"
body-style={style} body-style={style}
class={{ "app-control-dataview__content__item": true, "is-active": item.srfchecked === 1}} class={itemCssName}
nativeOnClick={() => throttle(this.handleClick, [item], this)} nativeOnClick={() => throttle(this.handleClick, [item], this)}
nativeOnDblclick={() => throttle(this.handleDblClick, [item], this)}> nativeOnDblclick={() => throttle(this.handleDblClick, [item], this)}>
{this.controlInstance.getItemPSLayoutPanel() {this.controlInstance.getItemPSLayoutPanel()
......
app_Web/packages/ibiz-vue/src/components/control/app-common-control/app-list-base.tsx
浏览文件 @ c42ce37f
...@@ -162,10 +162,20 @@ export class AppListBase extends ListControlBase { ...@@ -162,10 +162,20 @@ export class AppListBase extends ListControlBase {
* @memberof AppListBase * @memberof AppListBase
*/ */
public renderDefaultItem(item: any, index: number) { public renderDefaultItem(item: any, index: number) {
const itemCssName = {
"app-control-list__content__item": true,
"is-active": item.srfchecked === 1
}
const itemCss = (this.controlInstance as any).M.getItemPSSysCss;
if (itemCss) {
Object.assign(itemCssName, {
[itemCss.cssName] : true,
})
}
return ( return (
<div <div
key={index} key={index}
class={{ "app-control-list__content__item": true, "is-active": item.srfchecked === 1}} class={itemCssName}
on-click={() => throttle(this.handleClick, [item], this)} on-click={() => throttle(this.handleClick, [item], this)}
on-dblclick={() => throttle(this.handleDblClick, [item], this)}> on-dblclick={() => throttle(this.handleDblClick, [item], this)}>
{this.controlInstance.getItemPSLayoutPanel() ? this.renderItemPSLayoutPanel(item) : this.renderListItemContent(item, index)} {this.controlInstance.getItemPSLayoutPanel() ? this.renderItemPSLayoutPanel(item) : this.renderListItemContent(item, index)}
......
app_Web/packages/ibiz-vue/src/components/control/app-common-control/app-searchform-base.tsx
浏览文件 @ c42ce37f
...@@ -5,7 +5,7 @@ import { ...@@ -5,7 +5,7 @@ import {
throttle, throttle,
} from 'ibiz-core'; } from 'ibiz-core';
import { SearchFormControlBase } from '../../../widgets'; import { SearchFormControlBase } from '../../../widgets';
import { IPSAppDEUIAction, IPSDEFormButton, IPSDEFormDetail, IPSDEFormDRUIPart, IPSDEFormFormPart, IPSDEFormGroupPanel, IPSDEFormIFrame, IPSDEFormPage, IPSDEFormRawItem, IPSDEFormTabPage, IPSDEFormTabPanel, IPSDESearchFormItem, IPSEditor, IPSFlexLayout, IPSFlexLayoutPos, IPSGridLayoutPos, IPSLayout, IPSLanguageRes } from '@ibiz/dynamic-model-api'; import { IPSDEFormButton, IPSDEFormDetail, IPSDEFormDRUIPart, IPSDEFormFormPart, IPSDEFormGroupPanel, IPSDEFormIFrame, IPSDEFormPage, IPSDEFormRawItem, IPSDEFormTabPage, IPSDEFormTabPanel, IPSDESearchFormItem, IPSEditor, IPSFlexLayout, IPSFlexLayoutPos, IPSGridLayoutPos, IPSLayout } from '@ibiz/dynamic-model-api';
/** /**
* 搜索表单部件基类 * 搜索表单部件基类
...@@ -703,11 +703,13 @@ export class AppSearchFormBase extends SearchFormControlBase { ...@@ -703,11 +703,13 @@ export class AppSearchFormBase extends SearchFormControlBase {
id={formId} id={formId}
on-on-valuidate={this.formItemValidate.bind(this)} on-on-valuidate={this.formItemValidate.bind(this)}
nativeOnkeyup={this.onKeyUp.bind(this)} nativeOnkeyup={this.onKeyUp.bind(this)}
> >
<row class="control-content app-control-searchform__content" style={this.getColStyle()}> <div class="control-content app-control-searchform__content">
{this.renderFormContent()} <row class="app-control-searchform__left" style={this.getColStyle()}>
</row> {this.renderFormContent()}
{this.renderSearchButton(searchButtonStyle)} </row>
{this.renderSearchButton(searchButtonStyle)}
</div>
</i-form> </i-form>
); );
} }
......
app_Web/packages/ibiz-vue/src/styles/components/common/action-timeline.less
浏览文件 @ c42ce37f
.action-timeline-table { .action-timeline-table {
width: calc(100% - 60px); width: calc(100% - 60px);
margin: 0 30px; margin: 0 30px;
border-collapse:separate; border-collapse: separate;
border-spacing:0px 40px; border-spacing: 0px 40px;
.action-timeline-thead { .action-timeline-thead {
th:nth-child(1) { th:nth-child(1) {
min-width: 200px; min-width: 200px;
} }
th:nth-child(2) { th:nth-child(2) {
width: 100% width: 100%
} }
} }
.action-timeline-tbody { }
tr {
td { .action-timeline-tbody {
position: relative; td {
> .tbody__date { position: relative;
display: flex;
width: 200px; >.tbody__date {
display: flex; display: flex;
justify-content: space-between; width: 200px;
padding: 16px; display: flex;
background-color: #f5f5f5; justify-content: space-between;
border-radius: 8px; padding: 16px;
font-size: 16px; background-color: #f5f5f5;
.arrow { border-radius: 8px;
margin-left: 10px; font-size: 16px;
}
} .arrow {
>.tbody__date::before { margin-left: 10px;
content: ' ';
display: block;
position: absolute;
right: -20px;
top: 30px;
height: 2px;
width: 20px;
// background-color: @color-dark-tint;
}
>.tbody__timeline {
padding: 16px;
min-height: 68px;
margin-left: 18px;
background-color: #f5f5f5;
border-radius: 8px;
.action-timeline-wrapper {
padding-left: 165px;
color: #57A3FD;
>.action-timeline-item {
position: relative;
height: 30px;
display: list-item;
list-style: none;
top: -6px;
>.action-timeline-item__time {
position: absolute;
left: -115px;
top: 5px;
font-size: 12px;
}
>.action-timeline-item__content {
padding: 5px;
padding-left: 65px;
}
}
>.action-timeline-item::before {
position: absolute;
top: 17px;
left: 45px;
z-index: 3;
width: 7px;
height: 7px;
// background-color: @color-dark-base;
// border: 1px solid @color-dark-base;
border: 1px solid ;
content: ' ';
border-radius: 50%;
}
>.action-timeline-item:nth-child(n+2)::after {
position: absolute;
top: -7px;
bottom: 12px;
left: 48px;
z-index: 1;
display: block;
content: ' ';
// border-left: 1px solid @color-dark-base;
border-left: 1px solid ;
}
}
}
} }
} }
>.tbody__date::before {
content: ' ';
display: block;
position: absolute;
right: -20px;
top: 30px;
height: 2px;
width: 20px;
background-color: black;
}
}
}
>.tbody__timeline {
padding: 16px;
min-height: 68px;
margin-left: 18px;
background-color: #f5f5f5;
border-radius: 8px;
}
.action-timeline-wrapper {
padding-left: 165px;
color: #57A3FD;
>.action-timeline-item {
position: relative;
height: 30px;
display: list-item;
list-style: none;
top: -6px;
>.action-timeline-item__time {
position: absolute;
left: -115px;
top: 5px;
font-size: 12px;
}
>.action-timeline-item__content {
padding: 5px;
padding-left: 65px;
}
}
.action-timeline-item::before {
position: absolute;
top: 17px;
left: 45px;
z-index: 3;
width: 7px;
height: 7px;
background-color: black;
border: 1px solid black;
content: ' ';
border-radius: 50%;
}
.action-timeline-item:nth-child(n+2)::after {
position: absolute;
top: -7px;
bottom: 12px;
left: 48px;
z-index: 1;
display: block;
content: ' ';
border-left: 1px solid black;
} }
} }
\ No newline at end of file
app_Web/packages/ibiz-vue/src/styles/components/common/app-content-bottom-exp-view-layout.less
浏览文件 @ c42ce37f
.app-content-bottom-exp { .tab-exp-item-content {
> .ivu-tabs { >.studio-view.view-container {
> .ivu-tabs-content { position: unset;
> .ivu-tabs-tabpane {
> .tab-exp-item-content { .view-header {
> .studio-view.view-container { position: absolute;
position: unset; top: 0px;
right: 30px;
> .view-header { z-index: 1;
position: absolute; width: auto;
top: 0px; height: 30px;
right: 30px; border: 0px;
z-index: 1; }
width: auto;
height: 30px;
border: 0px;
> .title {
display: none;
}
> .toolbar { .title {
font-size: 12px; display: none;
}
> .toolbar-container { .view-content {
> .ivu-btn.ivu-btn-default { height: 100%;
font-size: 12px; }
background-color: transparent; }
border: 0px;
}
> .ivu-btn.ivu-btn-default:disabled { .quick-search {
// color: var(--view-button-background-color-disabled); width: 230px;
}
}
}
> .quick-search { .ivu-input.ivu-input-default.ivu-input-with-suffix {
width: 230px; height: 24px;
line-height: 24px;
background-color: transparent;
}
> .ivu-input-wrapper.ivu-input-wrapper-default.ivu-input-type-text { .ivu-input-icon {
> .ivu-input.ivu-input-default.ivu-input-with-suffix { width: 24px;
height: 24px; height: 24px;
line-height: 24px; line-height: 24px;
background-color: transparent; }
} }
> .ivu-input-icon { .toolbar {
width: 24px; font-size: 12px;
height: 24px; }
line-height: 24px;
}
}
}
}
> .view-content { .toolbar-container {
height: 100%; >.ivu-btn.ivu-btn-default {
} font-size: 12px;
} background-color: transparent;
} border: 0px;
} }
} }
} }
} \ No newline at end of file
app_Web/packages/ibiz-vue/src/styles/components/common/app-content-bottom-exp.less
浏览文件 @ c42ce37f
...@@ -2,38 +2,35 @@ ...@@ -2,38 +2,35 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
> .ivu-tabs.ivu-tabs-mini { >.ivu-tabs.ivu-tabs-mini {
> .ivu-tabs-bar { .ivu-tabs-nav-wrap {
> .ivu-tabs-nav-container { height: 30px;
> .ivu-tabs-nav-wrap {
height: 30px;
}
}
} }
}
.tab-exp-title { .tab-exp-title {
> i,
img {
padding-right: 3px;
}
}
> .ivu-tabs-content {
width: 100%;
height: calc(100% - 29px);
padding: 0px;
> .ivu-tabs-tabpane { >i,
width: 100%; img {
height: 100%; padding-right: 3px;
}
} }
> .tab-exp-item-content { }
>.ivu-tabs-content {
width: 100%;
height: calc(100% - 29px);
padding: 0px;
>.ivu-tabs-tabpane {
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow-x: hidden;
overflow-y: auto;
} }
} }
} >.tab-exp-item-content {
width: 100%;
height: 100%;
overflow-x: hidden;
overflow-y: auto;
}
}
\ No newline at end of file
app_Web/packages/ibiz-vue/src/styles/components/common/app-content-left-exp.less
浏览文件 @ c42ce37f
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
height: 100%; height: 100%;
display: flex; display: flex;
> .exp-actions { >.exp-actions {
height: 100%; height: 100%;
width: 48px; width: 48px;
> .action-item {
>.action-item {
position: relative; position: relative;
height: 48px; height: 48px;
width: 48px; width: 48px;
...@@ -14,53 +15,55 @@ ...@@ -14,53 +15,55 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
cursor: pointer; cursor: pointer;
}
> .active-item-indicator { .active-item-indicator {
position: absolute; position: absolute;
z-index: 1; z-index: 1;
top: 0; top: 0;
bottom: 0; bottom: 0;
margin: auto; margin: auto;
left: 0; left: 0;
overflow: hidden; overflow: hidden;
width: 100%; width: 100%;
height: 100%; height: 100%;
pointer-events: none; pointer-events: none;
}
} }
}
> .action-item.active { .action-item.active {
> .active-item-indicator::before { >.active-item-indicator::before {
content: ''; content: '';
position: absolute; position: absolute;
z-index: 1; z-index: 1;
top: 0; top: 0;
left: 0; left: 0;
height: 100%; height: 100%;
width: 0; width: 0;
border-left: 2px solid; border-left: 2px solid;
}
} }
} }
> .exp-content { >.exp-content {
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: hidden; overflow: hidden;
> .exp-item { >.exp-item {
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
.ivu-card-body{ }
height: calc(100% - 57px) ;
} .ivu-card-body {
.view-header { height: calc(100% - 57px);
> .quick-search { }
width: 150px;
} .view-header {
>.quick-search {
width: 150px;
} }
} }
} }
} }
\ No newline at end of file
app_Web/packages/ibiz-vue/src/styles/components/common/app-content-left-nav-menu.less
浏览文件 @ c42ce37f
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
border-radius: 0; border-radius: 0;
box-shadow: none; box-shadow: none;
border: 0; border: 0;
// background-color: var(--app-background-color-scrollbar); //background-color: var(--app-background-color-scrollbar);
} }
//火狐浏览器滚动条样式 //火狐浏览器滚动条样式
.app-content-lef-nav-menu { .app-content-lef-nav-menu {
...@@ -35,35 +35,34 @@ ...@@ -35,35 +35,34 @@
min-height: 100%; min-height: 100%;
background-color: #ddd; background-color: #ddd;
border: 0; border: 0;
}
.el-menu-item,
.el-submenu__title {
min-width: calc(100% - 10px);
height: 38px;
line-height: 38px;
font-size: 18px;
padding-left: 10px;
padding-right: 0px;
.el-menu-item, > i {
.el-submenu > .el-submenu__title { margin-right: 5px;
min-width: calc(100% - 10px); width: 24px;
height: 38px; text-align: center;
line-height: 38px; vertical-align: middle;
font-size: 18px; }
padding-left: 10px !important;
padding-right: 0px !important;
> i {
margin-right: 5px;
width: 24px;
text-align: center;
vertical-align: middle;
}
> span { > span {
font-size: 14px; font-size: 14px;
} }
>span + i { >span + i {
line-height: 16px; line-height: 16px;
}
} }
}
.el-submenu { .el-submenu {
> .el-menu.el-menu--inline { > .el-menu.el-menu--inline {
padding-left: 10px; padding-left: 10px;
}
} }
} }
...@@ -74,27 +73,28 @@ ...@@ -74,27 +73,28 @@
.el-menu.el-menu--collapse { .el-menu.el-menu--collapse {
width: 48px; width: 48px;
> .el-submenu > .el-submenu__title, .el-submenu__title,
> .el-menu-item, > .el-menu-item,
> .el-menu-item > .el-tooltip { .el-tooltip {
padding: 0 !important; padding: 0 ;
text-align: center; text-align: center;
width: 48px; width: 48px;
min-width: 48px; min-width: 48px;
> i { > i {
margin: 0 !important; margin: 0;
// color: #616161; color: #616161;
} }
} }
} }
} }
// 菜单收起后漂浮菜单样式 // 菜单收起后漂浮菜单样式
// .el-menu--vertical { .el-menu--vertical {
// .el-menu { .el-menu {
// .app-content-lef-nav-menu .el-menu; .app-content-lef-nav-menu .el-menu;
// } }
}
// > .el-menu, // > .el-menu,
// > .ivu-layout > .ivu-layout-sider .app-app-menu > .app-menu { // > .ivu-layout > .ivu-layout-sider .app-app-menu > .app-menu {
// // background-color: var(--leftsidebar-background-color); // // background-color: var(--leftsidebar-background-color);
...@@ -109,67 +109,67 @@ ...@@ -109,67 +109,67 @@
// // color: var(--leftsidebar-font-color-bright); // // color: var(--leftsidebar-font-color-bright);
// } // }
// } // }
// .el-submenu__title:hover { // .el-submenu__title:hover {
// // background-color: var(--leftsidebar-background-color-bright); // // background-color: var(--leftsidebar-background-color-bright);
// i { // i {
// // color: var(--leftsidebar-font-color); // // color: var(--leftsidebar-font-color);
// } // }
// span { // span {
// // color: var(--leftsidebar-font-color-bright); // // color: var(--leftsidebar-font-color-bright);
// } // }
// } // }
// .el-submenu.is-active { // .el-submenu.is-active {
// // background-color: var(--leftsidebar-background-color-bright); // // background-color: var(--leftsidebar-background-color-bright);
// >.el-submenu__title { // >.el-submenu__title {
// i { // i {
// color: var(--leftsidebar-font-color); // color: var(--leftsidebar-font-color);
// } // }
// span{ // span{
// color: var(--leftsidebar-font-color); // color: var(--leftsidebar-font-color);
// } // }
// } // }
// } // }
// .el-menu-item.is-active { // .el-menu-item.is-active {
// background-color: var(--leftsidebar-background-color-bright); // background-color: var(--leftsidebar-background-color-bright);
// i { // i {
// color: var(--leftsidebar-font-color-bright); // color: var(--leftsidebar-font-color-bright);
// } // }
// span { // span {
// color: var(--leftsidebar-font-color-bright); // color: var(--leftsidebar-font-color-bright);
// } // }
// } // }
// .el-submenu.is-opened, // .el-submenu.is-opened,
// .el-submenu:hover { // .el-submenu:hover {
// > .el-submenu__title { // > .el-submenu__title {
// background: var(--leftsidebar-background-color-bright); // background: var(--leftsidebar-background-color-bright);
// } // }
// } // }
// .el-submenu__title, // .el-submenu__title,
// .el-menu-item { // .el-menu-item {
// i { // i {
// color: var(--leftsidebar-font-color); // color: var(--leftsidebar-font-color);
// } // }
// span { // span {
// color: var(--leftsidebar-font-color); // color: var(--leftsidebar-font-color);
// } // }
// } // }
// .el-menu-item { // .el-menu-item {
// i { // i {
// color: var(--leftsidebar-font-color); // color: var(--leftsidebar-font-color);
// } // }
// span { // span {
// color: var(--leftsidebar-font-color); // color: var(--leftsidebar-font-color);
// } // }
// border-top: 1px solid var(--leftsidebar-background-color); // border-top: 1px solid var(--leftsidebar-background-color);
// background: var(--leftsidebar-background-color); // background: var(--leftsidebar-background-color);
// } // }
// .el-submenu { // .el-submenu {
// border-top: 1px solid var(--leftsidebar-background-color); // border-top: 1px solid var(--leftsidebar-background-color);
// background: var(--leftsidebar-background-color); // background: var(--leftsidebar-background-color);
// > .el-menu { // > .el-menu {
// border-top: 1px solid var(--leftsidebar-background-color); // border-top: 1px solid var(--leftsidebar-background-color);
// background: var(---leftsidebar-background-color); // background: var(---leftsidebar-background-color);
// } // }
// } // }
// } // }
// } // }
app_Web/packages/ibiz-vue/src/styles/components/common/app-content.less
浏览文件 @ c42ce37f
...@@ -8,19 +8,17 @@ ...@@ -8,19 +8,17 @@
} }
} }
.app-content-right.hidden-bottom { .app-content-right.hidden-bottom {
> .ivu-split-wrapper { .ivu-split-vertical {
> .ivu-split-vertical { > .top-pane.ivu-split-pane {
> .top-pane.ivu-split-pane { bottom: 0px ;
bottom: 0px ; }
}
> .ivu-split-trigger-con { > .ivu-split-trigger-con {
display: none; display: none;
} }
> .bottom-pane.ivu-split-pane { > .bottom-pane.ivu-split-pane {
display: none; display: none;
}
} }
} }
} }
......
app_Web/packages/ibiz-vue/src/styles/components/common/app-department-personnel.less
浏览文件 @ c42ce37f
...@@ -3,39 +3,36 @@ ...@@ -3,39 +3,36 @@
.ivu-select-selection{ .ivu-select-selection{
position: relative; position: relative;
padding: 0; padding: 0;
.ivu-select-selected-value{ }
padding-left: 15px; .ivu-select-selected-value{
font-size: 13px; padding-left: 15px;
} font-size: 13px;
.ivu-tag.ivu-tag-checked{ }
top: 1px; .ivu-tag.ivu-tag-checked{
font-size: 12px; top: 1px;
height: 24px; font-size: 12px;
line-height: 22px; height: 24px;
margin: 2px 0px 2px 6px; line-height: 22px;
padding: 0 3px 0 8px; margin: 2px 0px 2px 6px;
.ivu-tag-text{ padding: 0 3px 0 8px;
padding: 0 8px 0 0; .ivu-tag-text{
} padding: 0 8px 0 0;
}
.ivu-icon.ivu-icon-ios-close{
position: absolute;
width: 10px;
line-height: 10px;
height: 10px;
top: 6px;
margin-left: 8px;
font-size: 4px;
border-radius: 50%;
}
.ivu-icon-ios-close:before {
position: absolute;
left: -1px;
}
&.ivu-select-selection-focused{
.editor-border-active;
} }
} }
.ivu-icon.ivu-icon-ios-close{
position: absolute;
width: 10px;
line-height: 10px;
height: 10px;
top: 6px;
margin-left: 8px;
font-size: 4px;
border-radius: 50%;
}
.ivu-icon-ios-close:before {
position: absolute;
left: -1px;
}
.el-icon-search{ .el-icon-search{
position: absolute; position: absolute;
top: 10px; top: 10px;
......
app_Web/packages/ibiz-vue/src/styles/components/common/app-department-select.less
浏览文件 @ c42ce37f
.app-department-select { .app-department-select {
.ivu-dropdown { .ivu-input-suffix {
.ivu-dropdown-rel { width: auto;
.tree-input { text-align: right;
.ivu-input-suffix {
width: auto;
text-align: right;
.icon-arrow { .icon-arrow {
margin-right: 4px; margin-right: 4px;
} }
} }
.el-icon-circle-close { .el-icon-circle-close {
display: none; display: none;
} }
}
.tree-input:hover { .tree-input:hover {
.el-icon-circle-close { .el-icon-circle-close {
display: inline-block; display: inline-block;
}
}
} }
}
.ivu-select-dropdown { .ivu-select-dropdown {
max-height: 200px; max-height: 200px;
overflow: scroll; overflow: scroll;
.tree-contant { .tree-contant {
overflow: inherit; overflow: inherit;
}
} }
} }
......
app_Web/packages/ibiz-vue/src/styles/components/common/app-footer.less
浏览文件 @ c42ce37f
...@@ -15,21 +15,19 @@ ...@@ -15,21 +15,19 @@
cursor: pointer; cursor: pointer;
padding: 0px 6px; padding: 0px 6px;
font-size: 14px; font-size: 14px;
&:hover {
> .action-item { background: hsla(0, 0%, 100%, 0.12);
height: 100%;
display: flex;
align-items: center;
> i,
> img {
padding-right: 3px;
}
} }
} }
}
.action-item {
height: 100%;
display: flex;
align-items: center;
> .item:hover { > i,
background: hsla(0, 0%, 100%, 0.12); > img {
padding-right: 3px;
} }
} }
......
app_Web/packages/ibiz-vue/src/styles/components/common/app-form-group.less
浏览文件 @ c42ce37f
...@@ -28,6 +28,9 @@ ...@@ -28,6 +28,9 @@
pointer-events: none; pointer-events: none;
} }
} }
.app-form-group__action__showmore {
margin-left: 12px;
}
&.is-flex { &.is-flex {
height: 100%; height: 100%;
overflow-y: auto; overflow-y: auto;
......
app_Web/packages/ibiz-vue/src/styles/components/common/app-group-select.less
浏览文件 @ c42ce37f
...@@ -9,27 +9,27 @@ ...@@ -9,27 +9,27 @@
flex-grow: 1; flex-grow: 1;
min-height: 32px; min-height: 32px;
height: auto; height: auto;
.app-group-select__content__text{ }
padding-left: 15px; .app-group-select__content__text{
font-size: 13px; padding-left: 15px;
font-size: 13px;
}
.app-group-select__content__item {
display: inline-block;
border-radius: 5px;
font-size: 12px;
height: 24px;
line-height: 22px;
margin: 2px 0px 2px 6px;
padding: 1px 3px 0 8px;
background-color: #f4f4f5;
border-color: #e9e9eb;
color: #909399;
.item__label{
margin: 0 8px 0 0;
} }
.app-group-select__content__item { .el-icon-circle-close{
display: inline-block; cursor: pointer;
border-radius: 5px;
font-size: 12px;
height: 24px;
line-height: 22px;
margin: 2px 0px 2px 6px;
padding: 1px 3px 0 8px;
background-color: #f4f4f5;
border-color: #e9e9eb;
color: #909399;
.item__label{
margin: 0 8px 0 0;
}
.el-icon-circle-close{
cursor: pointer;
}
} }
} }
.app-group-select__open { .app-group-select__open {
......
app_Web/packages/ibiz-vue/src/styles/components/common/app-header-right-menus.less
浏览文件 @ c42ce37f
...@@ -17,32 +17,26 @@ ...@@ -17,32 +17,26 @@
background: hsla(0, 0%, 100%, 0.12); background: hsla(0, 0%, 100%, 0.12);
border-bottom: none; border-bottom: none;
} }
.ivu-icon.ivu-icon-ios-arrow-down.ivu-menu-submenu-title-icon {
margin-right: 0px;
}
> .ivu-menu-submenu { .ivu-select-dropdown {
> .ivu-menu-submenu-title {
> .ivu-icon.ivu-icon-ios-arrow-down.ivu-menu-submenu-title-icon {
margin-right: 0px;
}
}
> .ivu-select-dropdown {
max-height: 350px; max-height: 350px;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
}
> .ivu-menu-drop-list {
> .ivu-menu-item,
> .ivu-menu-submenu {
border: 0px;
padding: 5px 8px;
}
> .ivu-menu-drop-list { > .ivu-menu-item:hover,
> .ivu-menu-item, > .ivu-menu-submenu:hover {
> .ivu-menu-submenu { background: hsla(0, 0%, 100%, 0.12);
border: 0px; padding: 5px 8px;
padding: 5px 8px;
}
> .ivu-menu-item:hover,
> .ivu-menu-submenu:hover {
background: hsla(0, 0%, 100%, 0.12);
padding: 5px 8px;
}
}
} }
} }
} }
......
app_Web/packages/ibiz-vue/src/styles/components/common/app-markdown-editor.less
浏览文件 @ c42ce37f
.app-mavon-editor { .app-mavon-editor {
border-width: 0 ; border-width: 0 ;
.v-note-panel { .v-note-panel {
.v-show-content { td, th {
table { border-color: #666 ;
tr { }
td, th { pre, .highlight pre {
border-color: #666 ; color: #333;
} }
} h1, h2, h3, h4, h5, h6 {
} border-color: #666;
pre, .highlight pre {
color: #333;
}
h1, h2, h3, h4, h5, h6 {
border-color: #666;
}
} }
.v-show-content-html { .v-show-content-html {
border-left: 1px solid #666; border-left: 1px solid #666;
...@@ -22,10 +16,10 @@ ...@@ -22,10 +16,10 @@
} }
.v-note-op { .v-note-op {
border-width: 0 ; border-width: 0 ;
.v-left-item { }
.op-icon-divider { .v-left-item {
border-color: #666; .op-icon-divider {
} border-color: #666;
} }
} }
.op-icon.dropdown-wrapper.dropdown .popup-dropdown { .op-icon.dropdown-wrapper.dropdown .popup-dropdown {
......
app_Web/packages/ibiz-vue/src/styles/components/common/app-studioaction.less
浏览文件 @ c42ce37f
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
right: 0; right: 0;
bottom: 0; bottom: 0;
left: 0; left: 0;
> .debug-container {
>.debug-container {
display: inline-block; display: inline-block;
width: auto; width: auto;
position: absolute; position: absolute;
...@@ -13,15 +14,19 @@ ...@@ -13,15 +14,19 @@
z-index: 10; z-index: 10;
} }
} }
.app-studioaction { .app-studioaction {
z-index: 10; z-index: 10;
.ivu-poptip-inner { .ivu-poptip-inner {
background-color: rgba(96, 98, 102, 0.8); background-color: rgba(96, 98, 102, 0.8);
border-radius: 5px; border-radius: 5px;
} }
.ivu-poptip-arrow { .ivu-poptip-arrow {
display: none; display: none;
} }
.ivu-poptip-body { .ivu-poptip-body {
padding: 0px; padding: 0px;
} }
...@@ -44,6 +49,7 @@ ...@@ -44,6 +49,7 @@
} }
} }
} }
.app-studio-debug-bar { .app-studio-debug-bar {
border-radius: 5px; border-radius: 5px;
background-color: rgba(96, 98, 102, 0.8); background-color: rgba(96, 98, 102, 0.8);
...@@ -69,10 +75,12 @@ ...@@ -69,10 +75,12 @@
z-index: 1; z-index: 1;
padding-left: 6px; padding-left: 6px;
padding: 3px 6px; padding: 3px 6px;
> .ivu-btn {
>.ivu-btn {
margin: 0; margin: 0;
} }
} }
.drag-handle { .drag-handle {
position: absolute; position: absolute;
width: 100%; width: 100%;
...@@ -83,7 +91,8 @@ ...@@ -83,7 +91,8 @@
border-left: 1px solid #bbb; border-left: 1px solid #bbb;
height: 34px; height: 34px;
padding: 0px 3px; padding: 0px 3px;
> svg {
>svg {
margin-top: 8px; margin-top: 8px;
} }
} }
...@@ -100,7 +109,26 @@ ...@@ -100,7 +109,26 @@
border: 3px solid paleturquoise; border: 3px solid paleturquoise;
z-index: 1; z-index: 1;
} }
.app-studio-debug-detail-wrapper { .app-studio-debug-detail-wrapper {
.detail-item-title {
font-size: 16px;
height: 32px;
line-height: 32px;
margin-bottom: 6px;
border-bottom: 1px solid #ccc;
.tag {
cursor: pointer;
&.isfold {
.ivu-icon {
transform: rotate(180deg);
}
}
}
}
.app-studio-debug-detail { .app-studio-debug-detail {
color: #fff; color: #fff;
width: 300px; width: 300px;
...@@ -109,67 +137,67 @@ ...@@ -109,67 +137,67 @@
border-radius: 5px; border-radius: 5px;
right: calc(100% + 10px); right: calc(100% + 10px);
top: 0; top: 0;
.detail-item-title { }
font-size: 16px;
height: 32px; .detail-item-wrapper {
line-height: 32px; transition: all 1s;
margin-bottom: 6px; height: auto;
border-bottom: 1px solid #ccc;
.tag { &.isfold {
height: 0;
overflow: hidden;
}
.detail-item {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
.value,
.key {
cursor: pointer; cursor: pointer;
&.isfold {
.ivu-icon { &:hover {
transform: rotate(180deg); color: rgb(219, 230, 255);
}
} }
} }
}
.detail-item-wrapper { .key-wrapper {
transition: all 1s; width: 110px;
height: auto; height: 26px;
&.isfold { line-height: 26px;
height: 0; display: inline-block;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden; overflow: hidden;
text-align: end;
} }
.detail-item {
.value-wrapper {
width: calc(100% - 110px);
height: 26px;
line-height: 26px;
display: inline-block;
text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis;
.value,
.key {
cursor: pointer;
&:hover {
color: rgb(219, 230, 255);
}
}
.key-wrapper {
width: 110px;
height: 26px;
line-height: 26px;
display: inline-block;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
text-align: end;
}
.value-wrapper {
width: calc(100% - 110px);
height: 26px;
line-height: 26px;
display: inline-block;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
} }
} }
} }
} }
.isblock {
display: block;
}
.isnone {
display: none;
}
.view-container { .view-container {
> .view-container { >.view-container {
.app-studio-debug-bar { .app-studio-debug-bar {
top: 50px; top: 50px;
} }
} }
} }
\ No newline at end of file
app_Web/packages/ibiz-vue/src/styles/components/common/context-menu-drag.less
浏览文件 @ c42ce37f
.sider-drawer { .sider-drawer {
// .ivu-drawer {
// background-color: var(--app-color-primary-contrast) !important;
// }
.ivu-drawer-body { .ivu-drawer-body {
padding: 0px !important; padding: 0px;
} }
.context-menu-drag { .context-menu-drag {
...@@ -14,20 +10,19 @@ ...@@ -14,20 +10,19 @@
transition: transform 0.3s; transition: transform 0.3s;
} }
.menu-list { .context-menu__list {
width: 100%; width: 100%;
height: 100%; height: 100%;
.menu-header { .context-menu__list__header {
cursor: pointer; cursor: pointer;
// border-bottom: 1px solid var(--item-font-color-bright);
border-bottom: 1px solid ; border-bottom: 1px solid ;
height: 48px; height: 48px;
line-height: 48px; line-height: 48px;
display: flex; display: flex;
align-items: center; align-items: center;
.menuicon { .header__menuicon {
display: inline-block; display: inline-block;
width: 50px; width: 50px;
font-size: 16px; font-size: 16px;
...@@ -35,7 +30,7 @@ ...@@ -35,7 +30,7 @@
font-size: 22px; font-size: 22px;
} }
.content { .header__content {
display: inline-block; display: inline-block;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
...@@ -44,17 +39,16 @@ ...@@ -44,17 +39,16 @@
font-size: 13px; font-size: 13px;
} }
.forward { .header__forward {
margin: 0px 8px 0px 4px; margin: 0px 8px 0px 4px;
// color: var(--item-font-color-bright);
font-size: 15px; font-size: 15px;
} }
} }
.menu-content { .context-menu__list__content {
padding: 8px 0px; padding: 8px 0px;
.menu-content-item { .content__item {
display: flex; display: flex;
align-items: center; align-items: center;
height: 36px; height: 36px;
...@@ -66,7 +60,7 @@ ...@@ -66,7 +60,7 @@
line-height: 36px; line-height: 36px;
} }
.title { .caption {
font-size: 16px; font-size: 16px;
display: inline-block; display: inline-block;
margin-left: 8px; margin-left: 8px;
...@@ -74,7 +68,7 @@ ...@@ -74,7 +68,7 @@
} }
} }
.menu-content-item:hover { .content__item:hover {
color: #2d8df3; color: #2d8df3;
} }
} }
...@@ -84,12 +78,12 @@ ...@@ -84,12 +78,12 @@
.style-top { .style-top {
.ivu-drawer { .ivu-drawer {
top: 41px !important; top: 41px ;
} }
} }
.default-top { .default-top {
.ivu-drawer { .ivu-drawer {
top: 50px !important; top: 50px;
} }
} }
\ No newline at end of file
app_Web/packages/ibiz-vue/src/styles/components/common/context-menu.less
浏览文件 @ c42ce37f
...@@ -2,45 +2,39 @@ ...@@ -2,45 +2,39 @@
z-index: 10001; z-index: 10001;
.context-menu-content { .context-menu-content {
position: absolute; position: absolute;
// background: var(--item-background-color-bright);
.ivu-divider { .ivu-divider {
width: 100%; width: 100%;
} }
&.context-menus-bottom {
.ivu-select-dropdown { &.context-menus-bottom {
transform: translateY(-100%); .ivu-select-dropdown {
} transform: translateY(-100%);
} }
}
} }
.context-menus { .context-menus {
.context-menus-item { .context-menus-item {
list-style: none; list-style: none;
line-height: 36px; line-height: 36px;
padding: 0 13px; padding: 0 13px;
margin: 0; margin: 0;
font-size: 14px; font-size: 14px;
// color: var(--item-font-color-light); cursor: pointer;
cursor: pointer; outline: none;
outline: none; display: flex;
display: flex;
.icon { .icon {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
font-size: 16px; font-size: 16px;
width: 20px; width: 20px;
margin-right: 8px; margin-right: 8px;
}
} }
}
// .context-menus-item:hover {
// background-color: var(--item-background-color-hover);
// color: var(--item-font-color-light);
// }
} }
} }
...@@ -54,4 +48,4 @@ ...@@ -54,4 +48,4 @@
.context-menu-component { .context-menu-component {
line-height: 100%; line-height: 100%;
} }
\ No newline at end of file
app_Web/packages/ibiz-vue/src/styles/components/common/studio-view-style2-layout.less
浏览文件 @ c42ce37f
...@@ -3,54 +3,40 @@ ...@@ -3,54 +3,40 @@
flex-shrink: 0; flex-shrink: 0;
min-height: 36px; min-height: 36px;
} }
.app-search-form.ivu-form { .app-search-form.ivu-form {
.search-button { .app-form-item.label-top {
width: 236px; margin: 0;
.ivu-btn {
float: right;
margin-left: 10px;
background: 0 0;
// color: var(--view-button-background-color);
}
} }
.form-content { }
width: 236px; .search-button {
width: 236px;
.app-form-item.label-top { .ivu-btn {
margin: 0; float: right;
} margin-left: 10px;
background: 0 0;
.app-form-item { // color: var(--view-button-background-color);
.app-form-item-label { }
height: 26px; }
line-height: 26px; .app-form-item-label {
} height: 26px;
line-height: 26px;
.editor-wrapper { }
.ivu-input-wrapper { .form-content {
.ivu-input { width: 236px;
height: 26px; .ivu-input {
line-height: 26px; height: 26px;
} line-height: 26px;
} }
.ivu-select-selection {
.ivu-select { height: 26px;
.ivu-select-selection { }
height: 26px; .ivu-select-placeholder {
height: 26px;
.ivu-select-placeholder { line-height: 26px;
height: 26px;
line-height: 26px;
}
}
}
}
}
} }
} }
} }
// .app-portal-view.studio-view.view-container.mode-style2 { // .app-portal-view.studio-view.view-container.mode-style2 {
......
app_Web/packages/ibiz-vue/src/styles/components/common/studio-view-style2.less
浏览文件 @ c42ce37f
...@@ -63,10 +63,9 @@ ...@@ -63,10 +63,9 @@
> .title { > .title {
font-size: 20px; font-size: 20px;
height: 50px; height: 50px;
}
.caption-image { .caption-image {
margin-right: 6px; margin-right: 6px;
}
} }
> .data-panel { > .data-panel {
...@@ -81,17 +80,15 @@ ...@@ -81,17 +80,15 @@
.view-header.hidden-top { .view-header.hidden-top {
// border-bottom: 1px solid var(--app-dividing-line-color-bright); // border-bottom: 1px solid var(--app-dividing-line-color-bright);
.quick-search { .ivu-input.ivu-input-default.ivu-input-with-suffix {
.ivu-input.ivu-input-default.ivu-input-with-suffix { height: 28px;
height: 28px; line-height: 28px;
line-height: 28px; }
}
.ivu-input-icon { .ivu-input-icon {
width: 28px; width: 28px;
height: 28px; height: 28px;
line-height: 28px; line-height: 28px;
}
} }
} }
...@@ -114,19 +111,17 @@ ...@@ -114,19 +111,17 @@
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
.app-search-form {
display: block;
width: 250px;
height: 100%;
// border-right: 1px solid var(--app-dividing-line-color-bright);
.ivu-select-input,
.el-input .el-input__inner {
height: 26px;
line-height: 26px;
}
}
} }
.app-search-form {
display: block;
width: 250px;
height: 100%;
// border-right: 1px solid var(--app-dividing-line-color-bright);
}
.ivu-select-input,.el-input .el-input__inner {
height: 26px;
line-height: 26px;
}
> .content-wrapper { > .content-wrapper {
flex-grow: 1; flex-grow: 1;
......
app_Web/packages/ibiz-vue/src/styles/components/common/studio-view.less
浏览文件 @ c42ce37f
...@@ -4,25 +4,6 @@ ...@@ -4,25 +4,6 @@
position: relative; position: relative;
height: 100%; height: 100%;
width: 100%; width: 100%;
// background: var(--view-background-color);
.app-search-form {
padding: 4px 0px 4px 7px;
display: flex;
flex-direction: row-reverse;
> .search-button {
flex-shrink: 0;
> .ivu-btn {
margin-left: 4px;
}
}
> .form-content {
flex-grow: 1;
}
}
.quick-search { .quick-search {
float: left; float: left;
...@@ -36,19 +17,8 @@ ...@@ -36,19 +17,8 @@
.ivu-input.ivu-input-default.ivu-input-with-suffix { .ivu-input.ivu-input-default.ivu-input-with-suffix {
height: 28px; height: 28px;
line-height: 28px; line-height: 28px;
// border: 1px solid var(--form-editor-border-color);
// color: var(--form-editor-font-color);
// background-color: var(--form-editor-background-color);
} }
// .ivu-input.ivu-input-default.ivu-input-with-suffix:hover {
// border-color: var(--form-editor-active-color);
// }
// .ivu-input.ivu-input-default.ivu-input-with-suffix::-webkit-input-placeholder {
// color: var(--form-editor-placeholder-font-color);
// }
.ivu-input-icon { .ivu-input-icon {
width: 28px; width: 28px;
height: 28px; height: 28px;
...@@ -56,134 +26,144 @@ ...@@ -56,134 +26,144 @@
} }
} }
> .view-header { .app-search-form {
padding: 4px 0px 4px 7px;
display: flex;
flex-direction: row-reverse;
>.search-button {
flex-shrink: 0;
>.ivu-btn {
margin-left: 4px;
}
}
>.form-content {
flex-grow: 1;
}
}
.view-header__title {
float: left;
font-size: 14px;
font-weight: 700;
padding: 0px 8px;
.caption-image {
margin-right: 6px;
}
}
.view-header {
height: 42px; height: 42px;
width: 100%; width: 100%;
overflow: hidden; overflow: hidden;
// color: var(--app-font-color);
// border-bottom: 1px solid var(--app-background-color-light); >.view-header__title,
>.quick-search,
> .title, >.view-header__toolbar {
> .quick-search,
> .toolbar {
height: 100%; height: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
padding: 0px 0px 0px 3px; padding: 0px 0px 0px 3px;
} }
> .title { >.quick-group-search,
float: left; >.quick-search-form {
font-size: 14px;
font-weight: 700;
padding: 0px 8px;
.caption-image {
margin-right: 6px;
}
}
> .quick-group-search,
> .quick-search-form {
float: left; float: left;
height: 100%; height: 100%;
margin-left: 8px; margin-left: 8px;
display: flex; display: flex;
align-items: center; align-items: center;
} }
> .toolbar { >.view-header__toolbar {
float: right; float: right;
} }
} }
> .view-content { .view-content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: calc(100% - 42px); height: calc(100% - 42px);
width: 100%; width: 100%;
padding: 3px 3px 0px 3px !important; padding: 3px 3px 0px 3px;
// color: var(--view-font-color);
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
> .content-wrapper { >.content-wrapper {
height: 100%; height: 100%;
} }
} }
> .view-content.show-search-form { .view-content.show-search-form {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
overflow: hidden; overflow: hidden;
> .search-form-wrapper { >.search-form-wrapper {
flex-shrink: 0; flex-shrink: 0;
} }
> .search-bar-wrapper { >.search-bar-wrapper {
flex-shrink: 0; flex-shrink: 0;
} }
> .content-wrapper { >.content-wrapper {
flex-grow: 1; flex-grow: 1;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
} }
} }
> .view-content { .view-content {
> .search-bar-wrapper { .search-bar-action {
.search-bar-action { margin-bottom: 4px;
margin-bottom: 4px; text-align: right;
text-align: right;
.ivu-btn {
.ivu-btn { margin-left: 4px;
margin-left: 4px;
}
} }
} }
} }
}
.ivu-poptip-popper { .ivu-poptip-popper {
.save-action { .save-action {
margin-top: 4px; margin-top: 4px;
text-align: right; text-align: right;
.ivu-btn { .ivu-btn {
margin-left: 4px; margin-left: 4px;
}
} }
} }
}
.studio-view.view-container.hidden-header {
> .view-header {
display: none;
}
> .view-content {
height: 100%;
padding: 0px !important;
}
}
.studio-view.view-container.hidden-header.show-footer { &.hidden-header {
> .view-content { >.view-header {
height: calc(100% - 46px); display: none;
}
>.view-content {
height: 100%;
padding: 0px;
}
} }
} &.hidden-header.show-footer {
>.view-content {
.studio-view.view-container.show-footer { height: calc(100% - 46px);
> .view-content { }
height: calc(100% - 82px);
} }
&.show-footer {
> .view-footer { >.view-content {
height: 45px; height: calc(100% - 82px);
text-align: right; }
padding: 6px 16px;
// border-top: 1px solid var(--app-dividing-line-color-bright); >.view-footer {
height: 45px;
text-align: right;
padding: 6px 16px;
}
} }
} }
\ No newline at end of file
app_Web/packages/ibiz-vue/src/styles/components/common/text-file-upload.less
浏览文件 @ c42ce37f
.file-upload { .file-upload {
display: flex; display: flex;
width: auto; width: auto;
height: auto; height: auto;
flex-wrap: wrap; flex-wrap: wrap;
margin-left: -8px; margin-left: -8px;
margin-top: -8px; margin-top: -8px;
color: rgb(67,78,82); color: rgb(67,78,82);
.el-row { .file-upload__contnet{
.el-col{
width: 350px; width: 350px;
height: 50px; height: 50px;
display: flex; display: flex;
...@@ -16,6 +15,7 @@ ...@@ -16,6 +15,7 @@
border-radius: 4px; border-radius: 4px;
margin-left: 8px; margin-left: 8px;
margin-top: 8px; margin-top: 8px;
background: rgb(241,249,234);
i{ i{
font-size: 24px; font-size: 24px;
margin: 0 8px; margin: 0 8px;
...@@ -33,14 +33,10 @@ ...@@ -33,14 +33,10 @@
right: 90px; right: 90px;
} }
} }
.fileMain{ .file-upload__disable{
background: rgb(241,249,234); background: rgb(252,240,240);
} }
.fileDisable{ .file-upload__add{
background: rgb(252,240,240);
}
}
.fileAdd{
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
...@@ -57,9 +53,9 @@ ...@@ -57,9 +53,9 @@
} }
} }
} }
.upload{ .file-upload__upload{
visibility: hidden; visibility: hidden;
} }
.dialogDiv .el-dialog { .file-upload__dialog .el-dialog {
height: auto; height: auto;
} }
app_Web/packages/ibiz-vue/src/styles/components/common/upload-file.less
浏览文件 @ c42ce37f
...@@ -7,25 +7,21 @@ ...@@ -7,25 +7,21 @@
} }
.ivu-upload-drag{ .ivu-upload-drag{
border-radius: 2px; border-radius: 2px;
// border:1px dashed var(--app-color-primary-contrast) !important;
} }
.ivu-upload-list{ .ivu-upload-list{
margin: 0px; margin: 0px;
// display: none !important;
} }
} }
.upload-text{ .upload-file__text{
// border:1px dashed var(--item-font-color);
padding:12px 18px; padding:12px 18px;
text-align: center; text-align: center;
// color: var(-item-font-color-bright);
font-family: -apple-system, "SF UI Text", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "WenQuanYi Zen Hei", sans-serif; font-family: -apple-system, "SF UI Text", "Helvetica Neue", Arial, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "WenQuanYi Zen Hei", sans-serif;
font-weight: 400; font-weight: 400;
font-size: 12px; font-size: 12px;
} }
.text-style{ .upload-file__text-style{
cursor: pointer; cursor: pointer;
// color: var(--item-font-color-active);
} }
} }
\ No newline at end of file
app_Web/packages/ibiz-vue/src/styles/components/control/app-default-exp-bar.less
浏览文件 @ c42ce37f
...@@ -8,6 +8,10 @@ ...@@ -8,6 +8,10 @@
.flex(row, space-between, center); .flex(row, space-between, center);
} }
.control-header__left{
padding: 0 4px;
}
.control-header__left__caption { .control-header__left__caption {
font-size: 14px; font-size: 14px;
font-weight: 600; font-weight: 600;
...@@ -22,6 +26,7 @@ ...@@ -22,6 +26,7 @@
flex-wrap: wrap; flex-wrap: wrap;
flex-shrink: 0; flex-shrink: 0;
.flex(row, space-between, center); .flex(row, space-between, center);
padding: 0 4px;
} }
.control-header__right__quicksearch { .control-header__right__quicksearch {
......
app_Web/packages/ibiz-vue/src/styles/components/control/app-default-searchform.less
浏览文件 @ c42ce37f
.app-control-searchform { .app-control-searchform {
.flex(row, flex-start, flex-start);
.app-control-searchform__iframe { .app-control-searchform__iframe {
height: 100%; height: 100%;
width: 100%; width: 100%;
border: 0; border: 0;
} }
.app-control-searchform__content {
.flex(row, flex-start, flex-start);
}
.app-form-item__content > .ivu-form-item { .app-form-item__content > .ivu-form-item {
margin-bottom: 8px; margin-bottom: 8px;
} }
.app-control-searchform__right { .app-control-searchform__right {
height: 40px;
width: 100px; width: 100px;
.flex(row, right, center); .flex(row, right, center);
> .ivu-btn { > .ivu-btn {
......
app_Web/packages/ibiz-vue/src/styles/objects/view-container.less
浏览文件 @ c42ce37f
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
.flex(row, flex-start, center); .flex(row, flex-start, center);
padding: 0 4px; padding: 0 4px;
> div{ > div{
padding: 0 4px; padding-right: 8px;
} }
} }
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
.flex(row, flex-end, center); .flex(row, flex-end, center);
padding: 0 4px; padding: 0 4px;
> div{ > div{
padding: 0 4px; padding-left: 8px;
} }
} }
......
app_Web/packages/ibiz-vue/src/utils/notice-handler/notice-handler.ts
浏览文件 @ c42ce37f
...@@ -140,4 +140,19 @@ export class NoticeHandler { ...@@ -140,4 +140,19 @@ export class NoticeHandler {
AppNoticeService.getInstance().info(beforeArgs.message); AppNoticeService.getInstance().info(beforeArgs.message);
} }
/**
* 消息处理
* @param response
* @param callback
* @memberof NoticeHandler
*/
public static message(response: any, callback: Function) {
const headers = response.headers;
if (headers && headers['x-message']) {
AppNoticeService.getInstance().success(decodeURI(headers['x-message']));
} else {
callback();
}
}
} }
\ No newline at end of file
app_Web/packages/ibiz-vue/src/widgets/editform-control-base.tsx
浏览文件 @ c42ce37f
...@@ -7,6 +7,7 @@ import moment from 'moment'; ...@@ -7,6 +7,7 @@ import moment from 'moment';
import { AppCenterService, AppViewLogicService, CodeListTranslator } from '../app-service'; import { AppCenterService, AppViewLogicService, CodeListTranslator } from '../app-service';
import { IPSAppDEUIAction, IPSDEEditForm, IPSDEEditFormItem, IPSDEFDCatGroupLogic, IPSDEFDLogic, IPSDEFDSingleLogic, IPSDEFIUpdateDetail, IPSDEFormButton, IPSDEFormDetail, IPSDEFormDRUIPart, IPSDEFormGroupPanel, IPSDEFormItem, IPSDEFormItemUpdate, IPSDEFormItemVR, IPSDEFormPage, IPSDEFormTabPage, IPSDEFormTabPanel, IPSUIActionGroupDetail, IPSDEFormItemEx, IPSCodeListEditor } from '@ibiz/dynamic-model-api'; import { IPSAppDEUIAction, IPSDEEditForm, IPSDEEditFormItem, IPSDEFDCatGroupLogic, IPSDEFDLogic, IPSDEFDSingleLogic, IPSDEFIUpdateDetail, IPSDEFormButton, IPSDEFormDetail, IPSDEFormDRUIPart, IPSDEFormGroupPanel, IPSDEFormItem, IPSDEFormItemUpdate, IPSDEFormItemVR, IPSDEFormPage, IPSDEFormTabPage, IPSDEFormTabPanel, IPSUIActionGroupDetail, IPSDEFormItemEx, IPSCodeListEditor } from '@ibiz/dynamic-model-api';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
import { NoticeHandler } from '../utils';
/** /**
* 编辑表单部件基类 * 编辑表单部件基类
...@@ -566,7 +567,9 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont ...@@ -566,7 +567,9 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont
this.formState.next({ type: 'save', data: data }); this.formState.next({ type: 'save', data: data });
}); });
if (this.controlInstance.formFuncMode?.toLowerCase() != 'wizardform' && showResultInfo) { if (this.controlInstance.formFuncMode?.toLowerCase() != 'wizardform' && showResultInfo) {
this.$success((data.srfmajortext ? data.srfmajortext : '') + (this.$t(`app.formpage.${actionName}`)) + (this.$t('app.commonwords.success') as string), 'save'); NoticeHandler.message(response,() =>{
this.$success((data.srfmajortext ? data.srfmajortext : '') + (this.$t(`app.formpage.${actionName}`)) + (this.$t('app.commonwords.success') as string), 'save');
})
} }
resolve(response); resolve(response);
}); });
...@@ -624,7 +627,9 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont ...@@ -624,7 +627,9 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont
}); });
this.formState.next({ type: 'remove', data: data }); this.formState.next({ type: 'remove', data: data });
this.data.ismodify = false; this.data.ismodify = false;
this.$success((data.srfmajortext ? data.srfmajortext : '') + (this.$t('app.commonwords.deletesuccess') as string), 'remove'); NoticeHandler.message(response,() =>{
this.$success((data.srfmajortext ? data.srfmajortext : '') + (this.$t('app.commonwords.deletesuccess') as string), 'remove');
})
AppCenterService.notifyMessage({ name: this.controlInstance.getPSAppDataEntity()?.codeName || '', action: 'appRefresh', data: data }); AppCenterService.notifyMessage({ name: this.controlInstance.getPSAppDataEntity()?.codeName || '', action: 'appRefresh', data: data });
resolve(response); resolve(response);
}); });
...@@ -734,7 +739,9 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont ...@@ -734,7 +739,9 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont
// 工作流数据刷新 // 工作流数据刷新
AppCenterService.notifyMessage({ name: 'SysTodo', action: 'appRefresh', data: data }); AppCenterService.notifyMessage({ name: 'SysTodo', action: 'appRefresh', data: data });
AppCenterService.notifyMessage({ name: 'WFTask', action: 'appRefresh', data: data }); AppCenterService.notifyMessage({ name: 'WFTask', action: 'appRefresh', data: data });
this.$success((this.$t('app.formpage.workflow.startsuccess') as string), 'wfstart'); NoticeHandler.message(response,() =>{
this.$success((this.$t('app.formpage.workflow.startsuccess') as string), 'wfstart');
})
resolve(response); resolve(response);
}); });
}).catch((response: any) => { }).catch((response: any) => {
...@@ -830,7 +837,9 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont ...@@ -830,7 +837,9 @@ export class EditFormControlBase extends FormControlBase implements EditFormCont
// 工作流数据刷新 // 工作流数据刷新
AppCenterService.notifyMessage({ name: 'SysTodo', action: 'appRefresh', data: data }); AppCenterService.notifyMessage({ name: 'SysTodo', action: 'appRefresh', data: data });
AppCenterService.notifyMessage({ name: 'WFTask', action: 'appRefresh', data: data }); AppCenterService.notifyMessage({ name: 'WFTask', action: 'appRefresh', data: data });
this.$success((this.$t('app.formpage.workflow.submitsuccess') as string), 'wfsubmit'); NoticeHandler.message(response,() =>{
this.$success((this.$t('app.formpage.workflow.submitsuccess') as string), 'wfsubmit');
})
resolve(response); resolve(response);
}); });
}).catch((response: any) => { }).catch((response: any) => {
......
app_Web/public/assets/theme/default.less
浏览文件 @ c42ce37f
...@@ -1297,17 +1297,8 @@ body { ...@@ -1297,17 +1297,8 @@ body {
.app-department-personnel { .app-department-personnel {
.ivu-select-selection { .ivu-select-selection {
.ivu-tag.ivu-tag-checked {
// TODO
// background-color:@color-primary-shade;
// border-color: @item-background-color--active;
// color: @color-primary-contrast;
.editor-border-active;
}
.ivu-icon.ivu-icon-ios-close:hover { .ivu-icon.ivu-icon-ios-close:hover {
color: @item-text-color--hover; color: @color-primary-base;
// background-color: @item-background-color--hover;
} }
&:hover { &:hover {
...@@ -1398,10 +1389,13 @@ body { ...@@ -1398,10 +1389,13 @@ body {
} }
} }
.app-form-group__action__showmore {
color: @color-primary-base;
}
.app-group-select { .app-group-select {
.el-icon-circle-close { .el-icon-circle-close {
&:hover { &:hover {
// TODO
color: @color-primary-base; color: @color-primary-base;
} }
} }
...@@ -1489,95 +1483,6 @@ body { ...@@ -1489,95 +1483,6 @@ body {
} }
} }
.app-mavon-editor {
.v-note-panel {
// TODO
// color: @color-dark-contrast;
.v-show-content {
// TODO
// background-color: @color-light-base;
table {
tr {
// TODO
// background-color: @color-light-base;
td,
th {
border-color: #666;
}
}
}
pre,
.highlight pre {
color: #333;
}
h1,
h2,
h3,
h4,
h5,
h6 {
// TODO
// color: @color-dark-contrast;
border-color: #666;
}
}
.v-show-content-html {
// TODO
// background-color: @color-light-base;
border-left: 1px solid #666;
}
.content-input-wrapper {
// TODO
// background-color: @color-light-base;
textarea {
// color: @color-light-contrast;
}
}
}
.v-note-op {
// TODO
// background: @color-light-base;
.v-left-item {
.op-icon {
// color: @color-dark-contrast;
}
.op-icon-divider {
border-color: #666;
}
}
.v-right-item {
.op-icon {
// color: @color-dark-contrast;
}
}
}
.op-icon.dropdown-wrapper.dropdown .popup-dropdown {
.dropdown-item {
// color: @color-dark-contrast;
}
.dropdown-item:hover {
color: @item-text-color--hover;
}
}
border-color: #c7cbd1;
}
.app-mpicker-select-container { .app-mpicker-select-container {
.el-select { .el-select {
.el-input__inner:hover { .el-input__inner:hover {
...@@ -1740,19 +1645,13 @@ body { ...@@ -1740,19 +1645,13 @@ body {
} }
} }
.app-rawtime--markdown {
.app-mavon-editor {
.v-note-panel {
// TODO
// background-color: @color-light-base;
// .v-show-content { .op-icon.dropdown-wrapper.dropdown .popup-dropdown {
// background-color: @color-light-base; .dropdown-item:hover {
// } color: @item-text-color--hover;
}
} }
} }
.app-slider { .app-slider {
.el-slider__runway { .el-slider__runway {
.el-slider__bar { .el-slider__bar {
...@@ -2033,24 +1932,21 @@ body { ...@@ -2033,24 +1932,21 @@ body {
>.ivu-menu-item:hover, >.ivu-menu-item:hover,
>.ivu-menu-submenu:hover { >.ivu-menu-submenu:hover {
color: @header-text-color; color: @header-text-color;
} }
}
>.ivu-menu-submenu { .ivu-select-dropdown {
>.ivu-select-dropdown {
background: @app-background-color;
>.ivu-menu-drop-list { >.ivu-menu-drop-list {
>.ivu-menu-item, >.ivu-menu-item,
>.ivu-menu-submenu { >.ivu-menu-submenu {
color: @header-text-color; color: @header-text-color;
}
}
} }
} }
} }
} }
.app-map-position { .app-map-position {
#map__result { #map__result {
.el-vue-search-box-container { .el-vue-search-box-container {
...@@ -2147,7 +2043,7 @@ body { ...@@ -2147,7 +2043,7 @@ body {
.app-content-bottom-exp{ .app-content-bottom-exp{
.ivu-tabs-tab.ivu-tabs-tab-active { .ivu-tabs-tab.ivu-tabs-tab-active {
.tab-exp-title { .tab-exp-title {
border-bottom: 1px solid @color-primary-base; border-bottom: 1px solid @app-divider-color;
} }
} }
} }
...@@ -2232,4 +2128,45 @@ body { ...@@ -2232,4 +2128,45 @@ body {
.ivu-dropdown-item:hover{ .ivu-dropdown-item:hover{
color: @color-primary-base; color: @color-primary-base;
} }
}
.upload-file{
.ivu-upload{
.ivu-upload-drag{
border:1px dashed @color-primary-base!important;
}
}
.upload-file__text{
border:1px dashed @color-primary-base;
}
.upload-file__text-style{
cursor: pointer;
color: @color-primary-base;
}
}
.context-menus-item:hover {
background-color: @menu-item-background-color--hover;
color: @menu-item-text-color--hover;
}
.sider-drawer {
.ivu-drawer {
background-color: @color-primary-base!important;
}
}
.context-menu-drag{
.context-menu__list {
.context-menu__list__header {
border-bottom: 1px solid @app-divider-color;
}
}
}
.tab-exp-item-content {
.toolbar-container {
>.ivu-btn.ivu-btn-default:disabled {
color: @button-text-color--disabled;
}
}
} }
\ No newline at end of file
app_Web/src/components/login/login.vue
浏览文件 @ c42ce37f
...@@ -347,6 +347,14 @@ export default class Login extends Vue { ...@@ -347,6 +347,14 @@ export default class Login extends Vue {
// 跳转首页 // 跳转首页
const url: any = this.$route.query.redirect ? this.$route.query.redirect : '*'; const url: any = this.$route.query.redirect ? this.$route.query.redirect : '*';
this.$router.push({ path: url }); this.$router.push({ path: url });
}else{
const data = response.data;
if (data && data.message) {
this.loginTip = data.message;
this.$throw((this.$t('components.login.loginfailed') as string) + ' ' + data.message, 'handleSubmit');
} else {
this.$throw(this.$t('components.login.loginfailed') as string, 'handleSubmit');
}
} }
}).catch((error: any) => { }).catch((error: any) => {
// 登录提示 // 登录提示
......
trainsys-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ c42ce37f
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</changeSet> </changeSet>
<!--输出实体[BOOK]数据结构 --> <!--输出实体[BOOK]数据结构 -->
<changeSet author="root" id="tab-book-220-3"> <changeSet author="root" id="tab-book-222-3">
<createTable tableName="T_BOOK"> <createTable tableName="T_BOOK">
<column name="BOOKNAME" remarks="" type="VARCHAR(200)"> <column name="BOOKNAME" remarks="" type="VARCHAR(200)">
</column> </column>
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
</changeSet> </changeSet>
<!--输出实体[REGINFO]数据结构 --> <!--输出实体[REGINFO]数据结构 -->
<changeSet author="root" id="tab-reginfo-94-8"> <changeSet author="root" id="tab-reginfo-95-8">
<createTable tableName="T_REGINFO"> <createTable tableName="T_REGINFO">
<column name="UPDATEDATE" remarks="" type="DATETIME"> <column name="UPDATEDATE" remarks="" type="DATETIME">
</column> </column>
...@@ -303,7 +303,7 @@ ...@@ -303,7 +303,7 @@
</changeSet> </changeSet>
<!--输出实体[REGINFO]外键关系 --> <!--输出实体[REGINFO]外键关系 -->
<changeSet author="root" id="fk-reginfo-94-12"> <changeSet author="root" id="fk-reginfo-95-12">
<addForeignKeyConstraint baseColumnNames="STUDENTID" baseTableName="T_REGINFO" constraintName="F328B6E61632896255" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="STUDENTID" referencedTableName="T_STUDENT" validate="true"/> <addForeignKeyConstraint baseColumnNames="STUDENTID" baseTableName="T_REGINFO" constraintName="F328B6E61632896255" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="STUDENTID" referencedTableName="T_STUDENT" validate="true"/>
</changeSet> </changeSet>
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSGRIDS/Main.json
浏览文件 @ c42ce37f
...@@ -3,11 +3,53 @@ ...@@ -3,11 +3,53 @@
"codeName" : "Main", "codeName" : "Main",
"columnEnableLink" : 2, "columnEnableLink" : 2,
"controlType" : "GRID", "controlType" : "GRID",
"getCreatePSControlAction" : {
"actionName" : "Create",
"actionType" : "DEACTION",
"dataAccessAction" : "CREATE",
"name" : "create",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Create"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
}
},
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSGRIDS/Main.json", "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSGRIDS/Main.json",
"getFetchPSControlAction" : { "getFetchPSControlAction" : {
"modelref" : true, "modelref" : true,
"id" : "fetch" "id" : "fetch"
}, },
"getGetDraftPSControlAction" : {
"actionName" : "GetDraft",
"actionType" : "DEACTION",
"dataAccessAction" : "CREATE",
"name" : "loaddraft",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "GetDraft"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
}
},
"getGetPSControlAction" : {
"actionName" : "Get",
"actionType" : "DEACTION",
"dataAccessAction" : "READ",
"name" : "load",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Get"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
}
},
"groupMode" : "NONE", "groupMode" : "NONE",
"hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "REMOVE", "LOAD", "BEFORELOAD" ], "hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "REMOVE", "LOAD", "BEFORELOAD" ],
"logicName" : "主表格", "logicName" : "主表格",
...@@ -18,34 +60,34 @@ ...@@ -18,34 +60,34 @@
"getPSAppViewLogics" : [ { "getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_ua98d563_click", "name" : "grid_uagridcolumn1_u479f517_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_行编辑开关操作" "id" : "表格界面_编辑操作"
} }
}, { }, {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u479f517_click", "name" : "grid_uagridcolumn1_ua98d563_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_编辑操作" "id" : "表格界面_行编辑开关操作"
} }
} ], } ],
"getPSAppViewUIActions" : [ { "getPSAppViewUIActions" : [ {
"name" : "表格界面_行编辑开关操作", "name" : "表格界面_编辑操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "ToggleRowEdit" "id" : "Edit"
}, },
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid" "xDataControlName" : "grid"
}, { }, {
"name" : "表格界面_编辑操作", "name" : "表格界面_行编辑开关操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "Edit" "id" : "ToggleRowEdit"
}, },
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid" "xDataControlName" : "grid"
} ], } ],
"getPSControlLogics" : [ { "getPSControlLogics" : [ {
...@@ -175,28 +217,6 @@ ...@@ -175,28 +217,6 @@
"getPSDEUIActionGroup" : { "getPSDEUIActionGroup" : {
"name" : "操作列", "name" : "操作列",
"getPSUIActionGroupDetails" : [ { "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", "detailType" : "DEUIACTION",
"name" : "u479f517", "name" : "u479f517",
"getPSUIAction" : { "getPSUIAction" : {
...@@ -224,6 +244,28 @@ ...@@ -224,6 +244,28 @@
"addSeparator" : true, "addSeparator" : true,
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
}, {
"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
} ] } ]
}, },
"width" : 100, "width" : 100,
...@@ -458,18 +500,32 @@ ...@@ -458,18 +500,32 @@
} }
}, },
"sortMode" : "REMOTE", "sortMode" : "REMOTE",
"getUpdatePSControlAction" : {
"actionName" : "Update",
"actionType" : "DEACTION",
"dataAccessAction" : "UPDATE",
"name" : "update",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Update"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
}
},
"hasWFDataItems" : false, "hasWFDataItems" : false,
"enableColFilter" : false, "enableColFilter" : false,
"enableCustomized" : true, "enableCustomized" : true,
"enableGroup" : false, "enableGroup" : false,
"enablePagingBar" : true, "enablePagingBar" : true,
"enableRowEdit" : false, "enableRowEdit" : true,
"enableRowEditOrder" : false, "enableRowEditOrder" : false,
"enableRowNew" : false, "enableRowNew" : true,
"forceFit" : false, "forceFit" : false,
"hideHeader" : false, "hideHeader" : false,
"noSort" : false, "noSort" : false,
"singleSelect" : false, "singleSelect" : true,
"modelid" : "79298f0344beee0b6f745936bb3a2fcd", "modelid" : "79298f0344beee0b6f745936bb3a2fcd",
"modeltype" : "PSDEGRID" "modeltype" : "PSDEGRID"
} }
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSFORMS/Main.json
浏览文件 @ c42ce37f
...@@ -553,34 +553,34 @@ ...@@ -553,34 +553,34 @@
"getPSAppViewLogics" : [ { "getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_ua98d563_click", "name" : "grid_uagridcolumn1_u479f517_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_行编辑开关操作" "id" : "表格界面_编辑操作"
} }
}, { }, {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u479f517_click", "name" : "grid_uagridcolumn1_ua98d563_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_编辑操作" "id" : "表格界面_行编辑开关操作"
} }
} ], } ],
"getPSAppViewUIActions" : [ { "getPSAppViewUIActions" : [ {
"name" : "表格界面_行编辑开关操作", "name" : "表格界面_编辑操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "ToggleRowEdit" "id" : "Edit"
}, },
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid" "xDataControlName" : "grid"
}, { }, {
"name" : "表格界面_编辑操作", "name" : "表格界面_行编辑开关操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "Edit" "id" : "ToggleRowEdit"
}, },
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid" "xDataControlName" : "grid"
} ], } ],
"getPSControlHandler" : { "getPSControlHandler" : {
...@@ -797,28 +797,6 @@ ...@@ -797,28 +797,6 @@
"getPSDEUIActionGroup" : { "getPSDEUIActionGroup" : {
"name" : "操作列", "name" : "操作列",
"getPSUIActionGroupDetails" : [ { "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", "detailType" : "DEUIACTION",
"name" : "u479f517", "name" : "u479f517",
"getPSUIAction" : { "getPSUIAction" : {
...@@ -846,6 +824,28 @@ ...@@ -846,6 +824,28 @@
"addSeparator" : true, "addSeparator" : true,
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
}, {
"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
} ] } ]
}, },
"width" : 100, "width" : 100,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoGridView.json
浏览文件 @ c42ce37f
...@@ -373,34 +373,34 @@ ...@@ -373,34 +373,34 @@
"getPSAppViewLogics" : [ { "getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_ua98d563_click", "name" : "grid_uagridcolumn1_u479f517_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_行编辑开关操作" "id" : "表格界面_编辑操作"
} }
}, { }, {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u479f517_click", "name" : "grid_uagridcolumn1_ua98d563_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_编辑操作" "id" : "表格界面_行编辑开关操作"
} }
} ], } ],
"getPSAppViewUIActions" : [ { "getPSAppViewUIActions" : [ {
"name" : "表格界面_行编辑开关操作", "name" : "表格界面_编辑操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "ToggleRowEdit" "id" : "Edit"
}, },
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid" "xDataControlName" : "grid"
}, { }, {
"name" : "表格界面_编辑操作", "name" : "表格界面_行编辑开关操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "Edit" "id" : "ToggleRowEdit"
}, },
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid" "xDataControlName" : "grid"
} ], } ],
"getPSControlHandler" : { "getPSControlHandler" : {
...@@ -617,28 +617,6 @@ ...@@ -617,28 +617,6 @@
"getPSDEUIActionGroup" : { "getPSDEUIActionGroup" : {
"name" : "操作列", "name" : "操作列",
"getPSUIActionGroupDetails" : [ { "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", "detailType" : "DEUIACTION",
"name" : "u479f517", "name" : "u479f517",
"getPSUIAction" : { "getPSUIAction" : {
...@@ -666,6 +644,28 @@ ...@@ -666,6 +644,28 @@
"addSeparator" : true, "addSeparator" : true,
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
}, {
"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
} ] } ]
}, },
"width" : 100, "width" : 100,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoStuInfoList.json
浏览文件 @ c42ce37f
...@@ -425,34 +425,34 @@ ...@@ -425,34 +425,34 @@
"getPSAppViewLogics" : [ { "getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_ua98d563_click", "name" : "grid_uagridcolumn1_u479f517_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_行编辑开关操作" "id" : "表格界面_编辑操作"
} }
}, { }, {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u479f517_click", "name" : "grid_uagridcolumn1_ua98d563_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_编辑操作" "id" : "表格界面_行编辑开关操作"
} }
} ], } ],
"getPSAppViewUIActions" : [ { "getPSAppViewUIActions" : [ {
"name" : "表格界面_行编辑开关操作", "name" : "表格界面_编辑操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "ToggleRowEdit" "id" : "Edit"
}, },
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid" "xDataControlName" : "grid"
}, { }, {
"name" : "表格界面_编辑操作", "name" : "表格界面_行编辑开关操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "Edit" "id" : "ToggleRowEdit"
}, },
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid" "xDataControlName" : "grid"
} ], } ],
"getPSControlHandler" : { "getPSControlHandler" : {
...@@ -669,28 +669,6 @@ ...@@ -669,28 +669,6 @@
"getPSDEUIActionGroup" : { "getPSDEUIActionGroup" : {
"name" : "操作列", "name" : "操作列",
"getPSUIActionGroupDetails" : [ { "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", "detailType" : "DEUIACTION",
"name" : "u479f517", "name" : "u479f517",
"getPSUIAction" : { "getPSUIAction" : {
...@@ -718,6 +696,28 @@ ...@@ -718,6 +696,28 @@
"addSeparator" : true, "addSeparator" : true,
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
}, {
"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
} ] } ]
}, },
"width" : 100, "width" : 100,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentEditView.json
浏览文件 @ c42ce37f
...@@ -1539,34 +1539,34 @@ ...@@ -1539,34 +1539,34 @@
"getPSAppViewLogics" : [ { "getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_ua98d563_click", "name" : "grid_uagridcolumn1_u479f517_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_行编辑开关操作" "id" : "表格界面_编辑操作"
} }
}, { }, {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u479f517_click", "name" : "grid_uagridcolumn1_ua98d563_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_编辑操作" "id" : "表格界面_行编辑开关操作"
} }
} ], } ],
"getPSAppViewUIActions" : [ { "getPSAppViewUIActions" : [ {
"name" : "表格界面_行编辑开关操作", "name" : "表格界面_编辑操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "ToggleRowEdit" "id" : "Edit"
}, },
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid" "xDataControlName" : "grid"
}, { }, {
"name" : "表格界面_编辑操作", "name" : "表格界面_行编辑开关操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "Edit" "id" : "ToggleRowEdit"
}, },
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid" "xDataControlName" : "grid"
} ], } ],
"getPSControlHandler" : { "getPSControlHandler" : {
...@@ -1783,28 +1783,6 @@ ...@@ -1783,28 +1783,6 @@
"getPSDEUIActionGroup" : { "getPSDEUIActionGroup" : {
"name" : "操作列", "name" : "操作列",
"getPSUIActionGroupDetails" : [ { "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", "detailType" : "DEUIACTION",
"name" : "u479f517", "name" : "u479f517",
"getPSUIAction" : { "getPSUIAction" : {
...@@ -1832,6 +1810,28 @@ ...@@ -1832,6 +1810,28 @@
"addSeparator" : true, "addSeparator" : true,
"showCaption" : true, "showCaption" : true,
"showIcon" : true "showIcon" : true
}, {
"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
} ] } ]
}, },
"width" : 100, "width" : 100,
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或