From f26d1dcc7f161bff7cea7f7495ee1367e9f18d65 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.15>
Date: 星期四, 22 十一月 2018 09:53:50 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/js/whyc-jqueryui.js | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/js/whyc-jqueryui.js b/gx_tieta/WebRoot/js/whyc-jqueryui.js
index 4c655cf..040d77c 100644
--- a/gx_tieta/WebRoot/js/whyc-jqueryui.js
+++ b/gx_tieta/WebRoot/js/whyc-jqueryui.js
@@ -587,7 +587,12 @@
if(isString(options)) {
var oldOpts = this.data('testVal');
opts = $.extend({}, opts, oldOpts);
- opts[attr] = val;
+ if(attr == 'allOpts') {
+ opts = $.extend({}, opts, val);
+ }else {
+ opts[attr] = val;
+ }
+
}else if(isObject(options)){
opts = $.extend(true, {}, defaults, options||{});
}
--
Gitblit v1.9.1