ai.touchui-vue 1.38.0 → 1.40.0

package/lib/ai.touchui-vue.common.js

@@ -7053,8 +7053,8 @@ exports.push([module.i, "\n//.to-rangeProgress{ transition: width 0.01s ease;\n}
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _node_modules_style_loader_dist_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_date_picker_vue_vue_type_style_index_0_id_44459036_prod_lang_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(22);
-/* harmony import */ var _node_modules_style_loader_dist_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_date_picker_vue_vue_type_style_index_0_id_44459036_prod_lang_css__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_style_loader_dist_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_date_picker_vue_vue_type_style_index_0_id_44459036_prod_lang_css__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _node_modules_style_loader_dist_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_date_picker_vue_vue_type_style_index_0_id_051d024a_prod_lang_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(22);
+/* harmony import */ var _node_modules_style_loader_dist_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_date_picker_vue_vue_type_style_index_0_id_051d024a_prod_lang_css__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_style_loader_dist_index_js_node_modules_css_loader_dist_cjs_js_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_vue_loader_lib_index_js_vue_loader_options_date_picker_vue_vue_type_style_index_0_id_051d024a_prod_lang_css__WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 
@@ -12216,8 +12216,8 @@ src_export.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_export = (src_export);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/import/src/import.vue?vue&type=template&id=48e27998
-var importvue_type_template_id_48e27998_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/import/src/import.vue?vue&type=template&id=d002b4ae
+var importvue_type_template_id_d002b4ae_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -12257,16 +12257,24 @@ var importvue_type_template_id_48e27998_render = function () {
               ),
             ]
           )
-        : _c("to-icon", {
-            ref: "button",
-            attrs: { link: "", value: "import", mode: "none" },
-            on: {
-              click: function ($event) {
-                $event.stopPropagation()
-                return _vm.$refs.float.toggle("button")
+        : _c(
+            "to-icon",
+            _vm._b(
+              {
+                ref: "button",
+                attrs: { link: "", value: "import", mode: "none" },
+                on: {
+                  click: function ($event) {
+                    $event.stopPropagation()
+                    return _vm.$refs.float.toggle("button")
+                  },
+                },
               },
-            },
-          }),
+              "to-icon",
+              _vm.$attrs,
+              false
+            )
+          ),
       _c(
         "to-float",
         {
@@ -12418,11 +12426,11 @@ var importvue_type_template_id_48e27998_render = function () {
     1
   )
 }
-var importvue_type_template_id_48e27998_staticRenderFns = []
-importvue_type_template_id_48e27998_render._withStripped = true
+var importvue_type_template_id_d002b4ae_staticRenderFns = []
+importvue_type_template_id_d002b4ae_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/import/src/import.vue?vue&type=template&id=48e27998
+// CONCATENATED MODULE: ./packages/import/src/import.vue?vue&type=template&id=d002b4ae
 
 // EXTERNAL MODULE: external "ai.touchui-vue/lib/mixins/emitter"
 var emitter_ = __webpack_require__(91);
@@ -12733,8 +12741,8 @@ var types_ = __webpack_require__(7);
 
 var import_component = normalizeComponent(
   src_importvue_type_script_lang_js,
-  importvue_type_template_id_48e27998_render,
-  importvue_type_template_id_48e27998_staticRenderFns,
+  importvue_type_template_id_d002b4ae_render,
+  importvue_type_template_id_d002b4ae_staticRenderFns,
   false,
   null,
   null,
@@ -14240,8 +14248,8 @@ src_scroll.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_scroll = (src_scroll);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/progress/src/progress.vue?vue&type=template&id=50c0a9fa
-var progressvue_type_template_id_50c0a9fa_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/progress/src/progress.vue?vue&type=template&id=6ef9e39d
+var progressvue_type_template_id_6ef9e39d_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -14272,6 +14280,7 @@ var progressvue_type_template_id_50c0a9fa_render = function () {
                 }),
                 _c("circle", {
                   staticClass: "to-progressBar",
+                  class: _vm.animation ? "animation" : "",
                   attrs: {
                     r: _vm.radius,
                     cy: _vm.offsetWidth / 2,
@@ -14365,11 +14374,11 @@ var progressvue_type_template_id_50c0a9fa_render = function () {
     2
   )
 }
-var progressvue_type_template_id_50c0a9fa_staticRenderFns = []
-progressvue_type_template_id_50c0a9fa_render._withStripped = true
+var progressvue_type_template_id_6ef9e39d_staticRenderFns = []
+progressvue_type_template_id_6ef9e39d_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/progress/src/progress.vue?vue&type=template&id=50c0a9fa
+// CONCATENATED MODULE: ./packages/progress/src/progress.vue?vue&type=template&id=6ef9e39d
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/progress/src/progress.vue?vue&type=script&lang=js
 //
@@ -14410,6 +14419,7 @@ progressvue_type_template_id_50c0a9fa_render._withStripped = true
 //
 //
 //
+//
 
 /* harmony default export */ var progressvue_type_script_lang_js = ({
 	name: 'ToProgress',
@@ -14492,6 +14502,10 @@ progressvue_type_template_id_50c0a9fa_render._withStripped = true
 		barSize: {
 			type: [Number, String],
 			default: 1
+		},
+		animation: {
+			type: Boolean,
+			default: true
 		}
 	},
 	data: function data() {
@@ -14697,8 +14711,8 @@ progressvue_type_template_id_50c0a9fa_render._withStripped = true
 
 var progress_component = normalizeComponent(
   src_progressvue_type_script_lang_js,
-  progressvue_type_template_id_50c0a9fa_render,
-  progressvue_type_template_id_50c0a9fa_staticRenderFns,
+  progressvue_type_template_id_6ef9e39d_render,
+  progressvue_type_template_id_6ef9e39d_staticRenderFns,
   false,
   null,
   null,
@@ -14716,8 +14730,8 @@ progress.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_progress = (progress);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/select/src/select.vue?vue&type=template&id=69709cdc
-var selectvue_type_template_id_69709cdc_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/select/src/select.vue?vue&type=template&id=b54eb61c
+var selectvue_type_template_id_b54eb61c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -14799,6 +14813,7 @@ var selectvue_type_template_id_69709cdc_render = function () {
       _c(
         "span",
         {
+          ref: "selectContentRef",
           staticClass: "to-selectContent",
           class: _vm.setContentClass,
           on: { click: _vm.click },
@@ -14983,7 +14998,7 @@ var selectvue_type_template_id_69709cdc_render = function () {
                           ),
                     ]
                   : [
-                      _vm.selected.filter(function (item) {
+                      _vm.conTags.filter(function (item) {
                         return !item.hide
                       }).length === 0 &&
                       !_vm.inputable &&
@@ -15014,16 +15029,20 @@ var selectvue_type_template_id_69709cdc_render = function () {
                         "span",
                         { staticClass: "to-selectTag" },
                         [
-                          _vm.selected.length > 0 &&
-                          !(_vm.isAll && _vm.useAllText)
+                          (_vm.conTags.length > 0 &&
+                            !(_vm.isAll && _vm.useAllText)) ||
+                          (_vm.showCount && _vm.count > 0)
                             ? [
-                                _vm._l(_vm.selected, function (item, index) {
+                                _vm._l(_vm.conTags, function (item, index) {
                                   return [
                                     !item.hide
                                       ? _c(
                                           "to-tag",
                                           {
                                             key: index,
+                                            class: {
+                                              "show-count": _vm.isNeedMin,
+                                            },
                                             attrs: {
                                               color: "fg",
                                               mode: "plain",
@@ -15040,10 +15059,20 @@ var selectvue_type_template_id_69709cdc_render = function () {
                                       : _vm._e(),
                                   ]
                                 }),
+                                _vm.showCount && _vm.count > 0
+                                  ? _c(
+                                      "to-tag",
+                                      {
+                                        staticClass: "tag-count",
+                                        attrs: { color: "fg", mode: "plain" },
+                                      },
+                                      [_vm._v("+" + _vm._s(_vm.count))]
+                                    )
+                                  : _vm._e(),
                               ]
                             : _vm._e(),
                           !_vm.$phone ||
-                          (_vm.$phone && _vm.selected.length === 0)
+                          (_vm.$phone && _vm.conTags.length === 0)
                             ? [
                                 _vm.inputable && !_vm.filterable
                                   ? _c("to-input", {
@@ -15054,7 +15083,7 @@ var selectvue_type_template_id_69709cdc_render = function () {
                                         "prevent-focus": "",
                                         mode: "none",
                                         placeholder:
-                                          _vm.selected.filter(function (item) {
+                                          _vm.conTags.filter(function (item) {
                                             return !item.hide
                                           }).length > 0
                                             ? ""
@@ -15084,7 +15113,7 @@ var selectvue_type_template_id_69709cdc_render = function () {
                                         "prevent-focus": "",
                                         mode: "none",
                                         placeholder:
-                                          _vm.selected.filter(function (item) {
+                                          _vm.conTags.filter(function (item) {
                                             return !item.hide
                                           }).length > 0
                                             ? ""
@@ -15113,7 +15142,7 @@ var selectvue_type_template_id_69709cdc_render = function () {
                                         "prevent-focus": "",
                                         mode: "none",
                                         placeholder:
-                                          _vm.selected.filter(function (item) {
+                                          _vm.conTags.filter(function (item) {
                                             return !item.hide
                                           }).length > 0
                                             ? ""
@@ -15224,6 +15253,7 @@ var selectvue_type_template_id_69709cdc_render = function () {
                 slide: _vm.layerSlide,
                 width: _vm.iOptionWidth,
                 position: _vm.layerPosition,
+                "max-height": _vm.maxHeight,
               },
               on: { closed: _vm.layerClose, mousedown: _vm.layerMousedown },
             },
@@ -16366,11 +16396,11 @@ var selectvue_type_template_id_69709cdc_render = function () {
     1
   )
 }
-var selectvue_type_template_id_69709cdc_staticRenderFns = []
-selectvue_type_template_id_69709cdc_render._withStripped = true
+var selectvue_type_template_id_b54eb61c_staticRenderFns = []
+selectvue_type_template_id_b54eb61c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/select/src/select.vue?vue&type=template&id=69709cdc
+// CONCATENATED MODULE: ./packages/select/src/select.vue?vue&type=template&id=b54eb61c
 
 // EXTERNAL MODULE: external "ai.touchui-vue/lib/utils/ajax"
 var ajax_ = __webpack_require__(16);
@@ -16638,6 +16668,7 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 //
 //
 //
+//
 
 
 
@@ -16903,6 +16934,14 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 		valueType: {
 			type: String,
 			default: ''
+		},
+		showCount: {
+			type: Boolean,
+			default: false
+		},
+		maxHeight: {
+			type: [Number, String],
+			default: ''
 		}
 	},
 	data: function data() {
@@ -16929,7 +16968,10 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 			layerPosition: 'auto',
 			disabled: this.readonly,
 			iApiHeaders: {},
-			inputing: false
+			inputing: false,
+			count: 0,
+			conTags: [],
+			isNeedMin: false
 		};
 	},
 
@@ -17082,6 +17124,9 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 			} else {
 				arr.push('to-box-mode-toast');
 			}
+			// if (this.showCount) {
+			// 	arr.push('to-select-showCount')
+			// }
 			return arr;
 		},
 		validateRequired: function validateRequired() {
@@ -17097,11 +17142,7 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 			if (this.desc) {
 				return this.desc;
 			} else if (this.ToFormItem && this.ToFormItem.label) {
-				if (typeof this.rule === 'string') {
-					return this.ToFormItem.label + '-label';
-				} else {
-					return this.ToFormItem.label;
-				}
+				return this.ToFormItem.label;
 			} else {
 				return '';
 			}
@@ -17143,8 +17184,10 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 			handler: function handler(val) {
 				if (val) {
 					this.selected = [];
+					this.conTags = [];
 				} else {
 					this.selected = {};
+					this.conTags = {};
 				}
 			},
 
@@ -17202,7 +17245,9 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 				} else {
 					this.$emit('change', val, this.selected);
 				}
-
+				if (this.showCount && this.multiple) {
+					this.getAllTag();
+				}
 				var detail = {
 					name: 'ToSelect',
 					value: val,
@@ -17257,6 +17302,13 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 		}
 	},
 	created: function created() {
+		var _this7 = this;
+
+		this.$nextTick(function () {
+			if (_this7.showCount && _this7.multiple) {
+				_this7.getAllTag();
+			}
+		});
 		this.iLabelText = this.labelText;
 		this.iValueText = this.valueText;
 		this.iResPath = this.resPath;
@@ -17282,6 +17334,79 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 	},
 
 	methods: {
+		calculateTagLayout: function calculateTagLayout() {
+			var _this8 = this;
+
+			var isRecalculate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+
+			this.$nextTick(function () {
+				var tags = _this8.$el.querySelectorAll('.to-selectTag .to-tag');
+				var selectContent = _this8.$refs.selectContentRef;
+				var gap = selectContent.scrollWidth - selectContent.clientWidth;
+				if (gap > 0) {
+					_this8.isNeedMin = true;
+					return false;
+				}
+				_this8.isNeedMin = false;
+				var firstTagTop = 0;
+				if (tags.length > 1) {
+					for (var i = 0; i < tags.length; i++) {
+						if (i === 0) {
+							firstTagTop = tags[i].offsetTop;
+						} else {
+							if (tags[i].offsetTop !== firstTagTop) {
+								if (!tags[i].className.includes('tag-count')) {
+									var _ret = function () {
+										var index = isRecalculate && _this8.count > 0 ? i - 1 : i;
+										_this8.conTags = _this8.selected.filter(function (item, idx) {
+											return idx < index;
+										});
+										var arrs = _this8.selected.filter(function (item, idx) {
+											return idx >= index;
+										});
+										_this8.count = arrs.length;
+										if (!isRecalculate) {
+											_this8.layoutCount();
+										}
+										return 'break';
+									}();
+
+									if (_ret === 'break') break;
+								} else {
+									if (i >= 2) {
+										var _ret2 = function () {
+											var index = isRecalculate && _this8.count > 0 ? i - 1 : i;
+											_this8.conTags = _this8.selected.filter(function (item, idx) {
+												return idx < index;
+											});
+											var arrs = _this8.selected.filter(function (item, idx) {
+												return idx >= index;
+											});
+											_this8.count = arrs.length;
+											if (!isRecalculate) {
+												_this8.layoutCount();
+											}
+											return 'break';
+										}();
+
+										if (_ret2 === 'break') break;
+									} else {
+										_this8.isNeedMin = true;
+									}
+								}
+							}
+						}
+					}
+				}
+			});
+		},
+		getAllTag: function getAllTag() {
+			this.count = 0;
+			this.calculateTagLayout(false);
+		},
+		layoutCount: function layoutCount() {
+			this.calculateTagLayout(true);
+		},
 		valueChange: function valueChange(val) {
 			if (!this.multiple) {
 				if (this.inputable) {
@@ -17302,19 +17427,19 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 			}
 		},
 		setSeleted: function setSeleted(val) {
-			var _this7 = this;
+			var _this9 = this;
 
 			var selected = JSON.parse(JSON.stringify(this.selected));
 			if (!this.multiple) {
 				if (this.options.findIndex(function (option) {
-					return option[_this7.iValueText] === val;
+					return option[_this9.iValueText] === val;
 				}) === -1) {
 					var _selected;
 
 					selected = (_selected = {}, _selected[this.iLabelText] = val, _selected[this.iValueText] = val, _selected);
 				} else {
 					selected = this.options.find(function (option) {
-						return option[_this7.iValueText] === val;
+						return option[_this9.iValueText] === val;
 					});
 				}
 			} else {
@@ -17325,15 +17450,15 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 					var selectedArr = [];
 					arr.map(function (item) {
 						if (item && item.trim()) {
-							if (_this7.options.findIndex(function (option) {
-								return String(option[_this7.iValueText]) === String(item);
+							if (_this9.options.findIndex(function (option) {
+								return String(option[_this9.iValueText]) === String(item);
 							}) === -1) {
 								var _selectedArr$push;
 
-								selectedArr.push((_selectedArr$push = {}, _selectedArr$push[_this7.iLabelText] = item, _selectedArr$push[_this7.iValueText] = item, _selectedArr$push.hide = !_this7.inputable, _selectedArr$push));
+								selectedArr.push((_selectedArr$push = {}, _selectedArr$push[_this9.iLabelText] = item, _selectedArr$push[_this9.iValueText] = item, _selectedArr$push.hide = !_this9.inputable, _selectedArr$push));
 							} else {
-								_this7.options.map(function (option) {
-									if (String(option[_this7.iValueText]) === String(item)) {
+								_this9.options.map(function (option) {
+									if (String(option[_this9.iValueText]) === String(item)) {
 										selectedArr.push(option);
 									}
 								});
@@ -17347,19 +17472,22 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 				var fn = this.beforeChange(selected);
 				if (fn && fn.then) {
 					fn.then(function (flag) {
-						_this7.selected = selected;
+						_this9.selected = selected;
+						_this9.conTags = selected;
 					}).catch(function (e) {});
 				} else {
 					if (fn) {
 						this.selected = selected;
+						this.conTags = selected;
 					}
 				}
 			} else {
 				this.selected = selected;
+				this.conTags = selected;
 			}
 		},
 		enter: function enter() {
-			var _this8 = this;
+			var _this10 = this;
 
 			if (!(this.multiple && this.inputable)) {
 				this.toggleLayer();
@@ -17369,9 +17497,9 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 				// 判断重复项
 				var value = this.filterable ? this.multipleFilterValue : this.multipleInputValue;
 				if (this.selected.find(function (item) {
-					return item[_this8.iLabelText] === value;
+					return item[_this10.iLabelText] === value;
 				}) || this.selected.find(function (item) {
-					return item[_this8.iValueText] === value;
+					return item[_this10.iValueText] === value;
 				})) {
 					this.$tip.error(this.t('to.select.tip.error.repetition'));
 					return;
@@ -17385,7 +17513,7 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 					var fn = this.beforeChange(newOption);
 					if (fn && fn.then) {
 						fn.then(function (flag) {
-							_this8.selected.push(newOption);
+							_this10.selected.push(newOption);
 						}).catch(function (e) {});
 					} else {
 						if (fn) {
@@ -17403,11 +17531,11 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 				if (this.$phone) {
 					if (this.filterable) {
 						setTimeout(function () {
-							_this8.$refs.popupFilter.focus();
+							_this10.$refs.popupFilter.focus();
 						}, 500);
 					} else {
 						setTimeout(function () {
-							_this8.$refs.popupInput.focus();
+							_this10.$refs.popupInput.focus();
 						}, 500);
 					}
 				}
@@ -17433,17 +17561,17 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 			}
 		},
 		getLabel: function getLabel(val) {
-			var _this9 = this;
+			var _this11 = this;
 
 			var obj = this.options.find(function (item) {
-				return item[_this9.iValueText] === val;
+				return item[_this11.iValueText] === val;
 			});
 			if (obj && obj[this.iLabelText]) {
 				return obj[this.iLabelText];
 			}
 		},
 		setOptions: function setOptions() {
-			var _this10 = this;
+			var _this12 = this;
 
 			// 同步选项
 			if (this.data) {
@@ -17476,7 +17604,7 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 					// 如果设置了方法，则替换为方法
 					if (typeof this.setLabelFn === 'function') {
 						this.options.forEach(function (item) {
-							item.label = _this10.setLabelFn(item);
+							item.label = _this12.setLabelFn(item);
 						});
 					}
 				}
@@ -17551,37 +17679,37 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 							// 直接返回一个 select 所需要的 data 对象时，不需要任何解析
 							// 如：[{name:'张三', id:0},{name:'李四', id:1}]
 							if (Array.isArray(res)) {
-								_this10.options = res;
-								sessionStorage.setItem('static.' + _this10.api, JSON.stringify(res));
+								_this12.options = res;
+								sessionStorage.setItem('static.' + _this12.api, JSON.stringify(res));
 
 								// 设置 selected
-								_this10.setSeleted(_this10.value);
-								_this10.setPlaceholder();
-								_this10.$emit('option-loaded', _this10.options);
-							} else if (res.code === _this10.iSuccessCode) {
+								_this12.setSeleted(_this12.value);
+								_this12.setPlaceholder();
+								_this12.$emit('option-loaded', _this12.options);
+							} else if (res.code === _this12.iSuccessCode) {
 								// 按照 json 格式返回，需要根据配置路径进行解析
 								// 如：{ code:'0', data:[{name:'张三', id:0},{name:'李四', id:1}]}
 								var data = [];
-								if (_this10.iResPath) {
-									var resPath = _this10.iResPath.split('/');
+								if (_this12.iResPath) {
+									var resPath = _this12.iResPath.split('/');
 									resPath.forEach(function (el) {
 										data = res[el];
 									});
 								}
-								_this10.options = data;
-								sessionStorage.setItem('static.' + _this10.api, JSON.stringify(data));
+								_this12.options = data;
+								sessionStorage.setItem('static.' + _this12.api, JSON.stringify(data));
 
 								// 设置 selected
-								_this10.setSeleted(_this10.value);
-								_this10.setPlaceholder();
-								_this10.$emit('option-loaded', _this10.options);
+								_this12.setSeleted(_this12.value);
+								_this12.setPlaceholder();
+								_this12.$emit('option-loaded', _this12.options);
 							} else {
-								_this10.options = [];
-								_this10.t('to.select.tip.error.res', 'select api(' + _this10.api + ')');
+								_this12.options = [];
+								_this12.t('to.select.tip.error.res', 'select api(' + _this12.api + ')');
 							}
 						},
 						onError: function onError(res) {
-							_this10.$tip.danger(_this10.t('to.select.tip.error.api', 'select api(' + _this10.api + ') '));
+							_this12.$tip.danger(_this12.t('to.select.tip.error.api', 'select api(' + _this12.api + ') '));
 						}
 					};
 					var req = this.httpRequest(options);
@@ -17610,23 +17738,23 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 			}
 		},
 		selectAll: function selectAll() {
-			var _this11 = this;
+			var _this13 = this;
 
 			var arr = [];
 			this.options.map(function (item) {
 				if (!item.disabled) {
-					arr.push(item[_this11.iValueText]);
+					arr.push(item[_this13.iValueText]);
 				}
 			});
 			this.iValue = arr.toString();
 		},
 		Deselect: function Deselect() {
-			var _this12 = this;
+			var _this14 = this;
 
 			var arr = [];
 			this.options.map(function (item) {
-				if (!item.disabled && !_this12.iValue.split(',').includes(item[_this12.iValueText])) {
-					arr.push(item[_this12.iValueText]);
+				if (!item.disabled && !_this14.iValue.split(',').includes(item[_this14.iValueText])) {
+					arr.push(item[_this14.iValueText]);
 				}
 			});
 			this.iValue = arr.toString();
@@ -17635,7 +17763,7 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 			this.setValue('');
 		},
 		itemChange: function itemChange(item) {
-			var _this13 = this;
+			var _this15 = this;
 
 			if (item.disabled) {
 				return;
@@ -17643,38 +17771,38 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 			this.setSeleted(item[this.iValueText]);
 			// this.selected = item
 			this.$nextTick(function () {
-				_this13.$emit('selected', item);
-				_this13.closeLayer();
+				_this15.$emit('selected', item);
+				_this15.closeLayer();
 			});
 		},
 		adjustLayer: function adjustLayer() {
-			var _this14 = this;
+			var _this16 = this;
 
 			if (this.optionDisplay !== 'none' && this.$refs.layer.show) {
-				this.$nextTick(function () {
-					_this14.$refs.layer.set(_this14.$refs.link);
-				});
+				setTimeout(function () {
+					_this16.$refs.layer.set(_this16.$refs.link);
+				}, 10);
 			}
 		},
 		openLayer: function openLayer() {
-			var _this15 = this;
+			var _this17 = this;
 
 			if (!this.disabled && this.optionDisplay !== 'none') {
 				this.$refs.layer.open('link');
 				if (this.filterable && this.$phone) {
 					setTimeout(function () {
-						if (_this15.$refs.popupFilter) {
-							_this15.$refs.popupFilter.focus();
+						if (_this17.$refs.popupFilter) {
+							_this17.$refs.popupFilter.focus();
 						}
-						_this15.$nextTick(function () {
-							_this15.options = _this15.s_options.concat(_this15.anotherOptions);
+						_this17.$nextTick(function () {
+							_this17.options = _this17.s_options.concat(_this17.anotherOptions);
 						});
 					}, 500);
 				}
 				if (this.inputable && this.$phone) {
 					setTimeout(function () {
-						if (_this15.$refs.popupInput) {
-							_this15.$refs.popupInput.focus();
+						if (_this17.$refs.popupInput) {
+							_this17.$refs.popupInput.focus();
 						}
 					}, 500);
 				}
@@ -17731,12 +17859,12 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 			}
 		},
 		layerMousedown: function layerMousedown() {
-			var _this16 = this;
+			var _this18 = this;
 
 			this.blurByLayer = true;
 			var timer = null;
 			timer = setTimeout(function () {
-				_this16.blurByLayer = false;
+				_this18.blurByLayer = false;
 				clearTimeout(timer);
 				timer = null;
 			}, 200);
@@ -17764,16 +17892,16 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 			}
 		},
 		inputInput: function inputInput(e) {
-			var _this17 = this;
+			var _this19 = this;
 
 			if (e && e.keyCode === 13) {
 				this.$emit('inputEnter');
 			}
 			this.$nextTick(function () {
-				if (_this17.value === '') {
-					_this17.openLayer();
+				if (_this19.value === '') {
+					_this19.openLayer();
 				} else {
-					_this17.closeLayer();
+					_this19.closeLayer();
 				}
 			});
 		},
@@ -17788,15 +17916,15 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 			this.openLayer();
 		},
 		filterInput: function filterInput(e) {
-			var _this18 = this;
+			var _this20 = this;
 
 			if (e && e.keyCode === 13) {
 				this.$emit('inputEnter');
 			}
 			this.$nextTick(function () {
-				_this18.inputing = true;
-				_this18.adjustLayer();
-				_this18.openLayer();
+				_this20.inputing = true;
+				_this20.adjustLayer();
+				_this20.openLayer();
 			});
 		},
 		filterClear: function filterClear() {
@@ -17815,10 +17943,10 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 			}
 		},
 		multipleItemChange: function multipleItemChange(value, item) {
-			var _this19 = this;
+			var _this21 = this;
 
 			var val = this.selected.map(function (option) {
-				return option[_this19.iValueText];
+				return option[_this21.iValueText];
 			});
 			if (value) {
 				val.push(item[this.iValueText]);
@@ -17830,11 +17958,11 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 			if (this.inputable && !this.filterable) {
 				if (this.$phone) {
 					setTimeout(function () {
-						_this19.$refs.popupInput.focus();
+						_this21.$refs.popupInput.focus();
 					}, 500);
 				} else {
 					setTimeout(function () {
-						_this19.$refs.input.focus();
+						_this21.$refs.input.focus();
 					}, 500);
 				}
 				this.multipleInputValue = '';
@@ -17842,27 +17970,27 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 			if (this.filterable) {
 				if (this.$phone) {
 					setTimeout(function () {
-						_this19.$refs.popupFilter.focus();
+						_this21.$refs.popupFilter.focus();
 					}, 500);
 				} else {
 					setTimeout(function () {
-						_this19.$refs.filter.focus();
+						_this21.$refs.filter.focus();
 					}, 500);
 				}
 				this.multipleFilterValue = '';
 			}
 			if (this.setDataFn) {
 				setTimeout(function () {
-					_this19.$refs.filter.focus();
+					_this21.$refs.filter.focus();
 				}, 500);
 				this.setDataInputValue = '';
 			}
 		},
 		removeTag: function removeTag(item) {
-			var _this20 = this;
+			var _this22 = this;
 
 			var val = this.selected.map(function (option) {
-				return option[_this20.iValueText];
+				return option[_this22.iValueText];
 			});
 			this.removeItem(val, item[this.iValueText]);
 			this.setSeleted(val.join(','));
@@ -17871,24 +17999,24 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 					if (this.filterable) {
 						if (this.$refs.popupFilter) {
 							setTimeout(function () {
-								_this20.$refs.popupFilter.focus();
+								_this22.$refs.popupFilter.focus();
 							}, 500);
 						}
 					} else {
 						if (this.$refs.popupInput) {
 							setTimeout(function () {
-								_this20.$refs.popupInput.focus();
+								_this22.$refs.popupInput.focus();
 							}, 500);
 						}
 					}
 				} else {
 					if (this.filterable) {
 						setTimeout(function () {
-							_this20.$refs.filter.focus();
+							_this22.$refs.filter.focus();
 						}, 500);
 					} else {
 						setTimeout(function () {
-							_this20.$refs.input.focus();
+							_this22.$refs.input.focus();
 						}, 500);
 					}
 				}
@@ -17907,7 +18035,7 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 			}
 		},
 		removeItem: function removeItem(obj, val) {
-			var _this21 = this;
+			var _this23 = this;
 
 			var index = void 0;
 
@@ -17931,7 +18059,7 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 				// 对象数组
 				else {
 						index = obj.findIndex(function (item) {
-							return item[_this21.iValueText] === val;
+							return item[_this23.iValueText] === val;
 						});
 						obj.splice(index, 1);
 					}
@@ -17968,8 +18096,8 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 
 var select_component = normalizeComponent(
   src_selectvue_type_script_lang_js,
-  selectvue_type_template_id_69709cdc_render,
-  selectvue_type_template_id_69709cdc_staticRenderFns,
+  selectvue_type_template_id_b54eb61c_render,
+  selectvue_type_template_id_b54eb61c_staticRenderFns,
   false,
   null,
   null,
@@ -22465,8 +22593,8 @@ src_transfer.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_transfer = (src_transfer);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/float/src/main.vue?vue&type=template&id=545b1e70
-var mainvue_type_template_id_545b1e70_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/float/src/main.vue?vue&type=template&id=4bac6de2
+var mainvue_type_template_id_4bac6de2_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -22503,11 +22631,11 @@ var mainvue_type_template_id_545b1e70_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_545b1e70_staticRenderFns = []
-mainvue_type_template_id_545b1e70_render._withStripped = true
+var mainvue_type_template_id_4bac6de2_staticRenderFns = []
+mainvue_type_template_id_4bac6de2_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/float/src/main.vue?vue&type=template&id=545b1e70
+// CONCATENATED MODULE: ./packages/float/src/main.vue?vue&type=template&id=4bac6de2
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/float/src/main.vue?vue&type=script&lang=js
 //
@@ -22600,6 +22728,10 @@ mainvue_type_template_id_545b1e70_render._withStripped = true
 		dy: {
 			type: [String, Number],
 			default: 0
+		},
+		maxHeight: {
+			type: [Number, String],
+			default: ''
 		}
 	},
 	data: function data() {
@@ -22781,7 +22913,7 @@ mainvue_type_template_id_545b1e70_render._withStripped = true
 					clearTimeout(timer);
 				}, 0);
 			} else if (this.link) {
-				this.$refs.content.style.height = '';
+				// this.$refs.content.style.height = '100em'
 				this.$nextTick(function () {
 					// 宽度设置
 					if (!_this.width) {
@@ -22942,9 +23074,35 @@ mainvue_type_template_id_545b1e70_render._withStripped = true
 						}
 
 						// 设置内容高度
+						var flag = true;
+						if (_this.maxHeight) {
+							var heig = _this.maxHeight * _this.$TouchUI.em();
+							if (useSpace > heig) {
+								flag = false;
+								_this.$refs.content.style.height = heig + 'px';
+							}
+						}
+						if (!flag) {
+							return false;
+						}
 						if (useSpace < contentHeight) {
 							_this.isOver = true;
 							_this.$refs.content.style.height = useSpace + 'px';
+						} else {
+							if (_this.$refs.content.children[0] && _this.$refs.content.children[0].className.includes('to-scroll')) {
+								var count = 0;
+								var arr = _this.$refs.content.children[0].children[0].children;
+								for (var i = 0; i < arr.length; i++) {
+									count += arr[i].offsetHeight;
+								}
+								if (useSpace > count) {
+									_this.isOver = false;
+									_this.$refs.content.style.height = count + 2 + 'px';
+								} else {
+									_this.isOver = true;
+									_this.$refs.content.style.height = useSpace + 'px';
+								}
+							}
 						}
 					}
 				});
@@ -22979,9 +23137,9 @@ mainvue_type_template_id_545b1e70_render._withStripped = true
 			var _this3 = this;
 
 			// 重置 content 高度，这样下次打开的时候才好重新计算是否超过整体高度
-			if (!this.height) {
-				this.$refs.content.style.height = '';
-			}
+			// if (!this.height) {
+			// 	this.$refs.content.style.height = ''
+			// }
 			this.isOver = false;
 
 			// 关闭 float 后，移除事件监听
@@ -22994,9 +23152,9 @@ mainvue_type_template_id_545b1e70_render._withStripped = true
 			this.$emit('beforeClose');
 			this.show = false;
 			this.opened = false;
-			if (this.$refs.content && this.$refs.content.style.height !== 'auto' && (this.iposition === 'top' || this.iposition === 'bottom') && !this.height) {
-				this.$refs.content.style.height = 'auto';
-			}
+			// if (this.$refs.content && this.$refs.content.style.height !== 'auto' && (this.iposition === 'top' || this.iposition === 'bottom') && !this.height) {
+			// 	this.$refs.content.style.height = 'auto'
+			// }
 			this.$emit('closed');
 			setTimeout(function () {
 				if (_this3.lazy) {
@@ -23207,8 +23365,8 @@ mainvue_type_template_id_545b1e70_render._withStripped = true
 
 var main_component = normalizeComponent(
   src_mainvue_type_script_lang_js,
-  mainvue_type_template_id_545b1e70_render,
-  mainvue_type_template_id_545b1e70_staticRenderFns,
+  mainvue_type_template_id_4bac6de2_render,
+  mainvue_type_template_id_4bac6de2_staticRenderFns,
   false,
   null,
   null,
@@ -26359,8 +26517,8 @@ disDirective.install = function (Vue) {
 
 	dis: dis_src_directive
 });
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/input/src/input.vue?vue&type=template&id=d10b5358
-var inputvue_type_template_id_d10b5358_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/input/src/input.vue?vue&type=template&id=57e4aab5
+var inputvue_type_template_id_57e4aab5_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -26762,11 +26920,11 @@ var inputvue_type_template_id_d10b5358_render = function () {
     ]
   )
 }
-var inputvue_type_template_id_d10b5358_staticRenderFns = []
-inputvue_type_template_id_d10b5358_render._withStripped = true
+var inputvue_type_template_id_57e4aab5_staticRenderFns = []
+inputvue_type_template_id_57e4aab5_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/input/src/input.vue?vue&type=template&id=d10b5358
+// CONCATENATED MODULE: ./packages/input/src/input.vue?vue&type=template&id=57e4aab5
 
 // CONCATENATED MODULE: ./src/utils/string.js
 function filter(chars, from) {
@@ -27176,11 +27334,7 @@ function filter(chars, from) {
 			if (this.desc) {
 				return this.desc;
 			} else if (this.ToFormItem && this.ToFormItem.label) {
-				if (typeof this.rule === 'string') {
-					return this.ToFormItem.label + '-label';
-				} else {
-					return this.ToFormItem.label;
-				}
+				return this.ToFormItem.label;
 			} else {
 				return '';
 			}
@@ -27251,6 +27405,7 @@ function filter(chars, from) {
 		}
 	},
 	mounted: function mounted() {
+		// console.log('input mounted')
 		if (this.$platform === 'pc') {
 			this.$el.addEventListener('mouseover', this.showClear);
 			this.$el.addEventListener('mouseout', this.hideClear);
@@ -27371,7 +27526,7 @@ function filter(chars, from) {
 
 				// 最小值判断
 				if (Number(this.data, 0) < Number(this.min)) {
-					this.data = 'NaN';
+					this.data = Number(this.min) + '';
 				}
 
 				if (Number(this.conversionType) && this.data) {
@@ -27518,8 +27673,8 @@ function filter(chars, from) {
 
 var input_component = normalizeComponent(
   src_inputvue_type_script_lang_js,
-  inputvue_type_template_id_d10b5358_render,
-  inputvue_type_template_id_d10b5358_staticRenderFns,
+  inputvue_type_template_id_57e4aab5_render,
+  inputvue_type_template_id_57e4aab5_staticRenderFns,
   false,
   null,
   null,
@@ -28382,8 +28537,8 @@ icon.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_icon = (icon);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date-picker/src/date-picker.vue?vue&type=template&id=44459036
-var date_pickervue_type_template_id_44459036_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date-picker/src/date-picker.vue?vue&type=template&id=051d024a
+var date_pickervue_type_template_id_051d024a_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -28532,11 +28687,11 @@ var date_pickervue_type_template_id_44459036_render = function () {
     1
   )
 }
-var date_pickervue_type_template_id_44459036_staticRenderFns = []
-date_pickervue_type_template_id_44459036_render._withStripped = true
+var date_pickervue_type_template_id_051d024a_staticRenderFns = []
+date_pickervue_type_template_id_051d024a_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/date-picker/src/date-picker.vue?vue&type=template&id=44459036
+// CONCATENATED MODULE: ./packages/date-picker/src/date-picker.vue?vue&type=template&id=051d024a
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/date-picker/src/picker.vue?vue&type=template&id=4176400e
 var pickervue_type_template_id_4176400e_render = function () {
@@ -29333,6 +29488,13 @@ var date_ = __webpack_require__(94);
 
 			immediate: true
 		},
+		iValue: {
+			handler: function handler(val) {
+				this.$emit('change', val);
+			},
+
+			immediate: true
+		},
 		displayFormat: {
 			handler: function handler(fmt) {
 				this.displayFormatRegExp = new RegExp('^' + String(fmt).replace(/\-|\//g, '\\-').replace(/[a-zA-Z]/g, '\\d') + '$');
@@ -29348,7 +29510,7 @@ var date_ = __webpack_require__(94);
 		}
 		if (this.value) {
 			this.iValue = this.value;
-			this.$emit('change', this.value);
+			// this.$emit('change', this.value)
 		}
 	},
 	mounted: function mounted() {
@@ -29362,13 +29524,13 @@ var date_ = __webpack_require__(94);
 		},
 		handleDisplayChange: function handleDisplayChange(value) {
 			this.datedisplay = value;
-			this.$emit('change', this.datedisplay);
+			// this.$emit('change', this.datedisplay)
 		},
 		handleDisplayBlur: function handleDisplayBlur() {
 			var _this = this;
 
 			setTimeout(function () {
-				if (isNaN(new Date(_this.datedisplay))) {
+				if (isNaN(new Date(_this.datedisplay)) || _this.datedisplay.length < 8) {
 					if (_this.datedisplay) {
 						_this.$emit('errTime');
 					}
@@ -29379,7 +29541,7 @@ var date_ = __webpack_require__(94);
 					if (!_this.displayFormatRegExp.test(_this.datedisplay)) {
 						_this.datedisplay = _this.formatDate(new Date(_this.datedisplay), _this.displayFormat, _this.datedisplay);
 						_this.iValue = _this.formatDate(new Date(_this.datedisplay), _this.displayFormat, _this.datedisplay);
-						_this.$emit('change', _this.iValue);
+						// this.$emit('change', this.iValue)
 					} else {
 						_this.changeValue(_this.getDateFromValue(_this.datedisplay, _this.displayFormat), _this.datedisplay);
 					}
@@ -29407,7 +29569,7 @@ var date_ = __webpack_require__(94);
 					this.datedisplay = value.split(' ').length > 1 ? value.split(' ')[1] : value;
 					this.iValue = value.split(' ').length > 1 ? value.split(' ')[1] : value;
 				}
-				this.$emit('change', this.iValue);
+				// this.$emit('change', this.iValue)
 			} else {
 				var _flag = isNaN(new Date(value).getTime()); // 判断是否可以使用 2022-05 如果不可用，则替换为 2022/05
 				if (_flag) {
@@ -29415,15 +29577,15 @@ var date_ = __webpack_require__(94);
 				}
 				this.datedisplay = this.formatDate(new Date(value), this.displayFormat, oldVal);
 				this.iValue = this.formatDate(new Date(value), this.valueFormat, oldVal);
-				this.$emit('change', this.iValue);
+				// this.$emit('change', this.iValue)
 			}
 		},
 		clear: function clear() {
-			var oldVal = this.iValue; // 失去焦点时原本就是空的情况不应该 change
+			// const oldVal = this.iValue // 失去焦点时原本就是空的情况不应该 change
 			this.iValue = '';
-			if (oldVal) {
-				this.$emit('change', this.iValue);
-			}
+			// if (oldVal) {
+			// 	this.$emit('change', this.iValue)
+			// }
 			if (!this.$pc) {
 				this.$refs.layer.close();
 			}
@@ -29558,8 +29720,8 @@ var date_ = __webpack_require__(94);
 });
 // CONCATENATED MODULE: ./packages/date-picker/src/date-picker.vue?vue&type=script&lang=js
  /* harmony default export */ var src_date_pickervue_type_script_lang_js = (date_pickervue_type_script_lang_js); 
-// EXTERNAL MODULE: ./packages/date-picker/src/date-picker.vue?vue&type=style&index=0&id=44459036&prod&lang=css
-var date_pickervue_type_style_index_0_id_44459036_prod_lang_css = __webpack_require__(103);
+// EXTERNAL MODULE: ./packages/date-picker/src/date-picker.vue?vue&type=style&index=0&id=051d024a&prod&lang=css
+var date_pickervue_type_style_index_0_id_051d024a_prod_lang_css = __webpack_require__(103);
 
 // CONCATENATED MODULE: ./packages/date-picker/src/date-picker.vue
 
@@ -29572,8 +29734,8 @@ var date_pickervue_type_style_index_0_id_44459036_prod_lang_css = __webpack_requ
 
 var date_picker_component = normalizeComponent(
   src_date_pickervue_type_script_lang_js,
-  date_pickervue_type_template_id_44459036_render,
-  date_pickervue_type_template_id_44459036_staticRenderFns,
+  date_pickervue_type_template_id_051d024a_render,
+  date_pickervue_type_template_id_051d024a_staticRenderFns,
   false,
   null,
   null,
@@ -32049,8 +32211,8 @@ collapse.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_collapse = (collapse);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/table/src/table.vue?vue&type=template&id=a7feb1e0
-var tablevue_type_template_id_a7feb1e0_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/table/src/table.vue?vue&type=template&id=2e5c7c80
+var tablevue_type_template_id_2e5c7c80_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -32864,11 +33026,11 @@ var tablevue_type_template_id_a7feb1e0_render = function () {
     2
   )
 }
-var tablevue_type_template_id_a7feb1e0_staticRenderFns = []
-tablevue_type_template_id_a7feb1e0_render._withStripped = true
+var tablevue_type_template_id_2e5c7c80_staticRenderFns = []
+tablevue_type_template_id_2e5c7c80_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/table/src/table.vue?vue&type=template&id=a7feb1e0
+// CONCATENATED MODULE: ./packages/table/src/table.vue?vue&type=template&id=2e5c7c80
 
 // EXTERNAL MODULE: ./src/utils/dom.js
 var utils_dom = __webpack_require__(5);
@@ -35478,6 +35640,12 @@ function db(fn) {
 
 	methods: {
 		init: function init() {
+			if (Number(this.fixTop) > 0 && this.$refs.leftTable) {
+				this.$refs.leftTable.style.top = 0;
+			}
+			if (Number(this.fixTop) > 0 && this.$refs.rightTable) {
+				this.$refs.rightTable.style.top = 0;
+			}
 			if (this.$refs && this.$refs.tbody) {
 				// 监听 slot 中的 DOM 变化
 				var tbody = this.$refs.tbody.$el || this.$refs.tbody;
@@ -35656,12 +35824,18 @@ function db(fn) {
 			}
 		},
 		setFixDiv: function setFixDiv() {
+			var _this8 = this;
+
 			if (Number(this.fixTop) > 0 && this.$refs.top && this.$refs.topTable) {
 				if (this.hasVScroll()) {
 					this.$refs.top.style.width = this.$refs.body.offsetWidth - this.getBarWidth() + 'px';
 				}
-				this.$refs.topTable.style.width = this.$refs.table.offsetWidth + 'px';
-				this.$refs.table.style.width = this.$refs.table.offsetWidth + 'px';
+				this.$refs.topTable.style.width = '';
+				this.$refs.table.style.width = '';
+				this.$nextTick(function () {
+					_this8.$refs.topTable.style.width = _this8.$refs.table.offsetWidth + 'px';
+					_this8.$refs.table.style.width = _this8.$refs.table.offsetWidth + 'px';
+				});
 			}
 			if (Number(this.fixRight) > 0 && this.$refs.right && this.$el) {
 				if (this.hasHScroll()) {
@@ -35697,7 +35871,7 @@ function db(fn) {
 			}
 		},
 		formatData: function formatData() {
-			var _this8 = this;
+			var _this9 = this;
 
 			var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
 
@@ -35746,30 +35920,30 @@ function db(fn) {
 			setData(dataTemp);
 			this.iData = arr;
 			setTimeout(function () {
-				_this8.changeIDataType = 'default';
+				_this9.changeIDataType = 'default';
 			}, 100);
 		},
 
 		// 设置全选或者不全选
 		toggleAllSelection: function toggleAllSelection(checked) {
-			var _this9 = this;
+			var _this10 = this;
 
 			this.iData.map(function (item) {
 				if (!item.disabled) {
-					_this9.$set(item, '_checked', checked);
+					_this10.$set(item, '_checked', checked);
 				}
 			});
 		},
 
 		// 全选中事件
 		handleSelectionAllChange: function handleSelectionAllChange(checked) {
-			var _this10 = this;
+			var _this11 = this;
 
 			this.isSelectAll = checked;
 			this.toggleAllSelection(checked);
 			this.iData.map(function (item) {
 				if (!item._checked) {
-					_this10.removeFromCache(item);
+					_this11.removeFromCache(item);
 				}
 			});
 			this.$emit('change', this.checked, checked);
@@ -35790,14 +35964,18 @@ function db(fn) {
 
 		// 行勾选事件
 		handleTableRowChecked: function handleTableRowChecked(checked, dataIndex) {
+			var _this12 = this;
+
 			var current = this.iData[dataIndex];
 			if (!checked) {
 				this.removeFromCache(this.iData[dataIndex]);
 			}
 			this.setSelectAll();
-			this.$emit('change', this.checked, checked, current);
-			this.$emit('selectionChange', this.selectionValueType === 'tree' ? this.buildHierarchyTree(this.checked) : this.checked, current);
-			this.$emit('selection-change', this.selectionValueType === 'tree' ? this.buildHierarchyTree(this.checked) : this.checked, current);
+			this.$nextTick(function () {
+				_this12.$emit('change', _this12.checked, checked, current);
+				_this12.$emit('selectionChange', _this12.selectionValueType === 'tree' ? _this12.buildHierarchyTree(_this12.checked) : _this12.checked, current);
+				_this12.$emit('selection-change', _this12.selectionValueType === 'tree' ? _this12.buildHierarchyTree(_this12.checked) : _this12.checked, current);
+			});
 		},
 
 		// 从记录中移除
@@ -35833,7 +36011,7 @@ function db(fn) {
 
 		// table 点击事件
 		handleTableClick: function handleTableClick(event, eventPath) {
-			var _this11 = this;
+			var _this13 = this;
 
 			if (this.stopClick) {
 				return;
@@ -35845,49 +36023,49 @@ function db(fn) {
 					if (String(dom.tagName).toLowerCase() === 'tr') {
 						(function () {
 
-							_this11.lastSelectedRow = dom;
+							_this13.lastSelectedRow = dom;
 							var rowIndex = Number(Object(utils_dom["getDataSet"])(dom).index);
 
-							if (_this11.rowSelectable || _this11.selectable) {
+							if (_this13.rowSelectable || _this13.selectable) {
 
 								// 行点击事件
-								_this11.$emit('row-click', _this11.iData[rowIndex], rowIndex, event);
-								if (_this11.highlightCurrentRow) {
-									_this11.iData.map(function (item, index) {
+								_this13.$emit('row-click', _this13.iData[rowIndex], rowIndex, event);
+								if (_this13.highlightCurrentRow) {
+									_this13.iData.map(function (item, index) {
 										if (index === rowIndex) {
-											if (_this11.clearable) {
+											if (_this13.clearable) {
 												if (item._on) {
 													item._on = false;
 												} else {
-													_this11.$set(item, '_on', true);
+													_this13.$set(item, '_on', true);
 												}
 											} else {
-												_this11.$set(item, '_on', true);
+												_this13.$set(item, '_on', true);
 											}
 										} else {
-											_this11.$set(item, '_on', false);
+											_this13.$set(item, '_on', false);
 										}
 									});
 								}
 
 								// 多选联动
-								if (_this11.hasSelection && !_this11.iData[rowIndex].disabled) {
-									_this11.iData[rowIndex]._checked = !_this11.iData[rowIndex]._checked;
-									_this11.handleTableRowChecked(_this11.iData[rowIndex]._checked, rowIndex);
+								if (_this13.hasSelection && !_this13.iData[rowIndex].disabled) {
+									_this13.iData[rowIndex]._checked = !_this13.iData[rowIndex]._checked;
+									_this13.handleTableRowChecked(_this13.iData[rowIndex]._checked, rowIndex);
 								}
 
 								// 单选联动
-								if (_this11.hasRadio && !_this11.iData[rowIndex].disabled) {
-									if (_this11.clickRadio(_this11.iData[rowIndex], rowIndex)) {
-										_this11.selectRadio(rowIndex);
+								if (_this13.hasRadio && !_this13.iData[rowIndex].disabled) {
+									if (_this13.clickRadio(_this13.iData[rowIndex], rowIndex)) {
+										_this13.selectRadio(rowIndex);
 									}
 								}
 							}
 
-							if (_this11.autoShowDetail) {
-								_this11.current = _this11.iData[rowIndex];
-								_this11.currentIndex = rowIndex;
-								_this11.$refs.detail.open();
+							if (_this13.autoShowDetail) {
+								_this13.current = _this13.iData[rowIndex];
+								_this13.currentIndex = rowIndex;
+								_this13.$refs.detail.open();
 							}
 						})();
 					} else if (String(dom.tagName).toLowerCase() === 'td' && (this.cellSelectable || this.selectable)) {
@@ -35924,7 +36102,7 @@ function db(fn) {
 
 		// table鼠标悬移事件
 		handleTableMouseover: function handleTableMouseover(event) {
-			var _this12 = this;
+			var _this14 = this;
 
 			if (!this.$pc) return;
 			if (this.rowSelectable || this.selectable) {
@@ -35933,11 +36111,11 @@ function db(fn) {
 					var dom = composedPath[i];
 					if (String(dom.tagName).toLowerCase() === 'tr' && (this.rowSelectable || this.selectable)) {
 						(function () {
-							_this12.lastSelectedRow = dom;
+							_this14.lastSelectedRow = dom;
 							var rowIndex = Number(Object(utils_dom["getDataSet"])(dom).index);
-							_this12.iData.map(function (item, index) {
+							_this14.iData.map(function (item, index) {
 								if (index === rowIndex) {
-									_this12.$set(item, '_hover', true);
+									_this14.$set(item, '_hover', true);
 								}
 							});
 						})();
@@ -35948,7 +36126,7 @@ function db(fn) {
 
 		// table鼠标悬移事件
 		handleTableMouseout: function handleTableMouseout(event) {
-			var _this13 = this;
+			var _this15 = this;
 
 			if (!this.$pc) return;
 			if (this.rowSelectable || this.selectable || this.autoShowDetail || this.longTapAction) {
@@ -35957,17 +36135,17 @@ function db(fn) {
 					var dom = composedPath[i];
 					if (String(dom.tagName).toLowerCase() === 'tr' && (this.rowSelectable || this.selectable || this.autoShowDetail || this.longTapAction)) {
 						(function () {
-							_this13.lastSelectedRow = dom;
+							_this15.lastSelectedRow = dom;
 							var rowIndex = Number(Object(utils_dom["getDataSet"])(dom).index);
-							_this13.changeIDataType = 'change';
-							_this13.iData.map(function (item, index) {
+							_this15.changeIDataType = 'change';
+							_this15.iData.map(function (item, index) {
 								if (index === rowIndex) {
-									_this13.$set(item, '_hover', false);
-									_this13.$set(item, '_active', false);
+									_this15.$set(item, '_hover', false);
+									_this15.$set(item, '_active', false);
 								}
 							});
-							_this13.$nextTick(function () {
-								_this13.changeIDataType = 'default';
+							_this15.$nextTick(function () {
+								_this15.changeIDataType = 'default';
 							});
 						})();
 					}
@@ -35977,7 +36155,7 @@ function db(fn) {
 
 		// table鼠标按下事件
 		handleTableMousedown: function handleTableMousedown(event) {
-			var _this14 = this;
+			var _this16 = this;
 
 			if ((this.$pad || this.$phone) && event.type === 'touchstart' || this.$pc && event.type === 'mousedown') {
 				if (this.rowSelectable || this.selectable || this.autoShowDetail || this.longTapAction) {
@@ -35986,48 +36164,48 @@ function db(fn) {
 						var dom = composedPath[i];
 						if (String(dom.tagName).toLowerCase() === 'tr' && (this.rowSelectable || this.selectable || this.autoShowDetail || this.longTapAction)) {
 							(function () {
-								_this14.lastSelectedRow = dom;
+								_this16.lastSelectedRow = dom;
 								var rowIndex = Number(Object(utils_dom["getDataSet"])(dom).index);
-								if (_this14.$phone) {
-									_this14.isStartLongtap = true;
-									_this14.longtapTimer = setTimeout(function () {
-										if (_this14.isStartLongtap) {
+								if (_this16.$phone) {
+									_this16.isStartLongtap = true;
+									_this16.longtapTimer = setTimeout(function () {
+										if (_this16.isStartLongtap) {
 											event.preventDefault();
-											_this14.$emit('contextmenu', _this14.iData[rowIndex], rowIndex, event);
-											_this14.stopClick = true;
+											_this16.$emit('contextmenu', _this16.iData[rowIndex], rowIndex, event);
+											_this16.stopClick = true;
 
-											_this14.changeIDataType = 'change';
-											_this14.iData.map(function (item, index) {
+											_this16.changeIDataType = 'change';
+											_this16.iData.map(function (item, index) {
 												if (index === rowIndex) {
-													_this14.$set(item, '_active', false);
+													_this16.$set(item, '_active', false);
 												}
 											});
-											_this14.$nextTick(function () {
-												_this14.changeIDataType = 'default';
+											_this16.$nextTick(function () {
+												_this16.changeIDataType = 'default';
 											});
 
 											// 弹出功能列表
-											if (_this14.type === 'v' && (_this14.columns.some(function (item) {
+											if (_this16.type === 'v' && (_this16.columns.some(function (item) {
 												return item.type === 'action';
-											}) && _this14.contextAction || _this14.contextSelection !== null)) {
-												_this14.current = _this14.iData[rowIndex];
-												_this14.currentIndex = rowIndex;
-												_this14.$refs.action.open();
+											}) && _this16.contextAction || _this16.contextSelection !== null)) {
+												_this16.current = _this16.iData[rowIndex];
+												_this16.currentIndex = rowIndex;
+												_this16.$refs.action.open();
 											}
 										}
-										_this14.isStartLongtap = false;
+										_this16.isStartLongtap = false;
 									}, 300);
 								}
-								_this14.changeIDataType = 'change';
-								if (_this14.rowSelectable || _this14.selectable || _this14.autoShowDetail) {
-									_this14.iData.map(function (item, index) {
+								_this16.changeIDataType = 'change';
+								if (_this16.rowSelectable || _this16.selectable || _this16.autoShowDetail) {
+									_this16.iData.map(function (item, index) {
 										if (index === rowIndex) {
-											_this14.$set(item, '_active', true);
+											_this16.$set(item, '_active', true);
 										}
 									});
 								}
-								_this14.$nextTick(function () {
-									_this14.changeIDataType = 'default';
+								_this16.$nextTick(function () {
+									_this16.changeIDataType = 'default';
 								});
 							})();
 						}
@@ -36038,7 +36216,7 @@ function db(fn) {
 
 		// table鼠标松开事件
 		handleTableMouseup: function handleTableMouseup(event) {
-			var _this15 = this;
+			var _this17 = this;
 
 			if ((this.$pad || this.$phone) && event.type === 'touchend' || this.$pc && event.type === 'mouseup') {
 				if (this.rowSelectable || this.selectable || this.autoShowDetail || this.longTapAction) {
@@ -36047,20 +36225,20 @@ function db(fn) {
 						var dom = composedPath[i];
 						if (String(dom.tagName).toLowerCase() === 'tr' && (this.rowSelectable || this.selectable || this.autoShowDetail || this.longTapAction)) {
 							(function () {
-								_this15.lastSelectedRow = dom;
+								_this17.lastSelectedRow = dom;
 								var rowIndex = Number(Object(utils_dom["getDataSet"])(dom).index);
-								_this15.changeIDataType = 'change';
-								_this15.iData.map(function (item, index) {
+								_this17.changeIDataType = 'change';
+								_this17.iData.map(function (item, index) {
 									if (index === rowIndex) {
-										_this15.$set(item, '_active', false);
+										_this17.$set(item, '_active', false);
 									}
 								});
-								_this15.$nextTick(function () {
-									_this15.changeIDataType = 'default';
+								_this17.$nextTick(function () {
+									_this17.changeIDataType = 'default';
 								});
-								if (_this15.$phone) {
-									_this15.isStartLongtap = false;
-									clearInterval(_this15.longtapTimer);
+								if (_this17.$phone) {
+									_this17.isStartLongtap = false;
+									clearInterval(_this17.longtapTimer);
 								}
 							})();
 						}
@@ -36071,7 +36249,7 @@ function db(fn) {
 
 		// table鼠标移动事件
 		handleTableMousemove: function handleTableMousemove(event) {
-			var _this16 = this;
+			var _this18 = this;
 
 			this.isStartLongtap = false;
 			if (this.rowSelectable || this.selectable || this.autoShowDetail) {
@@ -36080,16 +36258,16 @@ function db(fn) {
 					var dom = composedPath[i];
 					if (String(dom.tagName).toLowerCase() === 'tr' && (this.rowSelectable || this.selectable || this.autoShowDetail)) {
 						(function () {
-							_this16.lastSelectedRow = dom;
+							_this18.lastSelectedRow = dom;
 							var rowIndex = Number(Object(utils_dom["getDataSet"])(dom).index);
-							_this16.changeIDataType = 'change';
-							_this16.iData.map(function (item, index) {
+							_this18.changeIDataType = 'change';
+							_this18.iData.map(function (item, index) {
 								if (index === rowIndex) {
-									_this16.$set(item, '_active', false);
+									_this18.$set(item, '_active', false);
 								}
 							});
-							_this16.$nextTick(function () {
-								_this16.changeIDataType = 'default';
+							_this18.$nextTick(function () {
+								_this18.changeIDataType = 'default';
 							});
 						})();
 					}
@@ -36121,21 +36299,21 @@ function db(fn) {
 			}
 		},
 		handleSortClick: function handleSortClick(item, index) {
-			var _this17 = this;
+			var _this19 = this;
 
 			var orderType = item.orderType;
 			this.columns.map(function (column, columnIndex) {
 				if (columnIndex === index) {
 					if (!orderType) {
-						_this17.$set(column, 'orderType', 'asc');
+						_this19.$set(column, 'orderType', 'asc');
 					} else if (orderType === 'asc') {
-						_this17.$set(column, 'orderType', 'desc');
+						_this19.$set(column, 'orderType', 'desc');
 					} else if (orderType === 'desc') {
-						_this17.$set(column, 'orderType', '');
+						_this19.$set(column, 'orderType', '');
 					}
 				} else {
 					if (column.sortable) {
-						_this17.$set(column, 'orderType', '');
+						_this19.$set(column, 'orderType', '');
 					}
 				}
 			});
@@ -36296,12 +36474,12 @@ function db(fn) {
 
 		// 展开所有
 		expandAll: function expandAll() {
-			var _this18 = this;
+			var _this20 = this;
 
 			if (this.iData.length > 0) {
 				this.iData.forEach(function (item, index) {
 					if (item._hasChild && item._level === 1 && item._show === true) {
-						_this18.$refs.tbody.expandAll(item, index, false);
+						_this20.$refs.tbody.expandAll(item, index, false);
 					}
 				});
 			}
@@ -36309,12 +36487,12 @@ function db(fn) {
 
 		// 折叠所有
 		collapseAll: function collapseAll() {
-			var _this19 = this;
+			var _this21 = this;
 
 			if (this.iData.length > 0) {
 				this.iData.forEach(function (item, index) {
 					if (item._hasChild && item._level === 1 && item._show === true) {
-						_this19.$refs.tbody.collapseAll(item, index, false);
+						_this21.$refs.tbody.collapseAll(item, index, false);
 					}
 				});
 			}
@@ -36411,8 +36589,8 @@ function db(fn) {
 
 var table_component = normalizeComponent(
   src_tablevue_type_script_lang_js,
-  tablevue_type_template_id_a7feb1e0_render,
-  tablevue_type_template_id_a7feb1e0_staticRenderFns,
+  tablevue_type_template_id_2e5c7c80_render,
+  tablevue_type_template_id_2e5c7c80_staticRenderFns,
   false,
   null,
   null,
@@ -45673,8 +45851,8 @@ emote.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_emote = (emote);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/filter/src/filter.vue?vue&type=template&id=edc9e79a
-var filtervue_type_template_id_edc9e79a_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/filter/src/filter.vue?vue&type=template&id=5c12da7a
+var filtervue_type_template_id_5c12da7a_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -45758,11 +45936,11 @@ var filtervue_type_template_id_edc9e79a_render = function () {
     ]
   )
 }
-var filtervue_type_template_id_edc9e79a_staticRenderFns = []
-filtervue_type_template_id_edc9e79a_render._withStripped = true
+var filtervue_type_template_id_5c12da7a_staticRenderFns = []
+filtervue_type_template_id_5c12da7a_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/filter/src/filter.vue?vue&type=template&id=edc9e79a
+// CONCATENATED MODULE: ./packages/filter/src/filter.vue?vue&type=template&id=5c12da7a
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/filter/src/filter.vue?vue&type=script&lang=js
 //
@@ -45884,9 +46062,11 @@ filtervue_type_template_id_edc9e79a_render._withStripped = true
 							type.children.find(function (item) {
 								return item.on;
 							}).on = false;
-							type.children.find(function (item) {
+
+							var el = type.children.find(function (item) {
 								return item.value === val[key];
-							}).on = true;
+							});
+							_this.$set(el, 'on', true);
 						}
 					});
 				};
@@ -46047,8 +46227,8 @@ filtervue_type_template_id_edc9e79a_render._withStripped = true
 
 var filter_component = normalizeComponent(
   src_filtervue_type_script_lang_js,
-  filtervue_type_template_id_edc9e79a_render,
-  filtervue_type_template_id_edc9e79a_staticRenderFns,
+  filtervue_type_template_id_5c12da7a_render,
+  filtervue_type_template_id_5c12da7a_staticRenderFns,
   false,
   null,
   null,
@@ -49477,11 +49657,7 @@ var validate_validate = function validate(dom) {
 					} else {
 						reg = new RegExp(rule);
 						if (!reg.test(value)) {
-							if (desc.indexOf('-label') > -1) {
-								formVue.errorTip = Object(lib_locale_["t"])('to.validate.tip.custom', desc, formVue.validateTip ? '\uFF0C' + formVue.validateTip : '');
-							} else {
-								formVue.errorTip = Object(lib_locale_["t"])('to.validate.tip.customRemark', desc, formVue.validateTip ? '\uFF0C' + formVue.validateTip : '');
-							}
+							formVue.errorTip = Object(lib_locale_["t"])('to.validate.tip.custom', desc, formVue.validateTip ? '\uFF0C' + formVue.validateTip : '');
 							allPass = false;
 							setHiddenErrorNodes(formEl);
 							return 'continue';
@@ -49494,12 +49670,7 @@ var validate_validate = function validate(dom) {
 				}
 			} else if (required) {
 				formVue.errorType = 'required';
-				if (desc.indexOf('-label') > -1) {
-					var desc_label = desc.replace('-label', '');
-					formVue.errorTip = Object(lib_locale_["t"])('to.validate.tip.required', desc_label);
-				} else {
-					formVue.errorTip = Object(lib_locale_["t"])('to.validate.tip.requiredRemark', desc);
-				}
+				formVue.errorTip = Object(lib_locale_["t"])('to.validate.tip.required', desc);
 				allPass = false;
 				setHiddenErrorNodes(formEl);
 				return 'continue';
@@ -49525,11 +49696,7 @@ var validate_validate = function validate(dom) {
 					} else {
 						_reg = new RegExp(rule);
 						if (!_reg.test(value)) {
-							if (desc.indexOf('-label') > -1) {
-								showTip(formEl, Object(lib_locale_["t"])('to.validate.tip.custom', desc, formVue.validateTip ? '\uFF0C' + formVue.validateTip : ''));
-							} else {
-								showTip(formEl, Object(lib_locale_["t"])('to.validate.tip.customRemark', desc, formVue.validateTip ? '\uFF0C' + formVue.validateTip : ''));
-							}
+							showTip(formEl, Object(lib_locale_["t"])('to.validate.tip.custom', desc, formVue.validateTip ? '\uFF0C' + formVue.validateTip : ''));
 							return {
 								v: false
 							};
@@ -49541,12 +49708,7 @@ var validate_validate = function validate(dom) {
 					return 'continue';
 				}
 			} else if (required) {
-				if (desc.indexOf('-label') > -1) {
-					var _desc_label = desc.replace('-label', '');
-					showTip(formEl, Object(lib_locale_["t"])('to.validate.tip.required', _desc_label));
-				} else {
-					showTip(formEl, Object(lib_locale_["t"])('to.validate.tip.requiredRemark', desc));
-				}
+				showTip(formEl, Object(lib_locale_["t"])('to.validate.tip.required', desc));
 				return {
 					v: false
 				};
@@ -49601,8 +49763,8 @@ function print_getBody(areaId) {
 	html.push(document.getElementById(areaId).outerHTML);
 	html.push('</div></div>');
 	html.push('<div id="printFn" class="fn">\r\n');
-	html.push('<button type="button" onclick="javascript:window.close();" class="to-button to-box-link to-form-readonly to-box-color-default to-box-mode-fill to-input-fillet-normal"><span class="to-icon-close to-box-color-default"><span style="font-size: 100%;"></span></span><span class="to-buttonText to-hide-keep">关闭</span></button>');
-	html.push('<button type="button" class="to-button to-box-link to-form-readonly to-box-color-primary to-box-mode-fill to-input-fillet-normal" onclick="javascript:window.print();"><span class="to-icon-print to-box-color-default"><span style="font-size: 100%;"></span></span><span class="to-buttonText to-hide-keep">打印</span></button>');
+	html.push('<button type="button" data-action="close" class="to-button to-box-link to-form-readonly to-box-color-default to-box-mode-fill to-input-fillet-normal"><span class="to-icon-close to-box-color-default"><span style="font-size: 100%;"></span></span><span class="to-buttonText to-hide-keep">关闭</span></button>');
+	html.push('<button type="button" data-action="print" class="to-button to-box-link to-form-readonly to-box-color-primary to-box-mode-fill to-input-fillet-normal"><span class="to-icon-print to-box-color-default"><span style="font-size: 100%;"></span></span><span class="to-buttonText to-hide-keep">打印2</span></button>');
 	html.push('\r\n</div>');
 	html.push('\r\n</div>');
 	return html;
@@ -49613,11 +49775,9 @@ function replaceBodyContent(newContent) {
 	var parser = new DOMParser();
 	var doc = parser.parseFromString(htmlString, 'text/html');
 
-	// 使用 DOMPurify 清理 HTML
+	// 使用 DOMPurify 清理 HTML（保留必要的安全规则）
 	doc.body.innerHTML = external_dompurify_default.a.sanitize(newContent);
-
-	var newHtmlString = doc.documentElement.outerHTML;
-	return newHtmlString;
+	return doc.documentElement.outerHTML;
 }
 
 /* harmony default export */ var print = (function (areaId, title) {
@@ -49626,10 +49786,26 @@ function replaceBodyContent(newContent) {
 	pwin.document.write(replaceBodyContent(print_getBody(areaId).join('')));
 	pwin.document.close();
 	pwin.document.documentElement.classList.add('s_print');
+
+	// 绑定事件（事件委托）
+	pwin.document.addEventListener('click', function (e) {
+		var target = e.target.closest('[data-action]'); // 找到带 data-action 的按钮
+		if (!target) return;
+
+		var action = target.dataset.action;
+		switch (action) {
+			case 'close':
+				pwin.window.close(); // 关闭打印窗口
+				break;
+			case 'print':
+				pwin.window.print(); // 执行 print 逻辑
+				break;
+		}
+	});
+
 	if (title && typeof title === 'string') {
 		pwin.document.title = title;
 	}
-	pwin = null;
 });
 // CONCATENATED MODULE: ./src/utils/compare.js
 /* harmony default export */ var compare = (function (dom) {
@@ -50083,7 +50259,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src = __webpack_exports__["default"] = ({
-	version: '1.38.0',
+	version: '1.40.0',
 	locale: lib_locale_default.a.use,
 	i18n: lib_locale_default.a.i18n,
 	install: src_install,