ai.touchui-vue 1.40.2 → 1.41.1

package/lib/timeline.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 376);
+/******/ 	return __webpack_require__(__webpack_require__.s = 373);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 376:
+/***/ 373:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/tip.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 381);
+/******/ 	return __webpack_require__(__webpack_require__.s = 378);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 381:
+/***/ 378:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/tooltip.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 382);
+/******/ 	return __webpack_require__(__webpack_require__.s = 379);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 382:
+/***/ 379:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/transfer.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 361);
+/******/ 	return __webpack_require__(__webpack_require__.s = 358);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 361:
+/***/ 358:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/tree.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 347);
+/******/ 	return __webpack_require__(__webpack_require__.s = 344);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 347:
+/***/ 344:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/upload.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 360);
+/******/ 	return __webpack_require__(__webpack_require__.s = 357);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -199,7 +199,7 @@ module.exports = require("ai.touchui-vue/lib/utils/dom");
 
 /***/ }),
 
-/***/ 14:
+/***/ 12:
 /***/ (function(module, exports) {
 
 module.exports = require("ai.touchui-vue/lib/utils/types");
@@ -818,7 +818,7 @@ module.exports = require("ai.touchui-vue/lib/locale");
 
 /***/ }),
 
-/***/ 360:
+/***/ 357:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -1586,10 +1586,10 @@ var filetransfer_ = __webpack_require__(6);
 var filetransfer_default = /*#__PURE__*/__webpack_require__.n(filetransfer_);
 
 // EXTERNAL MODULE: external "ai.touchui-vue/lib/utils/types"
-var types_ = __webpack_require__(14);
+var types_ = __webpack_require__(12);
 
 // EXTERNAL MODULE: external "ai.touchui-vue/lib/utils/md5"
-var md5_ = __webpack_require__(88);
+var md5_ = __webpack_require__(87);
 
 // EXTERNAL MODULE: external "ai.touchui-vue/lib/utils/sign"
 var sign_ = __webpack_require__(9);
@@ -2561,7 +2561,7 @@ module.exports = require("ai.touchui-vue/lib/utils/util");
 
 /***/ }),
 
-/***/ 88:
+/***/ 87:
 /***/ (function(module, exports) {
 
 module.exports = require("ai.touchui-vue/lib/utils/md5");

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ai.touchui-vue",
-	"version": "1.40.2",
+	"version": "1.41.1",
 	"description": "TouchUI Component Library for Vue.js.",
 	"main": "lib/ai.touchui-vue.common.js",
 	"files": [

package/packages/date-picker/src/date-picker.vue

@@ -1,11 +1,20 @@
 <template>
-	<to-input :id="id" ref="inputBox" class="to-date-picker" :required="required" :desc="desc" :color="color" :prefix="prefix" :suffix="suffix" :mode="mode" :prop-error-type="errorType" :prop-error-tip="errorTip" :fillet="fillet" :fillet-position="filletPosition" :value="datedisplay" :placeholder="placeholder" :readonly="disabled || !inputable" :sp-chars="spChars" :link="!inputable && !disabled" :clearable="clearable && !disabled" :width="width" :comparable="comparable" @focus="errorTip = ''; $emit('focus', datedisplay)" @click="handleClick" @clear="clear()" @input="handleDisplayChange" @blur="handleDisplayBlur">
+	<to-input :id="id" ref="inputBox" class="to-date-picker" :required="required" :desc="desc" :color="color" :prefix="prefix" :suffix="suffix" :mode="mode" :prop-error-type="errorType" :prop-error-tip="errorTip" :fillet="fillet" :fillet-position="filletPosition" :value="datedisplay" :placeholder="placeholder" :readonly="disabled || !inputable" :sp-chars="spChars" :link="!inputable && !disabled" :clearable="clearable && inputable && !disabled ? true : clearable && !inputable && !disabled ? 'always' : false" :width="width" :comparable="comparable" @focus="errorTip = ''; $emit('focus', datedisplay)" @click="handleClick" @clear="clear()" @input="handleDisplayChange" @blur="handleDisplayBlur">
+		<!-- {{ clearable && inputable && !disabled ? true : clearable && !inputable && !disabled ? 'always' : false }} -->
 		<to-icon v-if="type === 'time'" slot="suffix" :link="inputable" :class="disabled ? 'to-dis' : ''" mode="none" color="primary" value="time" @click="showLayer"></to-icon>
 		<to-icon v-else slot="suffix" :link="inputable" :class="disabled ? 'to-dis' : ''" mode="none" color="primary" value="date" @click="showLayer"></to-icon>
-		<to-float ref="layer" :lazy="lazy" :slide="layerSlide" :position="layerPosition" :paddng="0.5" :width="$platform === 'pc' ? 23 : ''" :align="optionAlign ? optionAlign : $pc ? 'right' : 'auto'" @close="handleLayerClose">
+		<to-float ref="layer" class="to-date-picker-layer" :lazy="lazy" :slide="layerSlide" :position="layerPosition" :paddng="0.5" :width="$platform === 'pc' ? shortcuts && shortcuts.length && type !== 'time' ? 29 : 23 : ''" :align="optionAlign ? optionAlign : $pc ? 'right' : 'auto'" @close="handleLayerClose">
 			<to-scroll v-if="$pc || showCalendar">
-				<to-calendar ref="calendar" v-model="date" :time="time" :type="type" :min="min" :max="max" :before-change="beforeChange" @change="select" @close="$refs.layer.close()">
-				</to-calendar>
+				<div class="wrapper">
+					<div v-if="shortcuts && shortcuts.length && type !== 'time'" class="shortcuts">
+						<ul>
+							<li v-for="(item, index) in shortcuts" :key="index" @click="handleShortcut(item)">
+								{{ item.label }}
+							</li>
+						</ul>
+					</div>
+					<to-calendar ref="calendar" v-model="date" :time="time" :type="type" :min="min" :max="max" :before-change="beforeChange" @change="select" @close="$refs.layer.close()"></to-calendar>
+				</div>
 			</to-scroll>
 			<picker v-else v-model="date" :time="time" :type="type" :min="min" :max="max" @cancel="$refs.layer.close()" @change="select" @clear="clear()"></picker>
 		</to-float>
@@ -160,6 +169,16 @@ export default {
 		clearable: {
 			type: Boolean,
 			default: true
+		},
+		shortcuts: {
+			type: [Array, Boolean],
+			default() {
+				if (this.$TouchUI.datePicker && this.$TouchUI.datePicker.shortcuts) {
+					return this.$TouchUI.datePicker.shortcuts(this)
+				} else {
+					return this.$TouchUI.datePicker.shortcuts
+				}
+			}
 		}
 	},
 	data() {
@@ -186,8 +205,10 @@ export default {
 					this.datedisplay = ''
 				} else {
 					// 检查数据是否和 valueFormat 相匹配，避免报错
+					if (this.isDate(val)) {
+						val = this.formatDate(val, this.valueFormat, '')
+					}
 					let newValue = val.trim().substring(0, this.valueFormat.length)
-
 					if (!matchFormat(newValue, this.valueFormat)) { return }
 					if (this.type === 'time') {
 						this.date = this.getDateFromValue(newValue, 'yyyy-MM-dd HH:mm:ss')
@@ -204,8 +225,7 @@ export default {
 		iValue: {
 			handler(val) {
 				this.$emit('change', val)
-			},
-			immediate: true
+			}
 		},
 		displayFormat: {
 			handler(fmt) {
@@ -228,6 +248,9 @@ export default {
 		// this.$refs.layer.open()
 	},
 	methods: {
+		isDate(obj) {
+			return Object.prototype.toString.call(obj) === '[object Date]';
+		},
 		handleLayerClose() {
 			this.$refs.calendar.timeLayer = false
 			this.$refs.calendar.monthLayer = false
@@ -435,13 +458,19 @@ export default {
 		},
 		focus() {
 			this.$refs.inputBox.focus()
+		},
+		handleShortcut(item) {
+			if (item && item.value && typeof item.value === 'function') {
+				const date = item.value.call(this);
+				if (date === null) {
+					this.clear();
+				} else {
+					const formattedDate = this.formatDate(date, this.valueFormat, '');
+					this.date = this.getDateFromValue(formattedDate, this.valueFormat);
+					this.select(formattedDate);
+				}
+			}
 		}
 	}
 };
 </script>
-
-<style>
-.to-date-picker.to-dis>.to-icon-date {
-	pointer-events: none;
-}
-</style>

package/packages/date-picker/src/picker.vue

@@ -301,7 +301,11 @@ export default {
 			} else if (this.type === 'time') {
 				this.$emit('change', `${this.hour}:${this.minute}:${this.second}`)
 			} else {
-				this.$emit('change', `${this.year}-${this.month}-${this.day}`)
+				if (this.day) {
+					this.$emit('change', `${this.year}-${this.month}-${this.day}`)
+				} else {
+					this.$emit('change', `${this.year}-${this.month}`)
+				}
 			}
 		},
 		clear() {

package/packages/input/src/input.vue

@@ -58,7 +58,7 @@
 			@change="inputChange"
 			/>
 		<span v-if="clearable || suggestion || $slots.default || $slots.suffix || suffix || step" class="to-inputSuffix">
-			<to-icon v-if="!readonly && clearable" v-show="clearVisible" class="to-inputClear" color="default" :mode="iconMode" link value="close" @click.stop="clear()"></to-icon>
+			<to-icon v-if="(clearable === true && !readonly) || (clearable === 'always' && readonly)" v-show="clearVisible" class="to-inputClear" color="default" :mode="iconMode" link value="close" @click.stop="clear()"></to-icon>
 			<to-icon v-if="step" v-dis="Number(data) === Number(max) || readonly" :value="stepIconMode ? 'fold' : 'add'" link color="primary" mode="none" @mousedown.native="increase"></to-icon>
 			<span v-if="suffix" class="to-inputText">{{ suffix }}</span>
 			<slot name="suffix"></slot>
@@ -205,7 +205,10 @@ export default {
 		},
 
 		// 基本功能-----------
-		clearable: Boolean,
+		clearable: {
+			type: [Boolean, String],
+			default: true
+		},
 		preventFocus: Boolean,
 		comparable: Boolean,
 		value: {