v1.1.0.Beta+

src/components/framework/index.js

@@ -61,7 +61,7 @@ class Framework extends Component{
 
 		const { prop, tree } = this.props;
 		let changeData = this.exchangeValue(sels, !tree.show);
-		if(tree.show){
+		if(tree.show && tree.strict){
 			let data = this.state.data;
 			this.clearAndReset(data, changeData);
 			changeData = this.init({ data, prop }, true);
@@ -81,7 +81,8 @@ class Framework extends Component{
 	}
 
 	load(data, dataObj, flatData, parent){
-		const { children, optgroup, value, selected, disabled } = this.props.prop;
+		const { prop, tree } = this.props;
+		const { children, optgroup, value, selected, disabled } = prop;
 		data.forEach(item => {
 			//数据提取/处理
 			item.__node = { parent }
@@ -94,15 +95,18 @@ class Framework extends Component{
 				if(len > 0){
 					this.load(child, dataObj, flatData, item);
 
-					//严格的父子结构
+					//是否包含子节点
 					item[optgroup] = true;
-					if(item[selected] === true){
-						delete item[selected]
-						child.forEach(c => c[selected] = true)
-					}
-					if(item[disabled] === true){
-						delete item[disabled]
-						child.forEach(c => c[disabled] = true)
+					//严格的父子结构
+					if(tree.strict){
+						if(item[selected] === true){
+							delete item[selected]
+							child.forEach(c => c[selected] = true)
+						}
+						if(item[disabled] === true){
+							delete item[disabled]
+							child.forEach(c => c[disabled] = true)
+						}
 					}
 
 					//检查子节点的数据是否都被选中
@@ -158,20 +162,25 @@ class Framework extends Component{
 	//选项, 选中状态, 禁用状态, 是否强制删除:在label上点击删除
 	itemClick(item, itemSelected, itemDisabled, mandatoryDelete){
 
-		const { theme, prop, radio, repeat, clickClose, max, maxMethod } = this.props
+		const { theme, prop, radio, repeat, clickClose, max, maxMethod, tree } = this.props
 		let { sels } = this.state
 		const { value, selected, disabled, children, optgroup } = prop
 
 		//如果是禁用状态, 不能进行操作
 		if(itemDisabled) return;
 
-		if(item[optgroup]){
+		if(item[optgroup] && tree.strict){
 			let child = item[children], change = [], isAdd = true;
 			if(item.__node.selected){
 				this.treeHandler(sels, item, change, 'del');
 				isAdd = false;
 			}else if(item.__node.half){
 				this.treeHandler(sels, item, change, 'half');
+				//无法操作禁用状态, 变成取消操作
+				if(change.length === 0){
+					this.treeHandler(sels, item, change, 'del');
+					isAdd = false;
+				}
 			}else{
 				this.treeHandler(sels, item, change, 'add');
 			}

src/components/label/index.js

@@ -1,4 +1,5 @@
-import { h, Component, render } from 'preact'
+import { h, Component, render } from 'preact'
+import { isFunction } from '@/common/util'
 
 /**
  * 标签的渲染
@@ -63,14 +64,18 @@ class Label extends Component{
 
 			const style = { backgroundColor: theme.color }
 			//显示的个数
-			const count = conf.showCount <= 0 ? arr.length : conf.showCount;
-
+			const count = conf.showCount <= 0 ? arr.length : conf.showCount;
+
 			html = arr.splice(0, count).map(sel => {
 				const styleProps = { width: conf.showIcon ? 'calc(100% - 20px)' : '100%', }
 				const className = ['xm-label-block', sel[disabled] ? 'disabled':''].join(' ');
 				return (
-					<div class={className} style={ style }>
-						<span style={ styleProps }>{ sel[name] }</span>
+					<div class={className} style={ style }>
+						{ conf.template && isFunction(conf.template) ? (
+							<span style={ styleProps } dangerouslySetInnerHTML={{ __html: conf.template(sel, arr) }}></span>
+						) : (
+							<span style={ styleProps }>{ sel[name] }</span>
+						) }
 						{ conf.showIcon && <i class="xm-iconfont xm-icon-close" onClick={ this.iconClick.bind(this, sel, true, sel[disabled]) }></i> }
 					</div>
 				)

src/components/plugin/tree.js

@@ -62,10 +62,20 @@ class Tree extends Component{
 
 		const showIcon = config.model.icon != 'hidden';
 		const renderItem = (item, indent, expand) => {
-			const half = item.__node.half === true;
-			const selected = !!sels.find(sel => sel[value] == item[value]) || half || item.__node.selected
-			const dis = item[disabled] || item.__node.disabled;
-			const iconStyle = selected || half ? {
+			//是否被选中
+			let selected = !!sels.find(sel => sel[value] == item[value]);
+			//是否禁用
+			let dis = item[disabled]
+			// 是否半选
+			let half = item.__node.half === true;
+			
+			//tree是否遵义严格父子结构
+			if(tree.strict){
+				selected = selected || half || item.__node.selected
+				dis = dis || item.__node.disabled;
+			}
+			
+			const iconStyle = selected ? {
 				color: theme.color,
 				border: 'none'
 			} : {
@@ -77,7 +87,7 @@ class Tree extends Component{
 				dis && (itemStyle.backgroundColor = '#C2C2C2');
 			}
 			const className = ['xm-option', (dis ? ' disabled' : ''), (selected ? ' selected' : ''), (showIcon ? 'show-icon' : 'hide-icon') ].join(' ');
-			const iconClass = ['xm-option-icon xm-iconfont', radio ? 'xm-icon-danx' : half ? 'xm-icon-banxuan' : 'xm-icon-duox'].join(' ');
+			const iconClass = ['xm-option-icon xm-iconfont', radio ? 'xm-icon-danx' : tree.strict && half ? 'xm-icon-banxuan' : 'xm-icon-duox'].join(' ');
 			const treeIconClass = ['xm-tree-icon', expand ? 'expand':'', item[children] && item[children].length > 0 ? 'visible':'hidden'].join(' ');
 
 			return (

src/components/xm-select/index.js

@@ -84,7 +84,11 @@ class xmOptions {
 	 * 获取多选选中的数据
 	 */
 	getValue(type){
-		let arr = deepMerge([], childData[this.options.el].state.sels);
+		let arr = childData[this.options.el].state.sels.map(item => {
+			item = { ...item };
+			delete item.__node;
+			return item;
+		});
 
 		if(type === 'name'){
 			return arr.map(item => item[this.options.prop.name]);

src/config/options.js

@@ -76,13 +76,21 @@ export default function (lan = 'zn') {
 			show: false,
 			showIcon: true,
 			list: [ 'ALL', 'CLEAR' ],
-		},
-		tree: {
-			show: false,
-			showFolderIcon: true,
-			showLine: true,
-			indent: 20,
-			expandedKeys: [],
+		},
+		//树状结构
+		tree: {
+			//是否展示树
+			show: false,
+			//是否展示三角图标
+			showFolderIcon: true,
+			//是否展示连接线
+			showLine: true,
+			//间距
+			indent: 20,
+			//默认展开的节点数组
+			expandedKeys: [],
+			//是否严格遵守父子模式
+			strict: true,
 		},
 		//自定义属性名称
 		prop: {
@@ -110,7 +118,8 @@ export default function (lan = 'zn') {
 				},
 				block: {
 					showCount: 0,
-					showIcon: true,
+					showIcon: true,
+					template: null,
 				},
 				count: {
 					template(data, sels){