ai.touchui-vue 1.35.2 → 1.36.0

package/lib/input.js

@@ -206,7 +206,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/input/src/input.vue?vue&type=template&id=5477b45b
+// 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 render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -613,7 +613,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/input/src/input.vue?vue&type=template&id=5477b45b
+// CONCATENATED MODULE: ./packages/input/src/input.vue?vue&type=template&id=d10b5358
 
 // CONCATENATED MODULE: ./src/utils/string.js
 function filter(chars, from) {
@@ -1059,7 +1059,7 @@ var tip_default = /*#__PURE__*/__webpack_require__.n(tip_);
 			this.disabled = val;
 		},
 		type: function type(val) {
-			if (val === 'password') {
+			if (val === 'password' || val === 'number') {
 				this.itype = val;
 			} else {
 				this.itype = 'text';

package/lib/select.js

@@ -252,7 +252,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/select/src/select.vue?vue&type=template&id=bddf1226
+// 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=f54e334e
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -1102,6 +1102,11 @@ var render = function () {
                                                           placeholder:
                                                             _vm.placeholder,
                                                         },
+                                                        on: {
+                                                          focus: _vm.inputFocus,
+                                                          keyup: _vm.inputInput,
+                                                          blur: _vm.inputBlur,
+                                                        },
                                                         model: {
                                                           value: _vm.inputValue,
                                                           callback: function (
@@ -1124,6 +1129,11 @@ var render = function () {
                                                         on: {
                                                           clear:
                                                             _vm.filterClear,
+                                                          focus:
+                                                            _vm.filterFocus,
+                                                          keyup:
+                                                            _vm.filterInput,
+                                                          blur: _vm.filterBlur,
                                                         },
                                                         model: {
                                                           value:
@@ -1894,7 +1904,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/select/src/select.vue?vue&type=template&id=bddf1226
+// CONCATENATED MODULE: ./packages/select/src/select.vue?vue&type=template&id=f54e334e
 
 // EXTERNAL MODULE: external "ai.touchui-vue/lib/utils/ajax"
 var ajax_ = __webpack_require__(15);
@@ -2432,6 +2442,7 @@ var lib_locale_ = __webpack_require__(3);
 			focused: false,
 			blurByLayer: false,
 			options: [],
+			s_options: [],
 			anotherOptions: [], // 只作用于手机端
 			layerSlide: false,
 			layerPosition: 'auto',
@@ -2963,6 +2974,7 @@ var lib_locale_ = __webpack_require__(3);
 						arr.push(obj);
 					}
 					if (this.$phone && this.filterable) {
+						this.s_options = arr.slice(0, 100);
 						this.options = arr.slice(0, 100);
 						this.anotherOptions = arr.slice(100);
 					} else {
@@ -2971,6 +2983,7 @@ var lib_locale_ = __webpack_require__(3);
 				} else {
 					// 如果是手机端，则先取前 100 项，再拼接后面的
 					if (this.$phone && this.filterable) {
+						this.s_options = this.data.slice(0, 100);
 						this.options = this.data.slice(0, 100);
 						this.anotherOptions = this.data.slice(100);
 					} else {
@@ -3171,7 +3184,7 @@ var lib_locale_ = __webpack_require__(3);
 							_this15.$refs.popupFilter.focus();
 						}
 						_this15.$nextTick(function () {
-							_this15.options = _this15.options.concat(_this15.anotherOptions);
+							_this15.options = _this15.s_options.concat(_this15.anotherOptions);
 						});
 					}, 500);
 				}

package/lib/table.js

@@ -245,7 +245,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/table/src/table.vue?vue&type=template&id=0f1f2eda
+// 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 render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -1064,7 +1064,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/table/src/table.vue?vue&type=template&id=0f1f2eda
+// CONCATENATED MODULE: ./packages/table/src/table.vue?vue&type=template&id=a7feb1e0
 
 // EXTERNAL MODULE: external "vue"
 var external_vue_ = __webpack_require__(4);
@@ -3579,6 +3579,11 @@ function db(fn) {
 			default: function _default() {
 				return this.height && !this.fixTop ? '0r' : '1r';
 			}
+		},
+		// selectionChange 事件时是否需要将扁平数据转换为层级树形结构输出
+		selectionValueType: {
+			type: String,
+			default: 'flat' // flat | tree
 		}
 	},
 	data: function data() {
@@ -3700,9 +3705,7 @@ function db(fn) {
 			this.iData.map(function (item) {
 				if (item._checked) {
 					var obj = JSON.parse(JSON.stringify(item));
-					delete obj._index;
 					delete obj._checked;
-					delete obj._level;
 					delete obj._show;
 					delete obj._hover;
 					delete obj._active;
@@ -4134,7 +4137,7 @@ function db(fn) {
 						if (leftThs.length > 0) {
 							for (var _j2 = 0; _j2 < leftThs.length; _j2++) {
 								var _th3 = _ths3[_j2];
-								var leftTh = leftThs[_i4];
+								var leftTh = leftThs[_j2];
 								leftTh.style.width = _th3.getBoundingClientRect().width + 'px';
 								leftTh.style.height = _th3.getBoundingClientRect().height + 'px';
 							}
@@ -4276,8 +4279,8 @@ function db(fn) {
 				}
 			});
 			this.$emit('change', this.checked, checked);
-			this.$emit('selectionChange', this.checked);
-			this.$emit('selection-change', this.checked);
+			this.$emit('selectionChange', this.selectionValueType === 'tree' ? this.buildHierarchyTree(this.checked) : this.checked);
+			this.$emit('selection-change', this.selectionValueType === 'tree' ? this.buildHierarchyTree(this.checked) : this.checked);
 		},
 
 		// 根据 checkbox 计算是否全选
@@ -4299,8 +4302,8 @@ function db(fn) {
 			}
 			this.setSelectAll();
 			this.$emit('change', this.checked, checked, current);
-			this.$emit('selectionChange', this.checked, current);
-			this.$emit('selection-change', this.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);
 		},
 
 		// 从记录中移除
@@ -4829,6 +4832,76 @@ function db(fn) {
 				this.collapseAll();
 			}
 			this.expandFlag = !this.expandFlag;
+		},
+
+		// 将扁平数据转换为层级树形结构
+		buildHierarchyTree: function buildHierarchyTree(flatData) {
+			var result = [];
+			var levelStack = [];
+
+			for (var _iterator = flatData, _isArray = Array.isArray(_iterator), _i7 = 0, _iterator = _isArray ? _iterator : _iterator[Symbol.iterator]();;) {
+				var _ref5;
+
+				if (_isArray) {
+					if (_i7 >= _iterator.length) break;
+					_ref5 = _iterator[_i7++];
+				} else {
+					_i7 = _iterator.next();
+					if (_i7.done) break;
+					_ref5 = _i7.value;
+				}
+
+				var item = _ref5;
+
+				var currentNode = Object.assign({}, item);
+				currentNode.children = [];
+
+				var level = currentNode._level;
+
+				// 清除高于当前level的节点
+				while (levelStack.length && levelStack[levelStack.length - 1]._level >= level) {
+					levelStack.pop();
+				}
+
+				if (levelStack.length === 0) {
+					// 当前是顶级节点
+					result.push(currentNode);
+				} else {
+					// 插入到上一层级的 children 中
+					var parent = levelStack[levelStack.length - 1];
+					parent.children.push(currentNode);
+				}
+
+				// 当前节点入栈
+				levelStack.push(currentNode);
+			}
+
+			// 清理空 children
+			var cleanEmptyChildren = function cleanEmptyChildren(nodeList) {
+				for (var _iterator2 = nodeList, _isArray2 = Array.isArray(_iterator2), _i8 = 0, _iterator2 = _isArray2 ? _iterator2 : _iterator2[Symbol.iterator]();;) {
+					var _ref6;
+
+					if (_isArray2) {
+						if (_i8 >= _iterator2.length) break;
+						_ref6 = _iterator2[_i8++];
+					} else {
+						_i8 = _iterator2.next();
+						if (_i8.done) break;
+						_ref6 = _i8.value;
+					}
+
+					var node = _ref6;
+
+					if (node.children.length === 0) {
+						delete node.children;
+					} else {
+						cleanEmptyChildren(node.children);
+					}
+				}
+			};
+
+			cleanEmptyChildren(result);
+			return result;
 		}
 	}
 });

package/lib/upload.js

@@ -825,7 +825,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/upload/src/upload.vue?vue&type=template&id=43bd3902
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/upload.vue?vue&type=template&id=7e861ecf
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -1571,7 +1571,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/upload.vue?vue&type=template&id=43bd3902
+// CONCATENATED MODULE: ./packages/upload/src/upload.vue?vue&type=template&id=7e861ecf
 
 // EXTERNAL MODULE: external "ai.touchui-vue/lib/mixins/locale"
 var locale_ = __webpack_require__(2);
@@ -2411,7 +2411,7 @@ var ICON = {
 
 			this.updateTipFileInfo();
 
-			this.$emit('clear', this.iFiles, this.popup);
+			this.$emit('clear', this.iFiles);
 		},
 		_transferStart: function _transferStart(file) {
 			if (!file.guid) return;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ai.touchui-vue",
-	"version": "1.35.2",
+	"version": "1.36.0",
 	"description": "TouchUI Component Library for Vue.js.",
 	"main": "lib/ai.touchui-vue.common.js",
 	"files": [
@@ -57,13 +57,15 @@
 		"vuedraggable": "2.24.3"
 	},
 	"devDependencies": {
+		"ssh2-sftp-client": "^12.0.0",
+		"ssh2": "1.14.0",
+		"archiver": "5.3.1",
 		"@typescript-eslint/eslint-plugin": "5.8.0",
 		"@vue/component-compiler-utils": "2.6.0",
 		"ai.touchui-chat": "^1.9.0",
 		"ai.touchui-desk": "0.0.43",
 		"ai.touchui-plugin": "^1.0.60",
 		"algoliasearch": "3.35.1",
-		"archiver": "5.3.1",
 		"babel-cli": "6.26.0",
 		"babel-core": "6.26.3",
 		"babel-loader": "7.1.5",
@@ -131,7 +133,6 @@
 		"select-version-cli": "0.0.2",
 		"sinon": "7.5.0",
 		"sinon-chai": "3.7.0",
-		"ssh2": "1.14.0",
 		"style-loader": "^1.0.0",
 		"transliteration": "1.6.6",
 		"uglifyjs-webpack-plugin": "2.2.0",

package/packages/checkbox/src/checkbox.vue

@@ -81,7 +81,6 @@ export default {
 			default: 1
 		},
 		wrap: Boolean,
-		observe: Boolean,
 		readonly: Boolean
 	},
 	data() {

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

@@ -221,7 +221,7 @@ export default {
 					} else {
 						newValue = this.getDateFromValue(newValue, this.valueFormat)
 						this.date = newValue
-						this.datedisplay = this.formatDate(newValue, this.displayFormat,val)
+						this.datedisplay = this.formatDate(newValue, this.displayFormat, val)
 					}
 				}
 			},
@@ -259,28 +259,28 @@ export default {
 		handleDisplayBlur() {
 			setTimeout(() => {
 				if (isNaN(new Date(this.datedisplay))) {
-					if(this.datedisplay) {
+					if (this.datedisplay) {
 						this.$emit('errTime')
 					}
 					this.datedisplay = ''
-					this.changeValue('','')
+					this.changeValue('', '')
 				} else {
 					this.$emit('beforeChange', this.datedisplay)
 					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.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)
 					} else {
-						this.changeValue(this.getDateFromValue(this.datedisplay, this.displayFormat),this.datedisplay)
+						this.changeValue(this.getDateFromValue(this.datedisplay, this.displayFormat), this.datedisplay)
 					}
 				}
 			}, 100);
 		},
 		select(value) {
-			this.changeValue(value,'')
+			this.changeValue(value, '')
 			this.$refs.layer.close()
 		},
-		changeValue(value,oldVal) {
+		changeValue(value, oldVal) {
 			this.$emit('beforeChange', value)
 			if (!value) {
 				this.clear()
@@ -289,7 +289,7 @@ export default {
 					this.datedisplay = value.split(' ').length > 1 ? value.split(' ')[1] : value
 					this.iValue = value.split(' ').length > 1 ? value.split(' ')[1] : value
 				} else {
-					value = this.formatDate(new Date(value), 'yyyy-MM-dd HH:mm:ss',value)
+					value = this.formatDate(new Date(value), 'yyyy-MM-dd HH:mm:ss', value)
 					const flag = isNaN(new Date(value).getTime()) // 判断是否可以使用 2022-05 如果不可用，则替换为 2022/05
 					if (flag) {
 						value = value.replace(/-/g, '/')
@@ -303,8 +303,8 @@ export default {
 				if (flag) {
 					value = value.replace(/-/g, '/')
 				}
-				this.datedisplay = this.formatDate(new Date(value), this.displayFormat,oldVal)
-				this.iValue = this.formatDate(new Date(value), this.valueFormat,oldVal)
+				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)
 			}
 		},
@@ -395,7 +395,7 @@ export default {
 			if (!yMatch) return
 			return value.substr(yMatch.index, yMatch[0].length)
 		},
-		formatDate(date, fmt,value) {
+		formatDate(date, fmt, value) {
 			if (date) {
 				// 如果 this.type 不是 'datetime' 或 'time'，检查 date 是否为有效的日期格式
 				if (this.type !== 'datetime' && this.type !== 'time' && value) {
@@ -446,6 +446,9 @@ export default {
 		},
 		setDisabled(f) {
 			this.disabled = f
+		},
+		focus() {
+			this.$refs.inputBox.focus()
 		}
 	}
 };

package/packages/input/src/input.vue

@@ -414,7 +414,7 @@ export default {
 			this.disabled = val
 		},
 		type(val) {
-			if (val === 'password') {
+			if (val === 'password' || val === 'number') {
 				this.itype = val;
 			} else {
 				this.itype = 'text';

package/packages/select/src/select.vue

@@ -124,8 +124,8 @@
 									<to-input v-else ref="popupFilter" v-model="multipleFilterValue" :sp-chars="false" width="full" prevent-focus :placeholder="selected.filter(item => !item.hide).length > 0 ? '' : placeholder "></to-input>
 								</template>
 								<template v-else>
-									<to-input v-if="inputable" ref="popupInput" v-model="inputValue" :sp-chars="spChars" prevent-focus width="full" :placeholder="placeholder"></to-input>
-									<to-input v-else ref="popupFilter" v-model="filterValue" :sp-chars="false" prevent-focus width="full" placeholder="筛选" @clear="filterClear"></to-input>
+									<to-input v-if="inputable" ref="popupInput" v-model="inputValue" :sp-chars="spChars" prevent-focus width="full" :placeholder="placeholder" @focus="inputFocus" @keyup="inputInput" @blur="inputBlur"></to-input>
+									<to-input v-else ref="popupFilter" v-model="filterValue" :sp-chars="false" prevent-focus width="full" placeholder="筛选" @clear="filterClear" @focus="filterFocus" @keyup="filterInput" @blur="filterBlur"></to-input>
 								</template>
 							</to-padding>
 						</to-grid-item>
@@ -505,6 +505,7 @@ export default {
 			focused: false,
 			blurByLayer: false,
 			options: [],
+			s_options: [],
 			anotherOptions: [], // 只作用于手机端
 			layerSlide: false,
 			layerPosition: 'auto',
@@ -1002,6 +1003,7 @@ export default {
 						arr.push(obj)
 					}
 					if (this.$phone && this.filterable) {
+						this.s_options = arr.slice(0, 100)
 						this.options = arr.slice(0, 100)
 						this.anotherOptions = arr.slice(100)
 					} else {
@@ -1010,6 +1012,7 @@ export default {
 				} else {
 					// 如果是手机端，则先取前 100 项，再拼接后面的
 					if (this.$phone && this.filterable) {
+						this.s_options = this.data.slice(0, 100)
 						this.options = this.data.slice(0, 100)
 						this.anotherOptions = this.data.slice(100)
 					} else {
@@ -1200,7 +1203,7 @@ export default {
 							this.$refs.popupFilter.focus()
 						}
 						this.$nextTick(() => {
-							this.options = this.options.concat(this.anotherOptions)
+							this.options = this.s_options.concat(this.anotherOptions)
 						})
 					}, 500);
 				}

package/packages/table/src/table.vue

@@ -344,6 +344,11 @@ export default {
 			default: function _default() {
 				return this.height && !this.fixTop ? '0r' : '1r'
 			}
+		},
+		// selectionChange 事件时是否需要将扁平数据转换为层级树形结构输出
+		selectionValueType: {
+			type: String,
+			default: 'flat' // flat | tree
 		}
 	},
 	data() {
@@ -456,9 +461,7 @@ export default {
 			this.iData.map(item => {
 				if (item._checked) {
 					const obj = JSON.parse(JSON.stringify(item))
-					delete obj._index
 					delete obj._checked
-					delete obj._level
 					delete obj._show
 					delete obj._hover
 					delete obj._active
@@ -867,7 +870,7 @@ export default {
 						if (leftThs.length > 0) {
 							for (let j = 0; j < leftThs.length; j++) {
 								const th = ths[j]
-								const leftTh = leftThs[i]
+								const leftTh = leftThs[j]
 								leftTh.style.width = th.getBoundingClientRect().width + 'px'
 								leftTh.style.height = th.getBoundingClientRect().height + 'px'
 							}
@@ -999,8 +1002,8 @@ export default {
 				}
 			})
 			this.$emit('change', this.checked, checked)
-			this.$emit('selectionChange', this.checked)
-			this.$emit('selection-change', this.checked)
+			this.$emit('selectionChange', this.selectionValueType === 'tree' ? this.buildHierarchyTree(this.checked) : this.checked)
+			this.$emit('selection-change', this.selectionValueType === 'tree' ? this.buildHierarchyTree(this.checked) : this.checked)
 		},
 		// 根据 checkbox 计算是否全选
 		setSelectAll() {
@@ -1020,8 +1023,8 @@ export default {
 			}
 			this.setSelectAll()
 			this.$emit('change', this.checked, checked, current)
-			this.$emit('selectionChange', this.checked, current)
-			this.$emit('selection-change', this.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)
 		},
 		// 从记录中移除
 		removeFromCache(rowData) {
@@ -1488,6 +1491,49 @@ export default {
 				this.collapseAll()
 			}
 			this.expandFlag = !this.expandFlag
+		},
+		// 将扁平数据转换为层级树形结构
+		buildHierarchyTree(flatData) {
+			const result = [];
+			const levelStack = [];
+
+			for (const item of flatData) {
+				const currentNode = Object.assign({}, item);
+				currentNode.children = [];
+
+				const level = currentNode._level;
+
+				// 清除高于当前level的节点
+				while (levelStack.length && levelStack[levelStack.length - 1]._level >= level) {
+					levelStack.pop();
+				}
+
+				if (levelStack.length === 0) {
+					// 当前是顶级节点
+					result.push(currentNode);
+				} else {
+					// 插入到上一层级的 children 中
+					const parent = levelStack[levelStack.length - 1];
+					parent.children.push(currentNode);
+				}
+
+				// 当前节点入栈
+				levelStack.push(currentNode);
+			}
+
+			// 清理空 children
+			const cleanEmptyChildren = (nodeList) => {
+				for (const node of nodeList) {
+					if (node.children.length === 0) {
+						delete node.children;
+					} else {
+						cleanEmptyChildren(node.children);
+					}
+				}
+			};
+
+			cleanEmptyChildren(result);
+			return result;
 		}
 	}
 }

package/packages/upload/src/upload.vue

@@ -772,7 +772,7 @@ export default {
 
 			this.updateTipFileInfo()
 
-			this.$emit('clear', this.iFiles, this.popup)
+			this.$emit('clear', this.iFiles)
 		},
 		_transferStart(file) {
 			if (!file.guid) return

package/src/index.js

@@ -455,7 +455,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-	version: '1.35.1',
+	version: '1.35.2',
 	locale: locale.use,
 	i18n: locale.i18n,
 	install,