5.0.228发布

master
关凯 2023-06-29 15:19:44 +08:00
parent be428fbc62
commit 4ace68bef4
33 changed files with 2611 additions and 182 deletions

View File

@ -4,7 +4,8 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
element = layui.element,
laytpl = layui.laytpl,
zlPinYin = layui.zlPinYin,
common = layui.common;
common = layui.common,
admin = layui.admin;
var THEME = {
defaulStyles: [
{ name: '亮色风格', value: "light", color: '#f0f2f5' },
@ -947,7 +948,9 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
var shrinkParents = othis.parents('.layadmin-side-shrink');
if (shrinkParents.length > 0) {
shrinkParents.removeClass('layadmin-side-shrink')
var iconElem = $('#kdayun-app-flexible'),
isSpread = iconElem.hasClass('layui-icon-spread-left');
layui.admin.sideFlexible(isSpread ? 'spread' : null);
}
//如果是垂直菜单
@ -1060,7 +1063,10 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
ulHtml += '<a href="javascript:;" ' + layhref + ' lay-text="' + item.title + '" lay-tips="' + item.title + '" lay-direction="2" resId=' + item.resid + ' >';
if (item.icon != undefined && item.icon != '') {
ulHtml += '<img src="' + layui.cache['contentPath'] + item.icon + '" ' + svgOnLoad + ' style="width:16px;height:16px;vertical-align: text-bottom;">';
} else {
ulHtml += '<img src="' + layui.cache['contentPath'] + '/static/image/function.svg" onload = "SVGInject(this)" fill="currentColor" style="width:16px;height:16px;vertical-align: text-bottom;">';
}
if (item.children != undefined && item.children != undefined && item.children.length > 0) {
ulHtml += '<cite>' + item.title + '</cite>'
ulHtml += '<span class="kdayun-menu-more"></span>'

View File

@ -420,8 +420,7 @@ layui.define(['zlContext', 'layer', 'laytpl', 'colorpicker', 'zlPinYin', 'theme'
var selectedFile = this.files[0],
reader = new FileReader();
reader.readAsText(selectedFile);
setTimeout(function () {
reader.onload = function (readRes) {
var importThemeData = JSON.parse(reader.result);
var id = zlContext.generateId().toLocaleUpperCase();
for (var i = 0; i < themes.length; i++) {
@ -468,7 +467,7 @@ layui.define(['zlContext', 'layer', 'laytpl', 'colorpicker', 'zlPinYin', 'theme'
zlTheme.renderColorPicker(layero);
zlTheme.renderOptionsFontFamily(layero);
saveTheme('import');
}, 0)
}
}
})

View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1685672891219" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2424" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24"><path d="M924.294737 35.031579H99.705263c-35.031579 0-64.673684 29.642105-64.673684 64.673684v827.284211c0 35.031579 29.642105 64.673684 64.673684 64.673684h827.284211c35.031579 0 64.673684-29.642105 64.673684-64.673684V99.705263c-2.694737-35.031579-32.336842-64.673684-67.368421-64.673684z m26.947368 889.263158c0 13.473684-10.778947 26.947368-26.947368 26.947368H99.705263c-13.473684 0-26.947368-10.778947-26.947368-26.947368V99.705263c0-13.473684 10.778947-26.947368 26.947368-26.947368h827.284211c13.473684 0 26.947368 10.778947 26.947368 26.947368v824.589474z" p-id="2425"></path><path d="M706.021053 493.136842H317.978947c-10.778947 0-18.863158 8.084211-18.863158 18.863158s8.084211 18.863158 18.863158 18.863158h388.042106c10.778947 0 18.863158-8.084211 18.863158-18.863158s-8.084211-18.863158-18.863158-18.863158zM706.021053 665.6H317.978947c-10.778947 0-18.863158 8.084211-18.863158 18.863158s8.084211 18.863158 18.863158 18.863158h388.042106c10.778947 0 18.863158-8.084211 18.863158-18.863158s-8.084211-18.863158-18.863158-18.863158zM706.021053 320.673684H317.978947c-10.778947 0-18.863158 8.084211-18.863158 18.863158s8.084211 18.863158 18.863158 18.863158h388.042106c10.778947 0 18.863158-8.084211 18.863158-18.863158s-8.084211-18.863158-18.863158-18.863158z" p-id="2426"></path></svg>

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

@ -0,0 +1,539 @@
/* Logo 字体 */
@font-face {
font-family: "iconfont logo";
src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
}
.logo {
font-family: "iconfont logo";
font-size: 160px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
/* tabs */
.nav-tabs {
position: relative;
}
.nav-tabs .nav-more {
position: absolute;
right: 0;
bottom: 0;
height: 42px;
line-height: 42px;
color: #666;
}
#tabs {
border-bottom: 1px solid #eee;
}
#tabs li {
cursor: pointer;
width: 100px;
height: 40px;
line-height: 40px;
text-align: center;
font-size: 16px;
border-bottom: 2px solid transparent;
position: relative;
z-index: 1;
margin-bottom: -1px;
color: #666;
}
#tabs .active {
border-bottom-color: #f00;
color: #222;
}
.tab-container .content {
display: none;
}
/* 页面布局 */
.main {
padding: 30px 100px;
width: 960px;
margin: 0 auto;
}
.main .logo {
color: #333;
text-align: left;
margin-bottom: 30px;
line-height: 1;
height: 110px;
margin-top: -50px;
overflow: hidden;
*zoom: 1;
}
.main .logo a {
font-size: 160px;
color: #333;
}
.helps {
margin-top: 40px;
}
.helps pre {
padding: 20px;
margin: 10px 0;
border: solid 1px #e7e1cd;
background-color: #fffdef;
overflow: auto;
}
.icon_lists {
width: 100% !important;
overflow: hidden;
*zoom: 1;
}
.icon_lists li {
width: 100px;
margin-bottom: 10px;
margin-right: 20px;
text-align: center;
list-style: none !important;
cursor: default;
}
.icon_lists li .code-name {
line-height: 1.2;
}
.icon_lists .icon {
display: block;
height: 100px;
line-height: 100px;
font-size: 42px;
margin: 10px auto;
color: #333;
-webkit-transition: font-size 0.25s linear, width 0.25s linear;
-moz-transition: font-size 0.25s linear, width 0.25s linear;
transition: font-size 0.25s linear, width 0.25s linear;
}
.icon_lists .icon:hover {
font-size: 100px;
}
.icon_lists .svg-icon {
/* 通过设置 font-size 来改变图标大小 */
width: 1em;
/* 图标和文字相邻时,垂直对齐 */
vertical-align: -0.15em;
/* 通过设置 color 来改变 SVG 的颜色/fill */
fill: currentColor;
/* path stroke viewBox IE
normalize.css */
overflow: hidden;
}
.icon_lists li .name,
.icon_lists li .code-name {
color: #666;
}
/* markdown 样式 */
.markdown {
color: #666;
font-size: 14px;
line-height: 1.8;
}
.highlight {
line-height: 1.5;
}
.markdown img {
vertical-align: middle;
max-width: 100%;
}
.markdown h1 {
color: #404040;
font-weight: 500;
line-height: 40px;
margin-bottom: 24px;
}
.markdown h2,
.markdown h3,
.markdown h4,
.markdown h5,
.markdown h6 {
color: #404040;
margin: 1.6em 0 0.6em 0;
font-weight: 500;
clear: both;
}
.markdown h1 {
font-size: 28px;
}
.markdown h2 {
font-size: 22px;
}
.markdown h3 {
font-size: 16px;
}
.markdown h4 {
font-size: 14px;
}
.markdown h5 {
font-size: 12px;
}
.markdown h6 {
font-size: 12px;
}
.markdown hr {
height: 1px;
border: 0;
background: #e9e9e9;
margin: 16px 0;
clear: both;
}
.markdown p {
margin: 1em 0;
}
.markdown>p,
.markdown>blockquote,
.markdown>.highlight,
.markdown>ol,
.markdown>ul {
width: 80%;
}
.markdown ul>li {
list-style: circle;
}
.markdown>ul li,
.markdown blockquote ul>li {
margin-left: 20px;
padding-left: 4px;
}
.markdown>ul li p,
.markdown>ol li p {
margin: 0.6em 0;
}
.markdown ol>li {
list-style: decimal;
}
.markdown>ol li,
.markdown blockquote ol>li {
margin-left: 20px;
padding-left: 4px;
}
.markdown code {
margin: 0 3px;
padding: 0 5px;
background: #eee;
border-radius: 3px;
}
.markdown strong,
.markdown b {
font-weight: 600;
}
.markdown>table {
border-collapse: collapse;
border-spacing: 0px;
empty-cells: show;
border: 1px solid #e9e9e9;
width: 95%;
margin-bottom: 24px;
}
.markdown>table th {
white-space: nowrap;
color: #333;
font-weight: 600;
}
.markdown>table th,
.markdown>table td {
border: 1px solid #e9e9e9;
padding: 8px 16px;
text-align: left;
}
.markdown>table th {
background: #F7F7F7;
}
.markdown blockquote {
font-size: 90%;
color: #999;
border-left: 4px solid #e9e9e9;
padding-left: 0.8em;
margin: 1em 0;
}
.markdown blockquote p {
margin: 0;
}
.markdown .anchor {
opacity: 0;
transition: opacity 0.3s ease;
margin-left: 8px;
}
.markdown .waiting {
color: #ccc;
}
.markdown h1:hover .anchor,
.markdown h2:hover .anchor,
.markdown h3:hover .anchor,
.markdown h4:hover .anchor,
.markdown h5:hover .anchor,
.markdown h6:hover .anchor {
opacity: 1;
display: inline-block;
}
.markdown>br,
.markdown>p>br {
clear: both;
}
.hljs {
display: block;
background: white;
padding: 0.5em;
color: #333333;
overflow-x: auto;
}
.hljs-comment,
.hljs-meta {
color: #969896;
}
.hljs-string,
.hljs-variable,
.hljs-template-variable,
.hljs-strong,
.hljs-emphasis,
.hljs-quote {
color: #df5000;
}
.hljs-keyword,
.hljs-selector-tag,
.hljs-type {
color: #a71d5d;
}
.hljs-literal,
.hljs-symbol,
.hljs-bullet,
.hljs-attribute {
color: #0086b3;
}
.hljs-section,
.hljs-name {
color: #63a35c;
}
.hljs-tag {
color: #333333;
}
.hljs-title,
.hljs-attr,
.hljs-selector-id,
.hljs-selector-class,
.hljs-selector-attr,
.hljs-selector-pseudo {
color: #795da3;
}
.hljs-addition {
color: #55a532;
background-color: #eaffea;
}
.hljs-deletion {
color: #bd2c00;
background-color: #ffecec;
}
.hljs-link {
text-decoration: underline;
}
/* 代码高亮 */
/* PrismJS 1.15.0
https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
/**
* prism.js default theme for JavaScript, CSS and HTML
* Based on dabblet (http://dabblet.com)
* @author Lea Verou
*/
code[class*="language-"],
pre[class*="language-"] {
color: black;
background: none;
text-shadow: 0 1px white;
font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
text-align: left;
white-space: pre;
word-spacing: normal;
word-break: normal;
word-wrap: normal;
line-height: 1.5;
-moz-tab-size: 4;
-o-tab-size: 4;
tab-size: 4;
-webkit-hyphens: none;
-moz-hyphens: none;
-ms-hyphens: none;
hyphens: none;
}
pre[class*="language-"]::-moz-selection,
pre[class*="language-"] ::-moz-selection,
code[class*="language-"]::-moz-selection,
code[class*="language-"] ::-moz-selection {
text-shadow: none;
background: #b3d4fc;
}
pre[class*="language-"]::selection,
pre[class*="language-"] ::selection,
code[class*="language-"]::selection,
code[class*="language-"] ::selection {
text-shadow: none;
background: #b3d4fc;
}
@media print {
code[class*="language-"],
pre[class*="language-"] {
text-shadow: none;
}
}
/* Code blocks */
pre[class*="language-"] {
padding: 1em;
margin: .5em 0;
overflow: auto;
}
:not(pre)>code[class*="language-"],
pre[class*="language-"] {
background: #f5f2f0;
}
/* Inline code */
:not(pre)>code[class*="language-"] {
padding: .1em;
border-radius: .3em;
white-space: normal;
}
.token.comment,
.token.prolog,
.token.doctype,
.token.cdata {
color: slategray;
}
.token.punctuation {
color: #999;
}
.namespace {
opacity: .7;
}
.token.property,
.token.tag,
.token.boolean,
.token.number,
.token.constant,
.token.symbol,
.token.deleted {
color: #905;
}
.token.selector,
.token.attr-name,
.token.string,
.token.char,
.token.builtin,
.token.inserted {
color: #690;
}
.token.operator,
.token.entity,
.token.url,
.language-css .token.string,
.style .token.string {
color: #9a6e3a;
background: hsla(0, 0%, 100%, .5);
}
.token.atrule,
.token.attr-value,
.token.keyword {
color: #07a;
}
.token.function,
.token.class-name {
color: #DD4A68;
}
.token.regex,
.token.important,
.token.variable {
color: #e90;
}
.token.important,
.token.bold {
font-weight: bold;
}
.token.italic {
font-style: italic;
}
.token.entity {
cursor: help;
}

View File

@ -0,0 +1,183 @@
@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');
}
.iconfont {
font-family: "iconfont" !important;
font-size: 16px;
font-style: normal;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
.icon-baiduyun1:before {
content: "\e60f";
}
.icon-yemian-yinyong:before {
content: "\e72e";
}
.icon-datafull:before {
content: "\e6ed";
}
.icon-biaoti:before {
content: "\e62b";
}
.icon-chepai:before {
content: "\e62e";
}
.icon-sql:before {
content: "\e6d1";
}
.icon-mianban:before {
content: "\e6a0";
}
.icon-progress:before {
content: "\e648";
}
.icon-pingtaiguanlishujuquanxian:before {
content: "\e64d";
}
.icon-shouyelunbotu:before {
content: "\e627";
}
.icon-gongzhonghao:before {
content: "\e625";
}
.icon-markdown:before {
content: "\f1eb";
}
.icon-undo:before {
content: "\e739";
}
.icon-mobansheji:before {
content: "\e672";
}
.icon-tuxingyanzhengma:before {
content: "\e608";
}
.icon-jurassic_process:before {
content: "\e6c4";
}
.icon-yemianshezhi:before {
content: "\e60d";
}
.icon-bianjiyemian:before {
content: "\e633";
}
.icon-html-editor:before {
content: "\e85e";
}
.icon-buzhoutiao:before {
content: "\e760";
}
.icon-dateTimeBox:before {
content: "\e649";
}
.icon-baidu:before {
content: "\e8cb";
}
.icon-html:before {
content: "\e618";
}
.icon-jishuqi:before {
content: "\e68c";
}
.icon-mianbaoxie-youjiantou:before {
content: "\e605";
}
.icon-xiugairizhi:before {
content: "\e6e7";
}
.icon-qiyeweixin:before {
content: "\e619";
}
.icon-shujudaoru:before {
content: "\e693";
}
.icon-m-chuansuokuang:before {
content: "\e857";
}
.icon-icon-fanpaiqi:before {
content: "\e6a2";
}
.icon-bianjiyemian1:before {
content: "\eb78";
}
.icon-vue_20x20:before {
content: "\e640";
}
.icon-yewuquanxian:before {
content: "\e606";
}
.icon-zujianshu:before {
content: "\e621";
}
.icon-shangzhongxiabuju:before {
content: "\e858";
}
.icon-shouji:before {
content: "\e615";
}
.icon-baiduyun:before {
content: "\e600";
}
.icon-elementui:before {
content: "\e604";
}
.icon-buju:before {
content: "\e641";
}
.icon-vant:before {
content: "\e678";
}
.icon-yewu:before {
content: "\e68b";
}
.icon-dapingzhanshi:before {
content: "\e628";
}

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,303 @@
{
"id": "4067164",
"name": "设计器",
"font_family": "iconfont",
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
{
"icon_id": "2912768",
"name": "百度云",
"font_class": "baiduyun1",
"unicode": "e60f",
"unicode_decimal": 58895
},
{
"icon_id": "18231024",
"name": "页面-引用",
"font_class": "yemian-yinyong",
"unicode": "e72e",
"unicode_decimal": 59182
},
{
"icon_id": "586827",
"name": "data-full",
"font_class": "datafull",
"unicode": "e6ed",
"unicode_decimal": 59117
},
{
"icon_id": "695127",
"name": "标题",
"font_class": "biaoti",
"unicode": "e62b",
"unicode_decimal": 58923
},
{
"icon_id": "874852",
"name": "车牌",
"font_class": "chepai",
"unicode": "e62e",
"unicode_decimal": 58926
},
{
"icon_id": "1057415",
"name": "sql",
"font_class": "sql",
"unicode": "e6d1",
"unicode_decimal": 59089
},
{
"icon_id": "1766510",
"name": "符号-折叠面板",
"font_class": "mianban",
"unicode": "e6a0",
"unicode_decimal": 59040
},
{
"icon_id": "1881849",
"name": "progress",
"font_class": "progress",
"unicode": "e648",
"unicode_decimal": 58952
},
{
"icon_id": "4772831",
"name": "平台管理—数据权限",
"font_class": "pingtaiguanlishujuquanxian",
"unicode": "e64d",
"unicode_decimal": 58957
},
{
"icon_id": "5437734",
"name": "首页轮播图",
"font_class": "shouyelunbotu",
"unicode": "e627",
"unicode_decimal": 58919
},
{
"icon_id": "5532887",
"name": "公众号",
"font_class": "gongzhonghao",
"unicode": "e625",
"unicode_decimal": 58917
},
{
"icon_id": "5634755",
"name": "markdown",
"font_class": "markdown",
"unicode": "f1eb",
"unicode_decimal": 61931
},
{
"icon_id": "7009033",
"name": "undo",
"font_class": "undo",
"unicode": "e739",
"unicode_decimal": 59193
},
{
"icon_id": "8897322",
"name": "模板设计",
"font_class": "mobansheji",
"unicode": "e672",
"unicode_decimal": 58994
},
{
"icon_id": "9715331",
"name": "图形验证码",
"font_class": "tuxingyanzhengma",
"unicode": "e608",
"unicode_decimal": 58888
},
{
"icon_id": "10595634",
"name": "工作流程-流程-状态_jurassic",
"font_class": "jurassic_process",
"unicode": "e6c4",
"unicode_decimal": 59076
},
{
"icon_id": "11179906",
"name": "页面设置",
"font_class": "yemianshezhi",
"unicode": "e60d",
"unicode_decimal": 58893
},
{
"icon_id": "12174707",
"name": "编辑页面 ",
"font_class": "bianjiyemian",
"unicode": "e633",
"unicode_decimal": 58931
},
{
"icon_id": "15659162",
"name": "html-editor",
"font_class": "html-editor",
"unicode": "e85e",
"unicode_decimal": 59486
},
{
"icon_id": "16557145",
"name": "步骤条",
"font_class": "buzhoutiao",
"unicode": "e760",
"unicode_decimal": 59232
},
{
"icon_id": "16859934",
"name": "日期时间框",
"font_class": "dateTimeBox",
"unicode": "e649",
"unicode_decimal": 58953
},
{
"icon_id": "18166606",
"name": "百度",
"font_class": "baidu",
"unicode": "e8cb",
"unicode_decimal": 59595
},
{
"icon_id": "19035878",
"name": "html",
"font_class": "html",
"unicode": "e618",
"unicode_decimal": 58904
},
{
"icon_id": "19582055",
"name": "计数器",
"font_class": "jishuqi",
"unicode": "e68c",
"unicode_decimal": 59020
},
{
"icon_id": "21009385",
"name": "面包屑-右箭头",
"font_class": "mianbaoxie-youjiantou",
"unicode": "e605",
"unicode_decimal": 58885
},
{
"icon_id": "21553729",
"name": "修改日志",
"font_class": "xiugairizhi",
"unicode": "e6e7",
"unicode_decimal": 59111
},
{
"icon_id": "22032561",
"name": "企业微信",
"font_class": "qiyeweixin",
"unicode": "e619",
"unicode_decimal": 58905
},
{
"icon_id": "22427565",
"name": "数据导入",
"font_class": "shujudaoru",
"unicode": "e693",
"unicode_decimal": 59027
},
{
"icon_id": "22782989",
"name": "m-穿梭框",
"font_class": "m-chuansuokuang",
"unicode": "e857",
"unicode_decimal": 59479
},
{
"icon_id": "24373380",
"name": "icon-翻牌器",
"font_class": "icon-fanpaiqi",
"unicode": "e6a2",
"unicode_decimal": 59042
},
{
"icon_id": "27678439",
"name": "编辑页面",
"font_class": "bianjiyemian1",
"unicode": "eb78",
"unicode_decimal": 60280
},
{
"icon_id": "29273003",
"name": "vue_20x20",
"font_class": "vue_20x20",
"unicode": "e640",
"unicode_decimal": 58944
},
{
"icon_id": "29859137",
"name": "业务权限",
"font_class": "yewuquanxian",
"unicode": "e606",
"unicode_decimal": 58886
},
{
"icon_id": "33152366",
"name": "组件树",
"font_class": "zujianshu",
"unicode": "e621",
"unicode_decimal": 58913
},
{
"icon_id": "34258425",
"name": "上中下布局",
"font_class": "shangzhongxiabuju",
"unicode": "e858",
"unicode_decimal": 59480
},
{
"icon_id": "2578491",
"name": "手机",
"font_class": "shouji",
"unicode": "e615",
"unicode_decimal": 58901
},
{
"icon_id": "3877118",
"name": "百度云",
"font_class": "baiduyun",
"unicode": "e600",
"unicode_decimal": 58880
},
{
"icon_id": "7380660",
"name": "elementui",
"font_class": "elementui",
"unicode": "e604",
"unicode_decimal": 58884
},
{
"icon_id": "8094172",
"name": "布局",
"font_class": "buju",
"unicode": "e641",
"unicode_decimal": 58945
},
{
"icon_id": "13925299",
"name": "vant",
"font_class": "vant",
"unicode": "e678",
"unicode_decimal": 59000
},
{
"icon_id": "21053830",
"name": "业务",
"font_class": "yewu",
"unicode": "e68b",
"unicode_decimal": 59019
},
{
"icon_id": "15351474",
"name": "大屏展示",
"font_class": "dapingzhanshi",
"unicode": "e628",
"unicode_decimal": 58920
}
]
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1683771430703" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16104" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24"><path d="M459.45856 152.480427c-37.56032 8.721067-61.262507 18.558293-86.30272 35.328-30.405973 20.34688-62.825813 58.801493-78.0288 92.337493-13.4144 29.73696-22.80448 76.465493-21.68832 107.76576l0.447147 8.942933-24.593067 3.577173c-31.0784 4.471467-46.506667 8.942933-70.427307 20.34688-65.061547 31.300267-108.660053 84.066987-126.54592 152.70912-5.143893 19.89632-5.81632 78.025387-1.119573 98.372267 13.63968 59.47392 46.728533 107.994453 96.361813 140.854613 19.23072 12.526933 48.964267 25.941333 67.075413 30.18752 6.7072 1.56672 15.202987 3.577173 18.78016 4.693333 3.577173 1.119573 21.46304 2.013867 39.799467 2.013867 26.156373 0 36.891307-0.894293 50.527573-4.47488 41.362773-10.953387 72.215893-26.825387 99.269973-50.97472 10.062507-9.168213 74.451627-80.489813 138.171733-153.152853 11.625813-13.4144 27.27936-31.0784 34.65216-39.574187 7.379627-8.27392 22.135467-25.265493 32.866987-37.56032 29.293227-33.539413 48.96768-46.05952 81.834667-51.872427 43.820373-7.826773 94.798507 18.11456 115.367253 58.579627 8.721067 17.43872 14.75584 40.912213 14.75584 57.9072 0 18.333013 10.062507 34.880853 27.723093 46.281387 7.826773 5.14048 11.625813 5.812907 27.05408 5.812907 14.086827 0.221867 19.674453-0.894293 26.832213-4.693333 31.965867-16.994987 38.454613-54.10816 20.565333-115.817813-15.64672-53.661013-55.671467-102.847147-107.543893-131.91168-19.449173-10.9568-57.009493-22.582613-81.831253-25.71264-11.625813-1.34144-22.807893-2.90816-24.593067-3.577173-2.68288-0.672427-3.351893-6.038187-3.580587-29.51168-0.218453-21.466453-1.559893-33.092267-5.14048-46.506667-13.18912-48.29184-30.631253-78.25408-65.286827-111.5648-31.522133-30.184107-67.744427-49.411413-109.779627-58.13248C527.650133 149.3504 473.767253 148.903253 459.45856 152.480427L459.45856 152.480427zM529.885867 261.812907c34.433707 7.826773 66.628267 38.679893 78.701227 75.34592 5.812907 17.885867 5.587627 52.76672-0.672427 70.20544-11.625813 33.088853-31.747413 55.002453-62.375253 67.969707-17.885867 7.82336-20.343467 8.270507-43.820373 8.270507-15.202987 0.22528-27.723093-0.894293-32.41984-2.68288-13.861547-5.36576-35.771733-16.991573-43.15136-23.02976-10.059093-8.270507-26.606933-33.757867-32.41984-50.080427-6.260053-17.885867-6.48192-52.54144-0.447147-70.874453 9.61536-29.515093 30.631253-53.661013 59.026773-67.52256C476.228267 257.788587 501.0432 255.327573 529.885867 261.812907L529.885867 261.812907zM320.392533 521.837227c57.460053 27.50464 79.817387 94.795093 51.647147 154.497707-19.899733 41.58464-71.099733 67.293867-117.38112 58.354347-21.015893-4.027733-29.289813-7.376213-46.503253-19.227307-36.66944-24.593067-55.4496-75.34592-43.823787-118.275413 9.39008-35.997013 38.679893-68.860587 70.427307-79.37024 15.650133-5.14048 19.674453-5.59104 44.939947-4.918613C301.83424 513.56672 304.738987 514.235733 320.392533 521.837227zM873.08288 745.192107c-12.29824 5.812907-24.593067 18.333013-29.289813 29.740373-4.246187 10.284373-4.027733 32.863573 0.447147 41.806507 11.403947 22.360747 27.726507 32.866987 51.872427 32.866987 17.660587 0 31.525547-6.260053 42.257067-19.227307 14.53056-17.220267 17.882453-36.666027 9.39008-56.118613-8.942933-21.015893-25.040213-31.972693-48.96768-33.536C886.94784 740.05504 882.254507 740.724053 873.08288 745.192107L873.08288 745.192107z" p-id="16105" fill="currentColor"></path></svg>

After

Width:  |  Height:  |  Size: 3.6 KiB

View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1683771228458" class="icon" viewBox="0 0 1109 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10855" xmlns:xlink="http://www.w3.org/1999/xlink" width="25.9921875" height="24"><path d="M0 1024v-85.333333h1109.333333v85.333333H0z m938.666667-170.666667H170.666667a170.666667 170.666667 0 0 1-170.666667-170.666666V170.666667a170.666667 170.666667 0 0 1 170.666667-170.666667h768a170.666667 170.666667 0 0 1 170.666666 170.666667v512a170.666667 170.666667 0 0 1-170.666666 170.666666z m2.645333-565.930666l-20.138667-73.728-75.008 19.754666-150.058666 39.509334 20.096 73.728 106.368-27.989334-177.322667 174.165334-188.586667-164.693334 0.938667-0.938666L402.602667 273.066667 128 543.061333l54.912 53.973334 218.965333-215.125334 235.733334 205.866667 1.066666-0.896 10.368 10.154667 233.685334-229.546667 23.765333 87.125333L981.333333 434.858667l-40.234666-147.456z" fill="#707070" p-id="10856"></path></svg>

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1683771605983" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="26461" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24"><path d="M853.333333 618.666667h-128c0 47.146667-38.186667 85.333333-85.333333 85.333333H384c-25.6 0-48.426667-11.52-64-29.44-3.2-3.626667-6.186667-7.68-8.746667-11.946667 0-0.213333-0.213333-0.426667-0.213333-0.426666-2.346667-4.053333-4.48-8.32-6.4-12.586667-0.64-1.493333-0.853333-2.773333-1.28-4.266667-1.066667-3.413333-2.346667-6.826667-2.986667-10.24-1.066667-5.546667-1.706667-10.88-1.706666-16.426666H106.666667v213.333333c0 47.146667 38.186667 85.333333 85.333333 85.333333h640c47.146667 0 85.333333-38.186667 85.333333-85.333333V618.666667h-64z" p-id="26462" fill="#707070"></path><path d="M661.333333 618.666667v-64h192V192c0-47.146667-38.186667-85.333333-85.333333-85.333333H469.333333c-47.146667 0-85.333333 38.186667-85.333333 85.333333v448h256c11.733333 0 21.333333-9.6 21.333333-21.333333z m-160-384h234.666667c17.706667 0 32 14.293333 32 32s-14.293333 32-32 32h-234.666667c-17.706667 0-32-14.293333-32-32s14.293333-32 32-32zM469.333333 394.666667c0-17.706667 14.293333-32 32-32h234.666667c17.706667 0 32 14.293333 32 32s-14.293333 32-32 32h-234.666667c-17.706667 0-32-14.293333-32-32zM320 554.666667V234.666667h-64c-47.146667 0-85.333333 38.186667-85.333333 85.333333v234.666667h149.333333z" p-id="26463" fill="#707070"></path></svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1683770955793" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7279" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24"><path d="M513.856 29.376L90.24 261.888l-0.768 483.2 420.672 249.472 423.616-232.512 0.768-483.136L513.856 29.376zM218.112 337.664l293.312-160.896 187.2 111.808L512 395.392v123.264l293.12-163.584-0.768 96.128L512 619.392v123.264l292.8-163.328 0.448 106.88-292.928 161.024-294.848-174.976 0.64-334.592z" fill="#707070" p-id="7280"></path></svg>

After

Width:  |  Height:  |  Size: 664 B

View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1683771469945" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="17199" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24"><path d="M0 0m109.714286 0l201.142857 0q109.714286 0 109.714286 109.714286l0 804.571428q0 109.714286-109.714286 109.714286l-201.142857 0q-109.714286 0-109.714286-109.714286l0-804.571428q0-109.714286 109.714286-109.714286Z" fill="#707070" p-id="17200"></path><path d="M475.428571 0m73.142858 0l402.285714 0q73.142857 0 73.142857 73.142857l0 256q0 73.142857-73.142857 73.142857l-402.285714 0q-73.142857 0-73.142858-73.142857l0-256q0-73.142857 73.142858-73.142857Z" fill="#707070" p-id="17201"></path><path d="M475.428571 438.857143m73.142858 0l109.714285 0q73.142857 0 73.142857 73.142857l0 438.857143q0 73.142857-73.142857 73.142857l-109.714285 0q-73.142857 0-73.142858-73.142857l0-438.857143q0-73.142857 73.142858-73.142857Z" fill="#707070" p-id="17202"></path><path d="M768 438.857143m73.142857 0l109.714286 0q73.142857 0 73.142857 73.142857l0 438.857143q0 73.142857-73.142857 73.142857l-109.714286 0q-73.142857 0-73.142857-73.142857l0-438.857143q0-73.142857 73.142857-73.142857Z" fill="#707070" p-id="17203"></path></svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1683771506472" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="25321" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24"><path d="M854.152533 882.2784a102.4 102.4 0 0 1-102.365866 102.365867H291.908267a102.4 102.4 0 0 1-102.4-102.365867V141.7216a102.4 102.4 0 0 1 102.4-102.365867h459.8784a102.4 102.4 0 0 1 102.365866 102.365867v740.5568zM795.067733 141.7216c0-23.893333-19.3536-43.3152-43.281066-43.3152H291.908267c-23.927467 0-43.3152 19.387733-43.3152 43.3152v740.522667a43.349333 43.349333 0 0 0 43.3152 43.281066h459.8784c23.893333 0 43.281067-19.387733 43.281066-43.281066V141.7216z m0 0" fill="#707070" p-id="25322"></path><path d="M823.944533 792.644267H218.385067a14.779733 14.779733 0 1 1 0-29.5936h605.525333a14.813867 14.813867 0 0 1 0.034133 29.5936z m0 0M823.944533 201.8304H218.385067c-8.192 0-14.779733-6.587733-14.779734-14.779733s6.587733-14.779733 14.779734-14.779734h605.525333a14.779733 14.779733 0 1 1 0.034133 29.559467z m0 0M558.762667 855.415467a25.838933 25.838933 0 0 1-25.838934 25.838933h-7.406933a25.873067 25.873067 0 0 1-25.838933-25.838933v-7.406934c0-14.267733 11.605333-25.838933 25.838933-25.838933h7.406933c14.267733 0 25.838933 11.5712 25.838934 25.838933v7.406934z m0 0" fill="#707070" p-id="25323"></path></svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1683796343677" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5839" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24"><path d="M921.6 102.4v358.4h-256V102.4h256M358.4 102.4v153.6H102.4V102.4h256m0 460.8v358.4H102.4v-358.4h256m563.2 204.8v153.6h-256v-153.6h256m0-768h-256c-56.32 0-102.4 46.08-102.4 102.4v358.4c0 56.32 46.08 102.4 102.4 102.4h256c56.32 0 102.4-46.08 102.4-102.4V102.4c0-56.32-46.08-102.4-102.4-102.4zM358.4 0H102.4C46.08 0 0 46.08 0 102.4v153.6c0 56.32 46.08 102.4 102.4 102.4h256c56.32 0 102.4-46.08 102.4-102.4V102.4c0-56.32-46.08-102.4-102.4-102.4z m0 460.8H102.4c-56.32 0-102.4 46.08-102.4 102.4v358.4c0 56.32 46.08 102.4 102.4 102.4h256c56.32 0 102.4-46.08 102.4-102.4v-358.4c0-56.32-46.08-102.4-102.4-102.4z m563.2 204.8h-256c-56.32 0-102.4 46.08-102.4 102.4v153.6c0 56.32 46.08 102.4 102.4 102.4h256c56.32 0 102.4-46.08 102.4-102.4v-153.6c0-56.32-46.08-102.4-102.4-102.4z" fill="#FFAC02" p-id="5840"></path></svg>

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1683771107572" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9852" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24"><path d="M512.00512 950.1184c0-83.072 0-166.13376 0.01024-249.21088 0-1.00864 0.19968-2.01216 0.31232-3.01056 1.14176-2.29376 3.54816-2.94912 5.51424-4.08576 47.34976-27.2128 94.592-54.65088 142.01856-81.74592 4.66432-2.65728 9.04192-5.8624 14.14144-7.75168 4.67456 1.06496 8.30976 4.14208 12.25216 6.5536 30.0032 18.39104 60.12928 36.57216 90.14272 54.93248 33.87392 20.74112 67.92704 41.16992 101.7088 62.04928 1.34656 0.83456 2.91328 1.4592 3.47648 3.16416-13.06112 7.8592-26.06592 15.80544-39.18336 23.57248-108.69248 64.34304-217.40032 128.64512-326.08256 192.9984-1.20832 0.7168-2.7136 1.11104-3.42528 2.52416-0.29696 0.01024-0.59392 0.01024-0.88576 0.01024z" fill="#3497DA" p-id="9853"></path><path d="M144.02048 293.18144c40.192-23.99232 80.37376-48 120.59136-71.94624 81.17248-48.34304 162.36544-96.66048 243.52768-145.01376 1.07008-0.64 2.5088-0.9216 2.99008-2.33984h0.87552L512 321.5616c0 1.4592-0.06144 2.91328-0.1024 4.37248-0.61952 1.46944-2.00192 2.03264-3.25632 2.7648-38.1696 22.15936-76.47232 44.0832-114.69312 66.16064-11.98592 6.91712-24.06912 13.66016-35.95264 20.7616-2.24768 1.35168-4.49024 2.7136-7.05024 3.40992-2.55488 0.43008-4.46976-0.98816-6.46656-2.2016a66985.088 66985.088 0 0 0-167.50592-101.15072c-10.11712-6.08256-20.28032-12.09344-30.2592-18.41664-1.41824-0.896-3.83488-1.38752-2.69312-4.08064z" fill="#1BBB9A" p-id="9854"></path><path d="M881.58208 731.02336c-18.64704-11.28448-37.31456-22.53824-55.94624-33.8688-33.28-20.224-66.53952-40.48896-99.80416-60.74368-17.2544-10.50624-34.49856-21.02272-51.74784-31.5392-1.82272-2.14016-1.17248-4.736-1.17248-7.13728-0.03584-55.936-0.11264-111.86688 0.1024-167.78752 0.02048-5.77536-2.01216-8.92928-6.8864-11.73504-43.14624-24.84224-86.03136-50.13504-129.03936-75.2128-6.55872-3.82464-13.14304-7.59808-19.67104-11.48416-1.60256-0.95744-3.42016-1.72032-4.29056-3.58912-0.77312-2.47808 1.59744-2.4576 2.73408-3.10272 28.5184-16.21504 57.08288-32.35328 85.64736-48.50688 41.76896-23.6032 83.54304-47.19616 125.2608-70.8864 2.45248-1.38752 4.16768-1.50016 6.64576 0.03584 49.19296 30.54592 98.44736 60.99968 147.73248 91.38176 2.42688 1.49504 3.328 3.04128 3.30752 5.89312-0.47104 67.45088-0.83968 134.89152-1.23392 202.33216-0.27136 47.01184-0.53248 94.01856-0.86528 141.01504-0.2048 28.30848-0.512 56.62208-0.77312 84.93568z" fill="#19B4FD" p-id="9855"></path><path d="M350.77632 418.26304c-1.15712 1.55648-0.77824 3.35872-0.77824 5.07392 0.04096 58.80832 0.128 117.62688 0.08192 176.42496-0.00512 3.35872 1.01888 5.19168 3.9424 6.88128 51.41504 29.92128 102.7584 59.9552 154.12736 89.94816 0.8704 0.51712 1.83296 0.8448 2.75456 1.25952 0.67072 2.4576-1.64864 2.46784-2.81088 3.11808-42.25024 23.96672-84.54144 47.86688-126.81728 71.76704-28.06272 15.86688-56.14592 31.68256-84.14208 47.67232-2.56 1.4592-4.2496 1.27488-6.63552-0.20992a55578.4448 55578.4448 0 0 0-147.42016-91.12064c-2.75456-1.6896-3.54816-3.56864-3.52768-6.67648 0.46592-68.7616 0.82432-137.52832 1.21856-206.2848 0.26112-45.83936 0.54272-91.67872 0.83968-137.51808 0.1792-27.00288 0.40448-54.01088 0.64-81.01376 0.01536-1.65888-0.5632-3.64544 1.77664-4.4032 0.65024 3.14368 3.78368 3.49184 5.85216 4.74624 48.65024 29.46048 97.39776 58.75712 146.10432 88.1408 16.82432 10.14784 33.5616 20.43392 50.3296 30.67904 1.38752 0.84992 2.77504 1.6128 4.46464 1.51552z" fill="#36D6B6" p-id="9856"></path></svg>

After

Width:  |  Height:  |  Size: 3.6 KiB

View File

@ -4536,7 +4536,7 @@ setParentAfter(parent: ComponentBase,before: ComponentBase): void
*/
class ContainerBase extends ComponentBase {
/**
*是否运行点击的消息传递 默认是true. 如果要自己处理组件的内部点击事件可以设置成false
*是否允许击的消息传递 默认是true. 如果要自己处理组件的内部点击事件可以设置成false
*/
isClickStopEvent: boolean
@ -10660,7 +10660,7 @@ allowNull: boolean
*/
buttons: ButtonBase[]
/**
*是否运行移动
*是否允许移动
*/
canMove: boolean
/**
@ -11174,6 +11174,14 @@ class SortTypes {
*/
class UrlDataSetBase extends DataSourceBase {
/**
* 查找数据,注意这个并不会把查到数据加载的数据源的rows内
* @param conditions 条件IAdvQueryItem数组
* @param callback 回调
*/
findDataByCon(conditions: IAdvQueryItem[],callback: any): void
/**
* 异步
* @returns true 异步 / false 同步
@ -14495,7 +14503,7 @@ attr: string
*/
btnText: string
/**
*是否运行关闭
*是否允许关闭
*/
canClose: any
/**
@ -14503,6 +14511,10 @@ canClose: any
*/
component: IComponent
/**
*默认值, 当设置为空时候会设置成 defalut值
*/
default: string
/**
*列子
*/
demo: string
@ -17922,7 +17934,7 @@ type: FormType.page
, restore: (index, $elem) => { }
})
```
* @param options 参考open的参数* @returns 返回弹出层的唯一index
* @param options 参考open的参数* @returns 返回弹出层的唯一index . 关闭可使用 Common.closeForm(index).
*/
static Form(options: IFormOptions): number
@ -17932,7 +17944,7 @@ static Form(options: IFormOptions): number
```typescript
Form.Nt("您好!")
```
* @param text 警告信息* @returns 返回弹出层的唯一index
* @param text 警告信息* @returns 返回弹出层的唯一index . 关闭可使用 Common.closeForm(index).
*/
static Nt(text: string): number
@ -17954,16 +17966,17 @@ static addJavaScript(id: string,javascript: string): boolean
static addQueryString(url: string,paramObj: object): string
/**
* 添加懒加载的Img
注意:函数不支持IE浏览器.只支持新版本的浏览器
* 设置img标签为懒加载的标签.
注意:函数不支持IE浏览器.只支持新版本的浏览器
图片Img的初始格式:
``` html
<img class ="kdayun-img-lazload" data-src="/static/image/abc.png" src="${Common.getContextPath()}/static/image/loading.gif">
```
* @param imgs 图片imaged的html元素jQuery
* @param loadingIcon 初始的loading 图片 默认 ${Common.getContextPath()}/static/image/loading2.gif
*/
static addlazyImgs(imgs: any): void
static addlazyImgs(imgs: JQuery<any>,loadingIcon: string): void
/**
* 任意值转成boolean类型
@ -18051,7 +18064,7 @@ static compressImg(file: any,type: string,mx: number,mh: number): Promise<any>
* @param text 提示信息
* @param okCallBack 确定后回调函数 返回false是不关闭窗口,否则都关闭
* @param title 提示框的标题
* @param cancelCallBack 取消关闭标题* @returns 返回弹出层的唯一index
* @param cancelCallBack 取消关闭标题* @returns 返回弹出层的唯一index . 关闭可使用 Common.closeForm(index).
*/
static confirm(text: string,okCallBack: ConfirmCallBackHandle,title: string,cancelCallBack: ConfirmCallBackHandle): number
@ -18114,6 +18127,14 @@ static doError(xhr: any,textStatus: any): void
*/
static download(url: string,completeCallback: DownloadHandle,paramobj: object): void
/**
* 动态创建a标签下载文件
* @param url 下载地址
* @param filename 文件名
*/
static downloadA(url: string,filename: string): void
/**
* 下载文件
注意:这个函数中文文件名可能存在乱码现象
@ -18150,14 +18171,14 @@ static error(msg: any): void
/**
* 弹出错误提示信息框.
* @param errorTxt 提示的信息* @returns 返回弹出层的唯一index
* @param errorTxt 提示的信息* @returns 返回弹出层的唯一index . 关闭可使用 Common.closeForm(index).
*/
static errorMsg(errorTxt: string): number
/**
* 弹出错误通知提示信息框.
* @param errorTxt 提示的信息* @returns 返回弹出层的唯一index
* @param errorTxt 提示的信息* @returns 返回弹出层的唯一index . 关闭可使用 Common.closeForm(index).
*/
static errorNt(errorTxt: string): number
@ -18224,7 +18245,7 @@ static formatNumber(num: number,pattern: string): string
/**
* 最大化弹出层
* @param index 弹出层的唯一索引* @returns 返回弹出层的唯一index
* @param index 弹出层的唯一索引* @returns 返回弹出层的唯一index . 关闭可使用 Common.closeForm(index).
*/
static fullForm(index: number): void
@ -18349,7 +18370,7 @@ static getMenuId(): string
/**
* 得到快搭通知消息接口对象
* @returns
* @returns 消息对象
*/
static getNotice(): INotice
@ -18510,14 +18531,15 @@ static isNotEmpty(value: any): boolean
static isNotNil(value: any): boolean
/**
* 懒加载图片函数
注意图片Img的初始格式:
* 懒加载图片函数 这个使用了scroll的滚动机制来懒加载,
注意: 1. 当浏览器支持IntersectionObserver 生效的时候使用观察者机制来实现懒加载 否则使用scroll的滚动机制
图片Img的初始格式:
<img class ="kdayun-img-lazload" data-src="/static/image/abc.png" src="${Common.getContextPath()}/static/image/loading.gif">
* @param container 容器 htmlElement
* @param lazloadClass 图懒加载的类名 默认值:kdayun-img-lazload
*/
static lazyLoad(container: Element,lazloadClass: string): void
static lazyLoadOnScroll(container: Element,lazloadClass: string): void
/**
* 动态增加Css
@ -18538,7 +18560,12 @@ static loadScript(id: string,code: string,type: string): void
/**
* 显示正在加载
* @returns
* @returns 返回弹出层的唯一index . 关闭可使用 Common.closeForm(index).
```typescript
let handle=Common.loading()
//隐藏
Common.closeForm(handle)
```
*/
static loading(): number
@ -18564,7 +18591,7 @@ static matchsBetween(context: string,s1: string,s2: string): string
```typescript
Form.msg("您好!")
```
* @param text 警告信息* @returns 返回弹出层的唯一index
* @param text 警告信息* @returns 返回弹出层的唯一index . 关闭可使用 Common.closeForm(index).
*/
static msg(text: string): number
@ -18626,7 +18653,7 @@ photos: {
<img layer-pid="图片id可以不写" layer-src="大图地址" src="缩略图" alt="图片名">
<img layer-pid="图片id可以不写" layer-src="大图地址" src="缩略图" alt="图片名">
</div>
* @param options 弹出页签的参数* @returns 返回弹出层的唯一index
* @param options 弹出页签的参数* @returns 返回弹出层的唯一index . 关闭可使用 Common.closeForm(handleindex.
*/
static photo(options: IFormPhotoOptions): number
@ -18742,7 +18769,7 @@ static successMsg(text: string): number
/**
* 弹出成功通知提示框
* @param text 提示信息* @returns 返回弹出层的唯一index
* @param text 提示信息* @returns 返回弹出层的唯一index . 关闭可使用 Common.closeForm(index).
*/
static successNt(text: string): number
@ -18758,7 +18785,7 @@ static swap(arr: any[],index1: number,index2: number): any[]
/**
* 弹出页签的
* @param options 弹出页签的参数* @returns 返回弹出层的唯一index
* @param options 弹出页签的参数* @returns 返回弹出层的唯一index . 关闭可使用 Common.closeForm(index).
*/
static tabForm(options: IFormTabOptions): number
@ -18769,7 +18796,7 @@ Common.tips("hello", btn.getElemt(), { tips: {color:"red", direct: "down" } })
```
* @param content tips 层的提示内容.
* @param $follow tips 层跟随的定位元素 jquery 包装的DOM元素对象.
* @param options tips 层的选项.* @returns 返回弹出层的唯一index
* @param options tips 层的选项.* @returns 返回弹出层的唯一index . 关闭可使用 Common.closeForm(index).
*/
static tips(content: string,$follow: JQuery<any>,options: IFormTipsOptions): number
@ -18820,14 +18847,14 @@ static uuid(prefix: string): string
/**
* 弹出警告弹出提示框
* @param text 警告信息* @returns 返回弹出层的唯一index
* @param text 警告信息* @returns 返回弹出层的唯一index . 关闭可使用 Common.closeForm(index).
*/
static warnMsg(text: string): number
/**
* 弹出警告通知提示框
* @param text 警告信息* @returns 返回弹出层的唯一index
* @param text 警告信息* @returns 返回弹出层的唯一index . 关闭可使用 Common.closeForm(index).
*/
static warnNt(text: string): number
@ -19122,6 +19149,33 @@ static aesDecode(str: string): string
*/
static aesEncode(str: string): string
/**
* 解密文件
* @param file 文件数组
* @param password 密钥
* @param showLoading 是否显示加载中 默认值:true* @returns 异步对象Promise
``` javascript
EncryptUtils.decodeFile(uploadFile, EncryptUtils.enckey).then((item) => {
console.info(item.blobFileName)
})
```
*/
static decodeFile(file: IUploadFile,password: string,showLoading: boolean): Promise<any>
/**
* 加密文件
* @param file 文件对象
* @param password 密钥* @returns 异步对象Promise
```javascript
let formData = new FormData();
let blob = await this.zipFile(file, 'xxxx-yyyy-xxxx-zzzz')
formData.append('fieldName', blob, file.name);
```
*/
static encodeFile(file: any,password: string): Promise<any>
/**
* md5编码字符串
* @param str 字符串* @returns 返回加密后的字符串
@ -20252,7 +20306,7 @@ class Slider extends DbComponentBase {
*/
barColor: String
/**
*高度 默认200
*高度 默认 : 50
*/
height: number
/**
@ -20291,6 +20345,12 @@ value: number | number[]
}
/**
*徽章类型
*/
enum BadgeType {
dot = "dot",text = "text"
}
/**
*按钮的主题
*/
enum tabTheme {
@ -20381,6 +20441,13 @@ remove(): void
*/
setActive(): void
/**
* 设置徽章
* @param text 标题
*/
setBadge(text: string): void
/**
* 设置页签的标记
* @param value 是否显示标记 true 显示,则反之
@ -20428,7 +20495,7 @@ addTab(tab: TabPanel): void
* @param url 地址字符串
* @param params 参数
* @param method 请求方式
* @param allowClose 是否运行关闭页签(默认:false )
* @param allowClose 是否允许关闭页签(默认:false )
*/
addUrlTab(title: string,url: string,params: object,method: MethodType,allowClose: boolean): void
@ -22945,6 +23012,10 @@ class TableListViewOptionColumn extends TableListViewColumnBase {
*/
class TableListViewPictureColumn extends TableListViewColumnBase {
/**
*文件加密
*/
isEncrypt: boolean
/**
*最多能上传多少文件
*/
maxFileCount: number
@ -23039,9 +23110,10 @@ importData(finishCallback: DataImportCallBack): void
/**
*导入数据回调
*@param error 空成功导入,则反之
*@param res 返回的数据对象
*/
declare type DataImportCallBack = (error: string) => void
declare type DataImportCallBack = (error: string,res: IRetVo) => void
/**
*数据权限的类型
*/
@ -23604,7 +23676,7 @@ enum WorkFlowSearchType {
*/
all = "all",
/**
*查阅,抄送 只能看不能改
*查阅,抄送 只能看不能改
*/
daicy = "daicy",
/**
@ -23624,6 +23696,10 @@ none = "none",
*/
shenhz = "shenhz",
/**
*已查阅,抄送(已读) 只能看不能改
*/
yicy = "yicy",
/**
*已审核
*/
yish = "yish"
@ -23678,7 +23754,7 @@ class WorkFlow extends InvisibleBase {
当审配与数据修改需要在同一个事务内的时候可以使用该函数
* @param finishCallBack 完成回调 function (audFlag, audName, auditMemo, error) 如果 error是非空说明有错误发生.
* @param wfParams 可选参数,传递参数到流程参数
* @param attachment 可选参数, 附件
* @param attachment 可选参数, 附件. 字符串格式如: '{ "newFileName": "xxxxx/yyyyy/ssss.png", "oldFileName": "yyy/old.png" }'
例如:
```javascript
function Button13_onClickScript(cxt: ScriptContext, btn: Button) {
@ -23709,7 +23785,7 @@ confirm(finishCallBack: WorkflowCallBack,wfParams: object,attachment: string): v
* @param row 需要审核的行
* @param finishCallBack 完成回调 function (audFlag, audName, auditMemo, error) 如果 error是非空说明有错误发生.
* @param wfParams 可选参数,传递参数到流程参数
* @param attachment 可选参数, 附件
* @param attachment 可选参数, 附件 字符串格式如: '{ "newFileName": "xxxxx/yyyyy/ssss.png", "oldFileName": "yyy/old.png" }'
例如:
```javascript
function Button13_onClickScript(cxt: ScriptContext, btn: Button) {
@ -23718,6 +23794,10 @@ if (rows.length == 0) {
Common.warnMsg('请选择行');
return;
}
//设置的指定人审核
wfParams['__assignee']=['DBABA3318E2B475B89701CBF42E03D7B_321060C3C0C34824A9F291E0DC7086A0_7FCABE692E5E4E06AA42CAA67802644C_59EAFF507408402FA3466783D5FEC093','7575860D9D21457ABF7162AF4DF177BA_3BFFEBAC10184810811D6FFDCF12E21C_7FCABE692E5E4E06AA42CAA67802644C_AD4B4E3736FB4650B55D9C9693AA57CB']
//设置抄送的人
wfParams['__copyAssignee']=['DBABA3318E2B475B89701CBF42E03D7B_321060C3C0C34824A9F291E0DC7086A0_7FCABE692E5E4E06AA42CAA67802644C_59EAFF507408402FA3466783D5FEC093','7575860D9D21457ABF7162AF4DF177BA_3BFFEBAC10184810811D6FFDCF12E21C_7FCABE692E5E4E06AA42CAA67802644C_AD4B4E3736FB4650B55D9C9693AA57CB']
btn.getPage().components.WorkFlow1.confirmAndPostByRow(rows[0], function (audFlag,audName, auditMemo, error) {
if (Common.isNotEmpty(error)) {
Common.errorMsg(error);
@ -23738,7 +23818,7 @@ confirmAndPostByRow(row: Row,finishCallBack: WorkflowCallBack,wfParams: object,a
* @param auditMemo 审核的备注
* @param wfParams 流程变量 传递到流程引擎内的变量(例如:传递一个变量来会影响线路的路径)
* @param finishCallBack 审批完成的回调
* @param attachment 可选参数, 附件
* @param attachment 可选参数, 附件 字符串格式如: '{ "newFileName": "xxxxx/yyyyy/ssss.png", "oldFileName": "yyy/old.png" }'
例如:
```javascript
function Button13_onClickScript(cxt: ScriptContext, btn: Button) {
@ -23747,6 +23827,10 @@ if (rows.length == 0) {
Common.warnMsg('请选择行');
return;
}
//设置的指定人审核
wfParams['__assignee']=['DBABA3318E2B475B89701CBF42E03D7B_321060C3C0C34824A9F291E0DC7086A0_7FCABE692E5E4E06AA42CAA67802644C_59EAFF507408402FA3466783D5FEC093','7575860D9D21457ABF7162AF4DF177BA_3BFFEBAC10184810811D6FFDCF12E21C_7FCABE692E5E4E06AA42CAA67802644C_AD4B4E3736FB4650B55D9C9693AA57CB']
//设置抄送的人
wfParams['__copyAssignee']=['DBABA3318E2B475B89701CBF42E03D7B_321060C3C0C34824A9F291E0DC7086A0_7FCABE692E5E4E06AA42CAA67802644C_59EAFF507408402FA3466783D5FEC093','7575860D9D21457ABF7162AF4DF177BA_3BFFEBAC10184810811D6FFDCF12E21C_7FCABE692E5E4E06AA42CAA67802644C_AD4B4E3736FB4650B55D9C9693AA57CB']
btn.getPage().components.WorkFlow1.confirmAndPostByRowDirect(rows[0],WorkflowConfirmResult.cfTongy,'流程审批备注',{param1:paramValue1}, function (error) {
if (Common.isNotEmpty(error)) {
Common.errorMsg(error);
@ -23768,7 +23852,7 @@ confirmAndPostByRowDirect(row: Row,audFlag: WorkflowConfirmResult,auditMemo: str
* @param row 行
* @param finishCallBack 审核完成的事件回调 function (audFlag, audName, auditMemo, error) 如果 error是非空说明有错误发生.
* @param wfParams 流程变量 传递到流程引擎内的变量(例如:传递一个变量来会影响线路的路径)
* @param attachment 可选参数, 附件
* @param attachment 可选参数, 附件 字符串格式如: '{ "newFileName": "xxxxx/yyyyy/ssss.png", "oldFileName": "yyy/old.png" }'
例如:
```javascript
function Button13_onClickScript(cxt: ScriptContext, btn: Button) {
@ -23813,7 +23897,7 @@ getLog(): void
/**
* 查看流程日志
* @param pid 流程实例id
* @param pid 流程实例ID
*/
getLogByPid(pid: string): void
@ -23838,12 +23922,21 @@ getToDoList(): void
*/
getWorkFlowPic(processId: string): void
/**
* 设置抄送为已读)
* @param processId 流程实例ID
* @param comment 流程备注
* @param callback 回调
*/
setCopyRead(processId: string,comment: string,callback: WofkFlowCallbackHandle): void
/**
* 启动关联的数据源的当前行的流程. 会弹出指定的审核表单
当启动流程与数据修改需要在同一个事务内的时候可以使用该函数.
* @param finishCallBack 完成回调函数 function (audFlag, audName, auditMemo, error) 如果 error是非空说明有错误发生.
* @param wfParams 可选参数,传递参数到后台
* @param attachment 可选参数, 附件
* @param attachment 可选参数, 附件 字符串格式如: '{ "newFileName": "xxxxx/yyyyy/ssss.png", "oldFileName": "yyy/old.png" }'
例如:
```javascript
function Button13_onClickScript(cxt: ScriptContext, btn: Button) {
@ -23879,7 +23972,7 @@ start(finishCallBack: WorkflowCallBack,wfParams: object,attachment: string): voi
* @param row 需要启动流程的行
* @param finishCallBack 完成回调; function (audFlag, audName, auditMemo, error) 如果 error是非空说明有错误发生.
* @param wfParams 可选参数,传递参数到流程参数
* @param attachment 可选参数, 附件
* @param attachment 可选参数, 附件 字符串格式如: '{ "newFileName": "xxxxx/yyyyy/ssss.png", "oldFileName": "yyy/old.png" }'
例如:
```javascript
function Button13_onClickScript(cxt: ScriptContext, btn: Button) {
@ -23907,7 +24000,7 @@ startAndPostByRow(row: Row,finishCallBack: WorkflowCallBack,wfParams: object,att
* @param auditMemo 审核的备注
* @param wfParams 流程变量 传递到流程引擎内的变量(例如:传递一个变量来会影响线路的路径)
* @param finishCallBack 审批完成的回调
* @param attachment 可选参数, 附件
* @param attachment 可选参数, 附件 字符串格式如: '{ "newFileName": "xxxxx/yyyyy/ssss.png", "oldFileName": "yyy/old.png" }'
例如:
```javascript
function Button13_onClickScript(cxt: ScriptContext, btn: Button) {
@ -23916,6 +24009,10 @@ if (rows.length == 0) {
Common.warnMsg('请选择行');
return;
}
//设置的指定人审核
wfParams['__assignee']=['DBABA3318E2B475B89701CBF42E03D7B_321060C3C0C34824A9F291E0DC7086A0_7FCABE692E5E4E06AA42CAA67802644C_59EAFF507408402FA3466783D5FEC093','7575860D9D21457ABF7162AF4DF177BA_3BFFEBAC10184810811D6FFDCF12E21C_7FCABE692E5E4E06AA42CAA67802644C_AD4B4E3736FB4650B55D9C9693AA57CB']
//设置抄送的人
wfParams['__copyAssignee']=['DBABA3318E2B475B89701CBF42E03D7B_321060C3C0C34824A9F291E0DC7086A0_7FCABE692E5E4E06AA42CAA67802644C_59EAFF507408402FA3466783D5FEC093','7575860D9D21457ABF7162AF4DF177BA_3BFFEBAC10184810811D6FFDCF12E21C_7FCABE692E5E4E06AA42CAA67802644C_AD4B4E3736FB4650B55D9C9693AA57CB']
btn.getPage().components.WorkFlow1.startAndPostByRowDirect(rows[0],'流程审批备注',{param1:paramValue1}, function (error) {
if (Common.isNotEmpty(error)) {
Common.errorMsg(error);
@ -23937,7 +24034,7 @@ startAndPostByRowDirect(row: Row,auditMemo: string,wfParams: object,finishCallBa
* @param row 行
* @param finishCallBack 完成的回调函数 function (audFlag, audName, auditMemo, error) 如果 error是非空说明有错误发生
* @param wfParams 可选参数,传递参数到流程参数
* @param attachment 可选参数, 附件
* @param attachment 可选参数, 附件 字符串格式如: '{ "newFileName": "xxxxx/yyyyy/ssss.png", "oldFileName": "yyy/old.png" }'
例如:
```javascript
function Button13_onClickScript(cxt: ScriptContext, btn: Button) {
@ -23967,6 +24064,12 @@ btn.getPage().components.Table1.loadData();
startByRow(row: Row,finishCallBack: WorkflowCallBack,wfParams: object,attachment: string): void
}
/**
*流程回调类型
*@param err 字符串类型
*/
declare type WofkFlowCallbackHandle = (err: string) => void
/**
*流程回调函数
*@param audFlag 审核结果的值
@ -24013,7 +24116,7 @@ class ZlPage extends PageBase {
/**
* 新增行
* @param params 参数数组或者参数对象 默认[]
* @param params 参数数组或者参数对象. 默认[]
* @param pageCoinfg 可选 弹出的编辑界面的参数设置默认{}
* @param finishCallback 完成时回调 err为非空说明有错误
* @param isTransferRow 可选参数 是否传递行到打开的page的页面参数里面
@ -24069,7 +24172,7 @@ modifyRow(row: Row,params: Object | IParam[],pageCoinfg: IPageFormOptions,finish
/**
* 删除选择的行
* @param rows 删除的行
* @param rows 删除的行的数组
* @param callback 可选参数 完成时回调 err为非空说明有错误
* @param autoCommit 可选参数 是否自动提交到后台 默认:true
例子:

View File

@ -85,6 +85,7 @@ layui.define('jquery', function (exports) {
, elemBar = elem.find('.' + ELEM + '-bar')
, text = elemBar.find('.' + ELEM + '-text');
elemBar.css('width', percent);
elemBar.attr("lay-percent", percent);
text.text(percent);
return this;
};
@ -396,6 +397,7 @@ layui.define('jquery', function (exports) {
if (othis.attr('lay-showPercent')) {
setTimeout(function () {
percent = elemBar.attr('lay-percent');
elemBar.html('<span class="' + ELEM + '-text">' + percent + '</span>');
}, 350);
}

View File

@ -1564,6 +1564,7 @@ ul.navbarSearchResult::-webkit-scrollbar-track {
.kdayun-app-layout-left.layadmin-side-shrink .layui-logo,
.kdayun-app-layout-left.layadmin-side-shrink .navbar-side-search {
width: 60px;
text-align: center;
}
.kdayun-app-layout-left.layadmin-side-shrink .layui-header .kdayun-header-left-tools,
@ -2514,3 +2515,51 @@ CORE STYLES BELOW - NO TOUCHY
.kdayun-app-layout-left.layadmin-side-shrink .kdayun-pagetab-body {
left: 60px;
}
.kdayun-app-layout-left.layadmin-side-shrink li.kdayun-menu-item {
text-align: center;
height: 50px;
margin-bottom: 8px;
box-sizing: border-box;
padding: 4px;
}
.kdayun-app-layout-left.layadmin-side-shrink li.kdayun-menu-item a {
line-height: 16px;
padding: 0;
padding-top: 5px;
height: 100%;
}
.kdayun-app-layout-left.layadmin-side-shrink li.kdayun-menu-item a:hover {
background-color: var(--kd-color);
border-radius: 4px;
filter: alpha(opacity=10);
/* border: 1px darkcyan solid; */
}
.kdayun-app-layout-left.layadmin-side-shrink li.kdayun-menu-item a svg,
.kdayun-app-layout-left.layadmin-side-shrink li.kdayun-menu-item a img {
width: 24px !important;
height: 24px !important;
vertical-align: text-bottom;
}
.kdayun-app-layout-left.layadmin-side-shrink li.kdayun-menu-item a cite {
display: table-cell !important;
line-height: 18px;
padding: 0 !important;
font-size: 10px;
font-style: normal;
}
.kdayun-app-layout-left.layadmin-side-shrink .navbar-side-search i#navbarSearchIcon {
display: none;
}
.kdayun-app-layout-left.layadmin-side-shrink .layui-logo {
padding: 0;
}

View File

@ -20654,7 +20654,6 @@ ORYX.Plugins.ShapeRepository = {
if (aShapes.lenght == 1 && aShapes[0] instanceof ORYX.Core.Canvas) {
return false;
} else {
@ -23313,10 +23312,14 @@ Ext.CodeEditorField = Ext.extend(Ext.form.TextArea, {
Object.extend(this.config, defaultConfig);
Object.extend(this.config, config)
},
getName: function () {
return this.rendered && this.el.dom.getAttribute('name') ? this.el.dom.getAttribute('name') : (this.hiddenName || '');
},
initValue: function () {
if (this.el && !this.el.aceeditor) {
this.el = new Ext.Element(this.el.dom.firstChild, false);
this.el.aceeditor = this.createAceEditor(this.language);
this.el.dom = this.el.aceeditor.container
this.setValue(this.getValue())
}
if (this.el.aceeditor.getValue().length > 0) {
@ -23326,7 +23329,7 @@ Ext.CodeEditorField = Ext.extend(Ext.form.TextArea, {
createAceEditor: function (language) {
ace.require("ace/ext/language_tools");
var editor = ace.edit(this.getPerId());
let editor = ace.edit(this.getPerId());
editor.setTheme("ace/theme/twilight");
editor.session.setMode("ace/mode/" + language);
editor.setFontSize(14);
@ -23339,7 +23342,7 @@ Ext.CodeEditorField = Ext.extend(Ext.form.TextArea, {
enableLiveAutocompletion: true
});
editor.getSession().on('change', function (e, editor) {
var v = editor.getValue();
let v = editor.getValue();
Ext.form.TextField.superclass.setValue.call(this, v);
}.bind(this));
return editor;
@ -23373,8 +23376,12 @@ Ext.CodeEditorField = Ext.extend(Ext.form.TextArea, {
}
return v;
},
getPerId: function () {
return 'per_' + this.name || this.id;
if (!this.domId) {
this.domId = 'per_' + (this.name || this.id) + new Date().getTime();
}
return this.domId;
},
onRender: function (ct, position) {
if (!this.el) {
@ -23576,9 +23583,6 @@ Ext.form.StrategysEditor = Ext.extend(Ext.form.ComboBox, {
}],
items: [popItem],
listeners: {
hide: function () {
dialog.destroy();
}.bind(this),
show: function () {
if (popItem.onShow) {
var record = this.getRecord();
@ -23623,6 +23627,12 @@ Ext.StrategysEditorPanelBase = Ext.extend(Ext.Panel, {
, constructor: function (config, grid) {
this.grid = grid;
Ext.StrategysEditorPanelBase.superclass.constructor.call(this, config);
},
/**
* 释放对象
*/
doDestory: function () {
},
onShow: function () {
},
@ -23663,14 +23673,16 @@ Ext.SelectPersonStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
, { name: 'ROLENAME', type: 'string' }
, { name: 'ORGNAME', type: 'string' }
];
var initconfig = {};
let initconfig = {};
Object.extend(initconfig, config);
var eastGrid = this.createEastGrid();
var westTab = this.createWestTab();
var centerGrid = this.createCenterGrid();
this.eastGrid = this.createEastGrid();
this.westTab = this.createWestTab();
this.centerGrid = this.createCenterGrid();
Object.extend(initconfig, {
anchor: '100% 100%'
, layout: 'border'
, split: false
, defaults: {
collapsible: true
, split: true
@ -23680,24 +23692,25 @@ Ext.SelectPersonStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
region: 'center'
, layout: 'fit'
, collapsible: false
, items: [centerGrid]
, items: [this.centerGrid]
}, {
region: 'west'
, width: 300
, items: [westTab]
, items: [this.westTab]
}, {
title: '已选择'
, region: 'east'
, layout: 'fit'
, width: 400
, collapsible: false
, items: [eastGrid]
, items: [this.eastGrid]
}]
});
Ext.SelectPersonStrategysEditor.superclass.constructor.call(this, initconfig, grid);
},
createWestTab: function () {
var buildTreeData = function (data) {
let that = this;
let buildTreeData = function (data) {
data.each(function (item) {
item.id = item['RWID'];
item.text = item['OBJNAME'];
@ -23706,7 +23719,7 @@ Ext.SelectPersonStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
}.bind(this))
return toTreeData(data)
}.bind(this);
var buildTreeNodes = function (data) {
let buildTreeNodes = function (data) {
data.each(function (item) {
item.id = item['RWID'];
item.text = item['OBJNAME'];
@ -23748,7 +23761,7 @@ Ext.SelectPersonStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
});
}
var roleRoot = new Ext.tree.AsyncTreeNode({
let roleRoot = new Ext.tree.AsyncTreeNode({
text: '所有角色'
, id: 'roleroot'
, expanded: true
@ -23782,13 +23795,14 @@ Ext.SelectPersonStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
});
}
}.bind(this);
var nodeClick = function (node) {
let nodeClick = function (node) {
if (!node) {
return false;
}
if (tabs.getActiveTab().getId() == 'tabRole') {
let actTabId = tabs.getActiveTab().getId();
if (actTabId == 'tabRole') {
this.dsUser.load({ params: { start: 0, limit: this.pageSize, ORGID: getCurrentOrgId(), ROLEID: node.id } })
} else if (tabs.getActiveTab().getId() == 'tabDept') {
} else if (actTabId == 'tabDept') {
if (node.attributes.data && node.attributes.data.EXPANDPROPERTY && node.attributes.data.EXPANDPROPERTY == 'org') {
this.dsUser.load({ params: { start: 0, limit: this.pageSize, ORGID: node.id } })
addDept(node);
@ -23799,7 +23813,7 @@ Ext.SelectPersonStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
}
return true;
}.bind(this);
var roleTree = new Ext.tree.TreePanel({
let roleTree = new Ext.tree.TreePanel({
root: roleRoot
, loader: new Ext.tree.TreeLoader()
, border: false
@ -23810,17 +23824,18 @@ Ext.SelectPersonStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
}
});
var deptRoot = new Ext.tree.AsyncTreeNode({
let deptRoot = new Ext.tree.AsyncTreeNode({
text: '所有部门'
, id: 'deptroot'
, expanded: true
, children: this.depttreeData
});
var deptTreeLoader = new Ext.tree.TreeLoader({
let deptTreeLoader = new Ext.tree.TreeLoader({
dataUrl: getContextPath() + '/admin/coreorg/queryorgdepttreelistbyparentid'
});
var deptTree = new Ext.tree.TreePanel({
let deptTree = new Ext.tree.TreePanel({
root: deptRoot
, loader: deptTreeLoader
, border: false
@ -23830,11 +23845,16 @@ Ext.SelectPersonStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
click: nodeClick
}
});
this.customEditor = new Ext.CodeEditorField({ language: 'sql', alignment: "tl-tl", width: that.initWidth - 20, height: that.initHeight - 110 })
this.customEditorPanel = new Ext.Panel({ anchor: '100%,100%', items: [this.customEditor] })
deptTreeLoader.on('beforeload', function (loader, node) {
this.baseParams.id = node.id; //通过这个传递参数,这样就可以点一个节点出来它的子节点来实现异步加载
}, deptTreeLoader);
var tabs = new Ext.TabPanel({
let tabs = new Ext.TabPanel({
activeTab: 0
, resizeTabs: false
, height: this.initHeight - 76
@ -23851,11 +23871,42 @@ Ext.SelectPersonStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
id: 'tabDept'
, title: '机构部门'
, items: [deptTree]
}
, {
id: 'tabCustom'
, title: '自定义'
, items: [this.customEditorPanel]
}
]
, listeners: {
tabchange: function (tabs, tab) {
tab.doLayout();
if (tab.id == 'tabCustom') {
that.layout.center.panel.hide();
that.layout.east.panel.hide();
that.layout.west.panel.setWidth(that.initWidth);
that.layout.west.items[0].setWidth(that.initWidth)
that.layout.west.splitEl.hide()
let record = that.getRecord();
let fieldsStr = record.get('task_listener_fields');
let filedItems
if (fieldsStr) {
let obj = JSON.parse(fieldsStr);
obj && (filedItems = obj['items']);
}
tab.doLayout();
if (filedItems && filedItems.length > 0 && filedItems[0]['task_listener_field_name'] == 'condition') {
that.customEditor.setValue(filedItems[0]['task_listener_field_value']);
}
} else {
that.layout.center.panel.show();
that.layout.east.panel.show();
that.layout.west.panel.setWidth(300);
that.layout.west.items[0].setWidth(300)
that.layout.west.splitEl.show()
tab.doLayout();
}
}
}
});
@ -23982,7 +24033,7 @@ Ext.SelectPersonStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
totalProperty: 'totalCount'
}, this.fields)
});
var pageToolbar = new Ext.PagingToolbar({
let pageToolbar = new Ext.PagingToolbar({
pageSize: 5000
, store: this.dsSelections
, displayInfo: false
@ -23995,7 +24046,7 @@ Ext.SelectPersonStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
}
});
this.dsSelections.load();
var sm = new Ext.grid.CheckboxSelectionModel();
let sm = new Ext.grid.CheckboxSelectionModel();
this.eastGrid = new Ext.grid.EditorGridPanel({
id: 'gridSelect'
, clicksToEdit: 1
@ -24069,62 +24120,82 @@ Ext.SelectPersonStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
return this.eastGrid;
},
okCallBack: function () {
if (this.dsSelections.getCount() > 0) {
var datatype = this.datatype;
var record = this.getRecord();
var selectPerson = [], selectUser = [], selecthuiq = [], tmpfield;
var getUserString = function (record) {
return record.get('ORGID') + '_' + record.get('DEPTID') + '_' + record.get('ROLEID') + '_' + record.get('USERID');
// return record.get('USERID');
}
var getUserDisplayTitle = function (record) {
return record.get('OBJNAME');
}
this.dsSelections.each(function (record) {
var obj = { "assignment_type": "assignee", "resourceassignmentexpr": getUserString(record) };
selectPerson.push(getUserString(record));
selectUser.push(getUserDisplayTitle(record));
selecthuiq.push(obj);
});
record.set('task_listener_class', 'com.kdayun.z1.core.workflow.listerner.usertask.PersonRoleDeptListenerImpl');
//会签
if (datatype == 'selHuiq' || datatype == 'selHuiqSeral') {
var datastring = "countersignUser";
record.set('task_listener_class', 'com.kdayun.z1.core.workflow.listerner.usertask.CountersignListener');
if (record.data.task_listener_stype == 'selHuiqSeral') {
this.propertywindow.editDirectly('oryx-multiinstance_sequential', 'Yes');
} else {
this.propertywindow.editDirectly('oryx-multiinstance_sequential', 'No');
}
this.propertywindow.editDirectly('oryx-multiinstance_cardinality', '');
this.propertywindow.editDirectly('oryx-multiinstance_variable', datastring);
tmpfield = {
totalCount: 1
, items: [{ 'assignment_type': 'assignee', 'resourceassignmentexpr': '${' + datastring + '}' }]
}
this.propertywindow.editDirectly('oryx-usertaskassignment', Ext.encode(tmpfield));
} else {
this.propertywindow.editDirectly('oryx-multiinstance_condition', '');
this.propertywindow.editDirectly('oryx-multiinstance_sequential', '');
this.propertywindow.editDirectly('oryx-multiinstance_cardinality', '');
this.propertywindow.editDirectly('oryx-multiinstance_variable', '');
this.propertywindow.editDirectly('oryx-multiinstance_collection', '');
this.propertywindow.editDirectly('oryx-usertaskassignment', '');
}
tmpfield = {
totalCount: 1,
items: [{
task_listener_field_name: 'condition'
, task_listener_field_value: " USERID in('" + selectPerson.join("','") + "')"
}
]
}
record.set('task_listener_displaytitle', selectUser.join(','));
record.set('task_listener_fields', Ext.encode(tmpfield));
record.commit();
return true;
let datatype = this.datatype;
let record = this.getRecord();
let selectPerson = [], selectUser = [], selecthuiq = [], tmpfield;
let getUserString = function (record) {
return record.get('ORGID') + '_' + record.get('DEPTID') + '_' + record.get('ROLEID') + '_' + record.get('USERID');
// return record.get('USERID');
}
let getUserDisplayTitle = function (record) {
return record.get('OBJNAME');
}
this.dsSelections.each(function (record) {
var obj = { "assignment_type": "assignee", "resourceassignmentexpr": getUserString(record) };
selectPerson.push(getUserString(record));
selectUser.push(getUserDisplayTitle(record));
selecthuiq.push(obj);
});
record.set('task_listener_class', 'com.kdayun.z1.core.workflow.listerner.usertask.PersonRoleDeptListenerImpl');
record.set('task_listener_event_type', 'create');
//会签
if (datatype == 'selHuiq' || datatype == 'selHuiqSeral') {
var datastring = "countersignUser";
record.set('task_listener_class', 'com.kdayun.z1.core.workflow.listerner.usertask.CountersignListener');
record.set('task_listener_event_type', 'complete');
if (record.data.task_listener_stype == 'selHuiqSeral') {
this.propertywindow.editDirectly('oryx-multiinstance_sequential', 'Yes');
} else {
this.propertywindow.editDirectly('oryx-multiinstance_sequential', 'No');
}
this.propertywindow.editDirectly('oryx-multiinstance_cardinality', '');
this.propertywindow.editDirectly('oryx-multiinstance_variable', datastring);
tmpfield = {
totalCount: 1
, items: [{ 'assignment_type': 'assignee', 'resourceassignmentexpr': '${' + datastring + '}' }]
}
this.propertywindow.editDirectly('oryx-usertaskassignment', Ext.encode(tmpfield));
} else {
this.propertywindow.editDirectly('oryx-multiinstance_condition', '');
this.propertywindow.editDirectly('oryx-multiinstance_sequential', '');
this.propertywindow.editDirectly('oryx-multiinstance_cardinality', '');
this.propertywindow.editDirectly('oryx-multiinstance_variable', '');
this.propertywindow.editDirectly('oryx-multiinstance_collection', '');
this.propertywindow.editDirectly('oryx-usertaskassignment', '');
}
let conditions, displayTitle;
if (this.westTab.getActiveTab().id == 'tabCustom') {
let val = this.customEditor.getValue();
if (val !== undefined && val !== null && val !== "") {
conditions = {
totalCount: 1,
items: [{
task_listener_field_name: 'condition'
, task_listener_field_value: this.customEditor.getValue()
}
]
}
displayTitle = '自定义';
}
} else {
if (selectPerson.length > 0) {
conditions = {
totalCount: 1,
items: [{
task_listener_field_name: 'condition'
, task_listener_field_value: " USERID in('" + selectPerson.join("','") + "')"
}
]
}
displayTitle = selectUser.join(',');
}
}
record.set('task_listener_displaytitle', displayTitle);
record.set('task_listener_fields', Ext.encode(conditions));
record.commit();
return true;
}
});
//选择样板策略
@ -24165,13 +24236,13 @@ Ext.SelectTempleteStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
}
},
initEditorPanel: function () {
var that = this;
this.fields = [
let that = this;
that.fields = [
{ name: 'VALUE', type: 'string' }
, { name: 'CODE', type: 'string' }
, { name: 'DCMX_KEY', type: 'string' }
]
this.dsSelections = new Ext.data.Store({
that.dsSelections = new Ext.data.Store({
totalProperty: "obj",
proxy: new Ext.data.HttpProxy({
url: getContextPath() + '/manager/coredictionary/querydictionarybyid?RWID=70F0BB4839D943C7BF7E4C393B1306E5'
@ -24179,17 +24250,17 @@ Ext.SelectTempleteStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
, reader: new Ext.data.JsonReader({
root: 'obj'
, totalProperty: 'total'
}, this.fields)
}, that.fields)
});
this.dsSelections.load();
this.dsSelections.addListener('load', function (st, rds, opts) {
that.dsSelections.load();
that.dsSelections.addListener('load', function (st, rds, opts) {
that.setSelectRow()
});
var sm = new Ext.grid.RowSelectionModel({
let sm = new Ext.grid.RowSelectionModel({
singleSelect: true
});
var editformPanel = new Ext.form.FormPanel({
let editformPanel = new Ext.form.FormPanel({
anchor: '100% 100%'
, bodyStyle: 'padding:10px'
, items: [
@ -24211,7 +24282,7 @@ Ext.SelectTempleteStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
]
})
//编辑窗口
var editWindow = new Ext.Window({
that.editWindow = new Ext.Window({
layout: 'anchor'
, width: 800
, height: 500
@ -24227,35 +24298,35 @@ Ext.SelectTempleteStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
, listeners: {
show: function () {
editformPanel.getForm().reset();
if (this.editFlag == 'new') {
editWindow.setTitle('新增');
if (that.editFlag == 'new') {
this.setTitle('新增');
}
else {
var grid = Ext.getCmp('gridTempleteStrategsy');
let grid = Ext.getCmp('gridTempleteStrategsy');
if (grid.getSelectionModel().selections.length > 0) {
editWindow.setTitle('编辑');
var row = grid.getSelectionModel().selections.get(0);
var code = row.data.CODE || '';
this.setTitle('编辑');
let row = grid.getSelectionModel().selections.get(0);
let code = row.data.CODE || '';
row.data.CODE = JSON.stringify(JSON.parse(code), null, 4)
editformPanel.getForm().loadRecord(row);
}
}
}.bind(this)
}
}
, buttons: [{
id: 'btnSelectTempleteStrategysEditorOk'
, text: '确定'
, listeners: {
click: function () {
var form = editformPanel.getForm();
var title = form.findField("VALUE").getValue();
var value = form.findField("CODE").getValue();
let form = editformPanel.getForm();
let title = form.findField("VALUE").getValue();
let value = form.findField("CODE").getValue();
if (!value) {
Ext.Msg.alert('提示', '请填写策略值!');
return;
}
try {
var obj = JSON.parse(value);
let obj = JSON.parse(value);
if (!obj['name'] || !obj['class'] || !obj['params']) {
Ext.Msg.alert('提示', '策略值格式有误!格式为:{"name":"aaaaa" ,"class":"xxxxx","params":[] }');
return;
@ -24266,9 +24337,8 @@ Ext.SelectTempleteStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
return;
}
var that = this;
var param = {};
if (this.editFlag == 'new') {
let param = {};
if (that.editFlag == 'new') {
param.ZDZ_DICTIONARYID = '70F0BB4839D943C7BF7E4C393B1306E5';
param.ZDZ_MINGC = title
@ -24292,7 +24362,7 @@ Ext.SelectTempleteStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
}
});
} else {
var selectdata = Ext.getCmp('gridTempleteStrategsy').getSelectionModel().selections.get(0);
let selectdata = Ext.getCmp('gridTempleteStrategsy').getSelectionModel().selections.get(0);
param.ZDZ_MINGC = title
param.ZDZ_ZIDZ = value;
param.RWID = selectdata.json.DCMX_KEY;
@ -24323,45 +24393,45 @@ Ext.SelectTempleteStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
}
});
}
editWindow.hide()
}.bind(this)
that.editWindow.hide()
}
}
}, {
id: 'btnSelectTempleteStrategysEditorCancel'
, text: '取消'
, listeners: {
click: function () {
editWindow.hide()
}.bind(this)
that.editWindow.hide()
}
}
}]
});
//工具栏
var toolbar = new Ext.Toolbar(
let toolbar = new Ext.Toolbar(
[{
text: ORYX.I18N.PropertyWindow.add,
icon: getContextPath() + '/static/workflow/editor/images/add.png',
iconCls: "x-dummy",
handler: function () {
this.editFlag = 'new';
editWindow.zseed = 99999;
editWindow.show();
}.bind(this)
that.editFlag = 'new';
that.editWindow.zseed = 99999;
that.editWindow.show();
}
}, {
text: ORYX.I18N.PropertyWindow.modify,
icon: getContextPath() + '/static/workflow/editor/images/modify.png',
iconCls: "x-dummy",
handler: function () {
this.editFlag = 'edit';
editWindow.zseed = 99999;
editWindow.show();
}.bind(this)
that.editFlag = 'edit';
that.editWindow.zseed = 99999;
that.editWindow.show();
}
}, {
text: ORYX.I18N.PropertyWindow.rem,
icon: getContextPath() + '/static/workflow/editor/images/delete.png',
iconCls: "x-dummy",
handler: function () {
var grid = Ext.getCmp('gridTempleteStrategsy');
let grid = Ext.getCmp('gridTempleteStrategsy');
if (grid.getSelectionModel().selections.length == 0) {
Ext.Msg.alert("提示", "请选中要删除的策略模板");
return;
@ -24369,8 +24439,8 @@ Ext.SelectTempleteStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
Ext.MessageBox.confirm('提示', '确实要删除所选的策模板吗?', function (btn) {
if (btn == 'yes') {
grid.stopEditing();
var selectdata = Ext.getCmp('gridTempleteStrategsy').getSelectionModel().selections.get(0);
var param = {};
let selectdata = Ext.getCmp('gridTempleteStrategsy').getSelectionModel().selections.get(0);
let param = {};
param.id = selectdata.json.DCMX_KEY;
// selectdata.data.update();
Ext.Ajax.request({
@ -24395,10 +24465,10 @@ Ext.SelectTempleteStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
}
});
}.bind(this)
}
}
]);
this.selectionsGrid = new Ext.grid.EditorGridPanel({
that.selectionsGrid = new Ext.grid.EditorGridPanel({
clicksToEdit: 1
, id: 'gridTempleteStrategsy'
, stripeRows: true
@ -24423,13 +24493,16 @@ Ext.SelectTempleteStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
, scrollOffset: 0
}
, enableHdMenu: false
, store: this.dsSelections
, store: that.dsSelections
, tbar: toolbar
});
this.selectionsGrid.addListener('rowdblclick', function (grid, rowindex, e) {
that.selectionsGrid.addListener('rowdblclick', function (grid, rowindex, e) {
Ext.getCmp('btnStrategysEditorOk').fireEvent('click');
});
return this.selectionsGrid;
return that.selectionsGrid;
},
doDestory: function () {
this.editWindow.destroy();
},
okCallBack: function () {
if (this.selectionsGrid.getSelectionModel().selections.length > 0) {
@ -24462,6 +24535,7 @@ Ext.SelectTempleteStrategysEditor = Ext.extend(Ext.StrategysEditorPanelBase, {
record.set('task_listener_displaytitle', selRecord.get('VALUE'));
record.set('task_listener_fields', Ext.encode(tmpfield));
record.commit();
this.doDestory()
return true;
}
}

View File

@ -4107,8 +4107,8 @@ Ext.EventObject = function () {
var noBoxAdjust = Ext.isStrict ? {
select: 1
} : {
input: 1, select: 1, textarea: 1
};
input: 1, select: 1, textarea: 1
};
if (Ext.isIE || Ext.isGecko) {
noBoxAdjust['button'] = 1;
}
@ -30127,7 +30127,7 @@ Ext.extend(Ext.grid.GridView, Ext.util.Observable, {
},
processRows: function (startRow, skipStripe) {
if (this.ds.getCount() < 1) {
if (!this.ds || this.ds.getCount() < 1) {
return;
}
skipStripe = skipStripe || !this.grid.stripeRows;
@ -30620,6 +30620,9 @@ Ext.extend(Ext.grid.GridView, Ext.util.Observable, {
},
updateHeaderSortState: function () {
if (!this.ds) {
return;
}
var state = this.ds.getSortState();
if (!state) {
return;

View File

@ -175,6 +175,7 @@
<input type="text" name="theme_title" placeholder="" autocomplete="off" class="layui-input w400">
</div>
</div>
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
<legend>风格、色调、布局</legend>
</fieldset>
@ -205,6 +206,7 @@
<li value="letTop"></li>
</ul>
</div>
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
<legend>菜单、导航、抬头设置</legend>
</fieldset>
@ -484,6 +486,7 @@
</div>
</div> -->
</div>
</form>
</div>
<div style="clear: both;"></div>

View File

@ -64,7 +64,7 @@
</ul>
<ul class="layui-nav layui-layout-right" lay-filter="layadmin-layout-right">
<li class="layui-nav-item" lay-unselect>
<a layadmin-event="message" yh-href="${request.contextPath}/manager/coremodelshow/?modelCode=CORE_LCDBS" nopost="1" lay-text="消息中心">
<a layadmin-event="message" yh-href="${request.contextPath}/manager/coremodelshow/?modelId=C2AB0681B83246F78D467A0D05E5B821" resid="5A61E550409841298EC15DBF68B95D8B" nopost="1" lay-text="消息中心">
<i class="layui-icon layui-icon-notice"></i>
<!-- 如果有新消息,则显示小圆点 -->
<span class="layui-badge-dot"></span>
@ -258,7 +258,7 @@
<!-- 头部区域 -->
<ul class="layui-nav layui-layout-right kdayun-header-right-tools" lay-filter="layadmin-layout-right">
<li class="layui-nav-item" lay-unselect>
<a layadmin-event="message" yh-href="${request.contextPath}/manager/coremodelshow/?modelCode=CORE_LCDBS" nopost="1" lay-text="消息中心">
<a layadmin-event="message" yh-href="${request.contextPath}/manager/coremodelshow/?modelId=C2AB0681B83246F78D467A0D05E5B821" resid="5A61E550409841298EC15DBF68B95D8B" nopost="1" lay-text="消息中心">
<i class="layui-icon layui-icon-notice"></i>
<!-- 如果有新消息,则显示小圆点 -->
<span class="layui-badge-dot"></span>

View File

@ -23,7 +23,7 @@
<!-- jdk版本 -->
<jdk.version>1.8</jdk.version>
<!-- 平台版本 -->
<base.version>5.0.227</base.version>
<base.version>5.0.228</base.version>
<!-- Spring 版本号 -->
<spring.version>5.1.2.RELEASE</spring.version>
@ -117,7 +117,7 @@
<!-- 工作流版本 -->
<batik.version>1.7</batik.version>
<workflow.version>10.0.4</workflow.version>
<workflow.version>10.0.5</workflow.version>
<xml-apis.version>1.3.04</xml-apis.version>
<org.imgscalr.version>4.2</org.imgscalr.version>
<org.apache.xmlgraphics.version>1.2</org.apache.xmlgraphics.version>