5.0.231
parent
de57edc0af
commit
bc56fb189f
|
|
@ -2,7 +2,7 @@
|
|||
spring:
|
||||
profiles:
|
||||
#引用多个application-开头的yml文件 多个以逗号隔开
|
||||
include: db,logger,cache,upload,freemarker,druid,mybatis,baidu,server,cloud,wechat,security,proxy,xss,encryption,apidoc
|
||||
include: db,logger,cache,upload,freemarker,druid,mybatis,baidu,server,cloud,wechat,security,proxy,xss,encryption,apidoc,api
|
||||
devtools:
|
||||
restart:
|
||||
ebabled: false
|
||||
|
|
|
|||
|
|
@ -159,16 +159,16 @@
|
|||
<cache name="workFlowCache"
|
||||
maxEntriesLocalHeap="200000"
|
||||
eternal="false"
|
||||
timeToIdleSeconds="0"
|
||||
timeToLiveSeconds="1"
|
||||
timeToIdleSeconds="3600"
|
||||
timeToLiveSeconds="0"
|
||||
overflowToDisk="false"
|
||||
statistics="false">
|
||||
</cache>
|
||||
<cache name="apiCache"
|
||||
maxEntriesLocalHeap="200000"
|
||||
eternal="false"
|
||||
timeToIdleSeconds="0"
|
||||
timeToLiveSeconds="1"
|
||||
timeToIdleSeconds="3600"
|
||||
timeToLiveSeconds="0"
|
||||
overflowToDisk="false"
|
||||
statistics="false">
|
||||
</cache>
|
||||
|
|
|
|||
|
|
@ -159,8 +159,8 @@ layui.define(function (exports) {
|
|||
}
|
||||
|
||||
url = common.setUrlParamObj(url, param, /tokenId/)
|
||||
if(!common.isEmpty(resid)){
|
||||
url = common.setUrlParamObj(url, {resId:resid}, /tokenId/)
|
||||
if (!common.isEmpty(resid)) {
|
||||
url = common.setUrlParamObj(url, { resId: resid }, /tokenId/)
|
||||
}
|
||||
|
||||
tabs.each(function (index) {
|
||||
|
|
@ -249,7 +249,10 @@ layui.define(function (exports) {
|
|||
, yes: () => {
|
||||
pageId && common.sendTo(pageId, 'onYes')
|
||||
}
|
||||
, no: () => {
|
||||
, cancel: () => {
|
||||
pageId && common.sendTo(pageId, 'onCancel')
|
||||
}
|
||||
, btn2: () => {
|
||||
pageId && common.sendTo(pageId, 'onCancel')
|
||||
}
|
||||
, end: () => {
|
||||
|
|
|
|||
|
|
@ -54,6 +54,12 @@
|
|||
<div class="content unicode" style="display: block;">
|
||||
<ul class="icon_lists dib-box">
|
||||
|
||||
<li class="dib">
|
||||
<span class="icon iconfont"></span>
|
||||
<div class="name">数据导出</div>
|
||||
<div class="code-name">&#xe695;</div>
|
||||
</li>
|
||||
|
||||
<li class="dib">
|
||||
<span class="icon iconfont"></span>
|
||||
<div class="name">百度云</div>
|
||||
|
|
@ -324,9 +330,9 @@
|
|||
<pre><code class="language-css"
|
||||
>@font-face {
|
||||
font-family: 'iconfont';
|
||||
src: url('iconfont.woff2?t=1684208811832') format('woff2'),
|
||||
url('iconfont.woff?t=1684208811832') format('woff'),
|
||||
url('iconfont.ttf?t=1684208811832') format('truetype');
|
||||
src: url('iconfont.woff2?t=1693817483680') format('woff2'),
|
||||
url('iconfont.woff?t=1693817483680') format('woff'),
|
||||
url('iconfont.ttf?t=1693817483680') format('truetype');
|
||||
}
|
||||
</code></pre>
|
||||
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
|
||||
|
|
@ -352,6 +358,15 @@
|
|||
<div class="content font-class">
|
||||
<ul class="icon_lists dib-box">
|
||||
|
||||
<li class="dib">
|
||||
<span class="icon iconfont icon-shujudaochu"></span>
|
||||
<div class="name">
|
||||
数据导出
|
||||
</div>
|
||||
<div class="code-name">.icon-shujudaochu
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li class="dib">
|
||||
<span class="icon iconfont icon-baiduyun1"></span>
|
||||
<div class="name">
|
||||
|
|
@ -757,6 +772,14 @@
|
|||
<div class="content symbol">
|
||||
<ul class="icon_lists dib-box">
|
||||
|
||||
<li class="dib">
|
||||
<svg class="icon svg-icon" aria-hidden="true">
|
||||
<use xlink:href="#icon-shujudaochu"></use>
|
||||
</svg>
|
||||
<div class="name">数据导出</div>
|
||||
<div class="code-name">#icon-shujudaochu</div>
|
||||
</li>
|
||||
|
||||
<li class="dib">
|
||||
<svg class="icon svg-icon" aria-hidden="true">
|
||||
<use xlink:href="#icon-baiduyun1"></use>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
@font-face {
|
||||
font-family: "iconfont"; /* Project id 4067164 */
|
||||
src: url('iconfont.woff2?t=1684208811832') format('woff2'),
|
||||
url('iconfont.woff?t=1684208811832') format('woff'),
|
||||
url('iconfont.ttf?t=1684208811832') format('truetype');
|
||||
src: url('iconfont.woff2?t=1693817483680') format('woff2'),
|
||||
url('iconfont.woff?t=1693817483680') format('woff'),
|
||||
url('iconfont.ttf?t=1693817483680') format('truetype');
|
||||
}
|
||||
|
||||
.iconfont {
|
||||
|
|
@ -13,6 +13,10 @@
|
|||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
.icon-shujudaochu:before {
|
||||
content: "\e695";
|
||||
}
|
||||
|
||||
.icon-baiduyun1:before {
|
||||
content: "\e60f";
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -5,6 +5,13 @@
|
|||
"css_prefix_text": "icon-",
|
||||
"description": "",
|
||||
"glyphs": [
|
||||
{
|
||||
"icon_id": "22427570",
|
||||
"name": "数据导出",
|
||||
"font_class": "shujudaochu",
|
||||
"unicode": "e695",
|
||||
"unicode_decimal": 59029
|
||||
},
|
||||
{
|
||||
"icon_id": "2912768",
|
||||
"name": "百度云",
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -3942,6 +3942,12 @@ getBtnText(): string
|
|||
*/
|
||||
onClick(handle: onButtonClick): void
|
||||
|
||||
/**
|
||||
* 执行界面编辑器设置的触发点击事件
|
||||
|
||||
*/
|
||||
raiseOnClickScript(): void
|
||||
|
||||
/**
|
||||
* 设置按钮的标题
|
||||
* @param text 标题字符串
|
||||
|
|
@ -5575,11 +5581,11 @@ class: string
|
|||
/**
|
||||
*下拉高度
|
||||
*/
|
||||
drogDownHeight: Number
|
||||
drogDownHeight: number
|
||||
/**
|
||||
*下拉宽带
|
||||
*/
|
||||
drogDownWidth: Number
|
||||
drogDownWidth: number
|
||||
/**
|
||||
*组件字体
|
||||
*/
|
||||
|
|
@ -9490,11 +9496,11 @@ commitChanges(): void
|
|||
|
||||
/**
|
||||
* 删除行没有记录到modified里面 只是单纯的删除行.这个函数移除的的行与removeRow的区别是 getChanges() 得不到被这个函数移除的行
|
||||
* @param row 行实例
|
||||
* @param row 行实例/ 行的实例数组
|
||||
* @param isRemoveModified 是否移除modified的行.(默认: true)
|
||||
|
||||
*/
|
||||
deleteRow(row: Row,isRemoveModified: boolean): void
|
||||
deleteRow(row: Row | Row[],isRemoveModified: boolean): void
|
||||
|
||||
/**
|
||||
* 循环遍历每条记录
|
||||
|
|
@ -9683,6 +9689,13 @@ getRange(start: number,end: number): Row[]
|
|||
*/
|
||||
getRawDatas(): any[]
|
||||
|
||||
/**
|
||||
* 行的唯一ID
|
||||
* @param rowGuid 行的内部唯一ID* @returns 存在返回行实例,否则返回 null
|
||||
|
||||
*/
|
||||
getRowByGuid(rowGuid: string): Row
|
||||
|
||||
/**
|
||||
* 返回所有的行
|
||||
* @returns 所有行数组
|
||||
|
|
@ -10615,7 +10628,7 @@ kuais = "kuais"
|
|||
*排序的类型
|
||||
*/
|
||||
enum TableColumnSortDirection {
|
||||
asc = "asc",desc = "desc"
|
||||
asc = "asc",desc = "desc",none = "none"
|
||||
}
|
||||
/**
|
||||
*列的总计方式
|
||||
|
|
@ -10819,9 +10832,10 @@ class MemoryDataSetBase extends DataSourceBase {
|
|||
* 加载数组类型的数据到数据源
|
||||
* @param arrayData 数据数组
|
||||
* @param idFieldName 可选参数. 下拉的数据的主键字段名 默认值: id
|
||||
* @param isClearField 可选参数. 是否清理原有所有的字段
|
||||
|
||||
*/
|
||||
loadFromArray(arrayData: any[],idFieldName: string): void
|
||||
loadFromArray(arrayData: any[],idFieldName: string,isClearField: boolean): void
|
||||
|
||||
}
|
||||
/**
|
||||
|
|
@ -18682,6 +18696,13 @@ static on(cmpId: string | IComponent,msgName: string,callback: Function,override
|
|||
*/
|
||||
static onServerMsg(msgId: string,callback: ServerMsgCallback,timeout: number): SseMsg
|
||||
|
||||
/**
|
||||
* 开启文件选择
|
||||
* @param config 配置开启的窗口的参数* @returns 返回Promise <File[]> 文件列表
|
||||
|
||||
*/
|
||||
static openFileDialog(config: FileDialogConfig): Promise<any>
|
||||
|
||||
/**
|
||||
* 展示相册
|
||||
例子:
|
||||
|
|
@ -19424,6 +19445,13 @@ class HashMap {
|
|||
*/
|
||||
class KdUploader {
|
||||
|
||||
/**
|
||||
* 开启文件选择
|
||||
* @param config 配置开启的窗口的参数* @returns 返回Promise <File[]> 文件列表
|
||||
|
||||
*/
|
||||
static openFileDialog(config: FileDialogConfig): Promise<any>
|
||||
|
||||
/**
|
||||
* 上传文件
|
||||
* @param uploadUrl 上传文件的路径
|
||||
|
|
@ -19441,6 +19469,31 @@ static upLoadFile(uploadUrl: string,accept: string,onFinishCallBack: onFinishCal
|
|||
*/
|
||||
static upLoadImage(config: IUploadImageConfig): void
|
||||
|
||||
}
|
||||
/**
|
||||
*文件选择配置项
|
||||
*/
|
||||
interface FileDialogConfig {
|
||||
/**
|
||||
*文件类型限制 ，默认全部
|
||||
*/
|
||||
accept: string
|
||||
/**
|
||||
*兼容取消控制，为0时候则取消文件时不抛出reject，❗在使用async/await时会造成阻塞
|
||||
*/
|
||||
cancel: number
|
||||
/**
|
||||
*文件或者文件夹的描述，可选
|
||||
*/
|
||||
description: string
|
||||
/**
|
||||
*文件多选
|
||||
*/
|
||||
multiple: boolean
|
||||
/**
|
||||
*只选择目录限制
|
||||
*/
|
||||
webkitdirectory: boolean
|
||||
}
|
||||
/**
|
||||
*上传的文件配置
|
||||
|
|
@ -20036,6 +20089,77 @@ title: string
|
|||
*值
|
||||
*/
|
||||
val: string
|
||||
}
|
||||
/**
|
||||
*代码编辑组件
|
||||
*/
|
||||
class CodeEdit extends ContainerBase {
|
||||
/**
|
||||
*完成加载事件
|
||||
*/
|
||||
onReady: Function
|
||||
|
||||
/**
|
||||
* 快捷方式
|
||||
* @param shortCut 快捷方式字符串: ctrl+s ,ctrl+shift+s, ,ctrl+alt+s
|
||||
* @param callback 回调处理
|
||||
|
||||
*/
|
||||
addShutCut(shortCut: string,callback: Function): void
|
||||
|
||||
/**
|
||||
* 在最后行新增数据txt
|
||||
* @param txt
|
||||
|
||||
*/
|
||||
appText(txt: string): void
|
||||
|
||||
/**
|
||||
* 末尾添加字符串
|
||||
* @param txt
|
||||
|
||||
*/
|
||||
append(txt: string): void
|
||||
|
||||
/**
|
||||
* 获取焦点
|
||||
|
||||
*/
|
||||
focus(): void
|
||||
|
||||
/**
|
||||
* 获取代码字符串
|
||||
* @returns 返回编辑后代码
|
||||
|
||||
*/
|
||||
getValue(): string
|
||||
|
||||
/**
|
||||
* 是否被修改
|
||||
* @returns true 已经被修改 则反之
|
||||
|
||||
*/
|
||||
hasChanged(): boolean
|
||||
|
||||
/**
|
||||
* 恢复
|
||||
|
||||
*/
|
||||
redo(): void
|
||||
|
||||
/**
|
||||
* 设置编辑代码字符串
|
||||
* @param v 代码
|
||||
|
||||
*/
|
||||
setValue(v: string): void
|
||||
|
||||
/**
|
||||
* 撤销
|
||||
|
||||
*/
|
||||
undo(): void
|
||||
|
||||
}
|
||||
/**
|
||||
*折叠面板
|
||||
|
|
@ -20586,6 +20710,17 @@ activeTabByIndex(tabIndex: number): void
|
|||
*/
|
||||
addTab(tab: TabPanel): void
|
||||
|
||||
/**
|
||||
* 新增页面编码的tab
|
||||
* @param title 标题
|
||||
* @param pageModelCode 表单的页面
|
||||
* @param params 参数
|
||||
* @param method 请求方式
|
||||
* @param allowClose 是否允许关闭页签(默认:false )
|
||||
|
||||
*/
|
||||
addTabByModelCode(title: string,pageModelCode: string,params: Object,method: MethodType,allowClose: boolean): void
|
||||
|
||||
/**
|
||||
* 增加新的url的tab
|
||||
* @param title 标题
|
||||
|
|
@ -20599,7 +20734,7 @@ addUrlTab(title: string,url: string,params: object,method: MethodType,allowClose
|
|||
|
||||
/**
|
||||
* 查找tabPanel
|
||||
* @param findCallback 差早回调* @returns 返回查找到页签数组
|
||||
* @param findCallback 查找回调* @returns 返回查找到页签数组
|
||||
|
||||
*/
|
||||
findTabPage(findCallback: findTabPanelHandle): TabPanel[]
|
||||
|
|
@ -21164,7 +21299,7 @@ activeView(view: TableViewBase): void
|
|||
addView(view: TableViewBase): void
|
||||
|
||||
/**
|
||||
* 删除打勾的行modify by gk
|
||||
* 删除打勾的行
|
||||
|
||||
*/
|
||||
deleteCheckRows(): void
|
||||
|
|
@ -22100,6 +22235,13 @@ getColumns(): TableColumn[]
|
|||
*/
|
||||
getCount(): number
|
||||
|
||||
/**
|
||||
* 行的唯一ID
|
||||
* @param rowGuid 行的内部唯一ID* @returns 存在返回行实例,否则返回 null
|
||||
|
||||
*/
|
||||
getRowByGuid(rowGuid: string): Row
|
||||
|
||||
/**
|
||||
* 通过主键id获取行
|
||||
* @param rowId 行的id* @returns 返回行
|
||||
|
|
@ -22855,12 +22997,12 @@ declare type OnTableColumnResizeHandle = (column: TableColumn) => void
|
|||
class TableColumnEditorBuilder {
|
||||
|
||||
/**
|
||||
* 构建列编辑器
|
||||
* @param type 编辑器类型
|
||||
* `
|
||||
构建列编辑器
|
||||
* @param column 列实例* @returns 返回列编辑器的实例
|
||||
|
||||
*/
|
||||
static build(type: TableColumnEditorType,column: any): TableColumnEditorBase
|
||||
static build(column: any): TableColumnEditorBase
|
||||
|
||||
}
|
||||
/**
|
||||
|
|
@ -22955,6 +23097,13 @@ class TableEditorDropdown extends TableEditorButton {
|
|||
*/
|
||||
class TableEditorDropdownSelect extends TableColumnEditorBase {
|
||||
|
||||
/**
|
||||
* 得到下拉组件的下拉数据源
|
||||
* @returns 返回下拉的数据源实例
|
||||
|
||||
*/
|
||||
getDropDownDataSouce(): DataSourceBase
|
||||
|
||||
}
|
||||
/**
|
||||
*下拉Table
|
||||
|
|
@ -23053,6 +23202,12 @@ class TableListViewColumnBase extends TableColumn {
|
|||
*/
|
||||
paserValue(row: Row,value: any): any
|
||||
|
||||
}
|
||||
/**
|
||||
*TableListView的编辑列的属性编辑器
|
||||
*/
|
||||
class TableListViewColumnEditorSelect extends SelectAttrEditor {
|
||||
|
||||
}
|
||||
/**
|
||||
* 自定义列
|
||||
|
|
@ -23117,6 +23272,10 @@ class TableListViewPictureColumn extends TableListViewColumnBase {
|
|||
*/
|
||||
isEncrypt: boolean
|
||||
/**
|
||||
*是否支持url显示
|
||||
*/
|
||||
isUrl: boolean
|
||||
/**
|
||||
*最多能上传多少文件
|
||||
*/
|
||||
maxFileCount: number
|
||||
|
|
|
|||
|
|
@ -861,7 +861,7 @@ layui.config({
|
|||
let exportFunc = function (con) {
|
||||
var nodes = exptreeObj.getCheckedNodes(true);
|
||||
nodes = $.grep(nodes, function (obj) {
|
||||
return obj.check_Child_State == -1;
|
||||
return obj.MX_BIAOLX == 1 || obj.MX_BIAOLX == 0;
|
||||
});
|
||||
if (nodes.length <= 0) {
|
||||
zlContext.warnMsg('请选择需要导出的表模型！');
|
||||
|
|
|
|||
|
|
@ -98,6 +98,9 @@
|
|||
animation: ripple 600ms linear;
|
||||
background-color: rgba(255, 255, 255, 0.2);
|
||||
}
|
||||
.layadmin-user-login-other .layui-tab-title .layui-this:after{
|
||||
border-bottom-color: #e6e6e6;
|
||||
}
|
||||
|
||||
@keyframes ripple {
|
||||
to {
|
||||
|
|
|
|||
Loading…
Reference in New Issue