ai.touchui-vue 1.38.0 → 1.39.0

package/lib/date-picker.js

@@ -615,7 +615,7 @@ module.exports = require("ai.touchui-vue/lib/locale");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// 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
+// 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=ed2db97a
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -769,7 +769,7 @@ var staticRenderFns = []
 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=ed2db97a
 
 // EXTERNAL MODULE: external "ai.touchui-vue/lib/locale"
 var locale_ = __webpack_require__(3);
@@ -1576,6 +1576,13 @@ var date_ = __webpack_require__(90);
 
 			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') + '$');
@@ -1591,7 +1598,7 @@ var date_ = __webpack_require__(90);
 		}
 		if (this.value) {
 			this.iValue = this.value;
-			this.$emit('change', this.value);
+			// this.$emit('change', this.value)
 		}
 	},
 	mounted: function mounted() {
@@ -1605,7 +1612,7 @@ var date_ = __webpack_require__(90);
 		},
 		handleDisplayChange: function handleDisplayChange(value) {
 			this.datedisplay = value;
-			this.$emit('change', this.datedisplay);
+			// this.$emit('change', this.datedisplay)
 		},
 		handleDisplayBlur: function handleDisplayBlur() {
 			var _this = this;
@@ -1622,7 +1629,7 @@ var date_ = __webpack_require__(90);
 					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);
 					}
@@ -1650,7 +1657,7 @@ var date_ = __webpack_require__(90);
 					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) {
@@ -1658,15 +1665,15 @@ var date_ = __webpack_require__(90);
 				}
 				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();
 			}
@@ -1801,8 +1808,8 @@ var date_ = __webpack_require__(90);
 });
 // 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__(95);
+// EXTERNAL MODULE: ./packages/date-picker/src/date-picker.vue?vue&type=style&index=0&id=ed2db97a&prod&lang=css
+var date_pickervue_type_style_index_0_id_ed2db97a_prod_lang_css = __webpack_require__(95);
 
 // CONCATENATED MODULE: ./packages/date-picker/src/date-picker.vue
 
@@ -1855,8 +1862,8 @@ module.exports = require("ai.touchui-vue/lib/utils/date");
 /***/ (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__(19);
-/* 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_ed2db97a_prod_lang_css__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(19);
+/* 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_ed2db97a_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_ed2db97a_prod_lang_css__WEBPACK_IMPORTED_MODULE_0__);
 /* unused harmony reexport * */
 
 

package/lib/float.js

@@ -199,7 +199,7 @@ function normalizeComponent(
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// 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
+// 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 render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -241,7 +241,7 @@ var staticRenderFns = []
 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
 //
@@ -334,6 +334,10 @@ render._withStripped = true
 		dy: {
 			type: [String, Number],
 			default: 0
+		},
+		maxHeight: {
+			type: [Number, String],
+			default: ''
 		}
 	},
 	data: function data() {
@@ -515,7 +519,7 @@ 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) {
@@ -676,9 +680,35 @@ 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';
+								}
+							}
 						}
 					}
 				});
@@ -713,9 +743,9 @@ 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 后，移除事件监听
@@ -728,9 +758,9 @@ 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) {

package/lib/import.js

@@ -213,7 +213,7 @@ module.exports = require("ai.touchui-vue/lib/mixins/locale");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// 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
+// 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 render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -254,16 +254,24 @@ var 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",
         {
@@ -419,7 +427,7 @@ var staticRenderFns = []
 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__(87);