From 1bc9f92c8d458bc4d5fe3e98b69f7eade4e2a0a1 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 26 十一月 2018 10:32:14 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/js/whyc-jqueryui.js | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/js/whyc-jqueryui.js b/gx_tieta/WebRoot/js/whyc-jqueryui.js
index 4c655cf..c02f58d 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||{});
}
@@ -596,7 +601,7 @@
opts.event = "error";
opts.msg = '璇疯緭鍏ユ纭殑姝ｅ垯琛ㄨ揪寮忔牸寮忥紒锛侊紒'
}
-
+ //console.log(opts);
var testVal = new TestVal(this, opts);
this.data('testVal', testVal.opts);
--
Gitblit v1.9.1