|
|
@@ -29,6 +29,7 @@ define([ 'app/app' ], function(app) {
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
+ //TODO 获取地区的JSON字符串,需要转换成有用的数据--需要改善
|
|
|
if ($scope.rule.areas){
|
|
|
var data = angular.fromJson($scope.rule.areas);
|
|
|
$scope.mapArray = data;
|
|
|
@@ -321,8 +322,9 @@ define([ 'app/app' ], function(app) {
|
|
|
if(angular.isArray(item)) {
|
|
|
angular.forEach(item, function (v) {
|
|
|
arr.push({
|
|
|
- label: v,
|
|
|
- checked: $scope.containsArea(v)
|
|
|
+ label: v
|
|
|
+ //TODO 给已选的Checked设为true
|
|
|
+ // checked: $scope.containsArea(v)
|
|
|
})
|
|
|
})
|
|
|
} else {
|
|
|
@@ -331,8 +333,9 @@ define([ 'app/app' ], function(app) {
|
|
|
label: k,
|
|
|
items: convert(v),
|
|
|
selectedNum : 0,
|
|
|
- folded: true,
|
|
|
- checked: $scope.containsArea(k)
|
|
|
+ folded: true
|
|
|
+ //TODO 给已选的Checked设为true
|
|
|
+ // checked: $scope.containsArea(k)
|
|
|
})
|
|
|
})
|
|
|
}
|
|
|
@@ -350,6 +353,8 @@ define([ 'app/app' ], function(app) {
|
|
|
// }).error(function (res) {
|
|
|
// console.log(res);
|
|
|
// });
|
|
|
+ //TODO 初始化树对象
|
|
|
+ $scope.tree.initTreeData();
|
|
|
}
|
|
|
getData();
|
|
|
}
|
|
|
@@ -369,6 +374,47 @@ define([ 'app/app' ], function(app) {
|
|
|
item.folded = angular.isUndefined(folded) ? !item.folded : folded;
|
|
|
}
|
|
|
|
|
|
+ me.getLastItems = function (item) {
|
|
|
+ while (item.items){
|
|
|
+ item = item.items;
|
|
|
+ }
|
|
|
+ return item;
|
|
|
+ };
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 初始化数据
|
|
|
+ */
|
|
|
+ me.initTreeData = function () {
|
|
|
+ // console.log("初始化进来了");
|
|
|
+ angular.forEach(me.$data, function (v) {
|
|
|
+ if (v.checked){
|
|
|
+ console.log(v.label);
|
|
|
+ me._hasCheckedChildren(v);
|
|
|
+ v.semiChecked = me._hasUncheckedChildren(v);
|
|
|
+ if (!v.semiChecked || v.selectedNum == 0){
|
|
|
+ me.check(v);
|
|
|
+ }else {
|
|
|
+ angular.forEach(v.items, function (k) {
|
|
|
+ if (k.checked){
|
|
|
+ console.log(k.label);
|
|
|
+ me._hasCheckedChildren(k);
|
|
|
+ k.semiChecked = me._hasUncheckedChildren(k);
|
|
|
+ if (!k.semiChecked || k.selectedNum == 0){
|
|
|
+ me.check(k);
|
|
|
+ }else {
|
|
|
+ angular.forEach(k.items, function (m) {
|
|
|
+ if (m.checked){
|
|
|
+ me.check(m);
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ };
|
|
|
+
|
|
|
/**
|
|
|
* 折叠文件夹
|
|
|
* @param item
|