From 84c394aad252f69b2d6936768ee002ba51c70f71 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Mon, 5 Jun 2017 10:00:04 +0800
Subject: [PATCH] 新增默认支持LIKE %...%中*表示任意字符的功能 修正调试模式下的version值 修复附件管理链接错误的BUG 修复普通搜索在多表格显示下错误渲染的BUG
---
application/common/behavior/Common.php | 2 +-
public/assets/js/backend/general/attachment.js | 2 +-
public/assets/js/bootstrap-table-commonsearch.js | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/application/common/behavior/Common.php b/application/common/behavior/Common.php
index 82fed28..a7600aa 100644
--- a/application/common/behavior/Common.php
+++ b/application/common/behavior/Common.php
@@ -26,7 +26,7 @@ class Common
Config::set('upload.cdnurl', $cdnurl);
}
// 如果是调试模式将version置为当前的时间戳可避免缓存
- if (!Config::get('app_debug'))
+ if (Config::get('app_debug'))
{
Config::set('site.version', time());
}
diff --git a/public/assets/js/backend/general/attachment.js b/public/assets/js/backend/general/attachment.js
index bf66670..fe88b75 100644
--- a/public/assets/js/backend/general/attachment.js
+++ b/public/assets/js/backend/general/attachment.js
@@ -119,7 +119,7 @@ define(['jquery', 'bootstrap', 'backend', 'form', 'table'], function ($, undefin
}
},
url: function (value, row, index) {
- return '<a href="' + Backend.api.cdnurl(value) + '" target="_blank" class="label bg-green">' + value + '</a>';
+ return '<a href="' + row.fullurl + '" target="_blank" class="label bg-green">' + value + '</a>';
},
}
}
diff --git a/public/assets/js/bootstrap-table-commonsearch.js b/public/assets/js/bootstrap-table-commonsearch.js
index 64beebb..26c78ac 100644
--- a/public/assets/js/bootstrap-table-commonsearch.js
+++ b/public/assets/js/bootstrap-table-commonsearch.js
@@ -18,7 +18,7 @@
var vModal = sprintf("<div id=\"commonSearchContent_%s\" class=\"common-search-table %s\">", that.options.idTable, that.options.searchFormVisible ? "" : "hidden");
vModal += vFormCommon.join('');
vModal += "</div>";
- $("#myTabContent").before($(vModal));
+ that.$container.prepend($(vModal));
var form = $("#commonSearchForm" + "_" + that.options.idTable);
@@ -181,7 +181,7 @@
var value = $("[name='" + name + "']:checked").val();
}
} else {
- var value = (typeof vObjCol.process === 'function') ? vObjCol.process(obj.val()) : obj.val();
+ var value = (typeof vObjCol.process === 'function') ? vObjCol.process(obj.val()) : (sym == 'LIKE %...%' ? obj.val().replace(/\*/g, '%') : obj.val());
}
if (value == '' && sym.indexOf("NULL") == -1) {
return true;
--
libgit2 0.24.0