seimin 1 年間 前
コミット
5766fdaa61

+ 1 - 1
.vscode/launch.json

@@ -8,7 +8,7 @@
8 8
       "type": "msedge",
9 9
       "request": "launch",
10 10
       "name": "针对 localhost 启动 Edge",
11
-      "url": "http://192.168.4.69",
11
+      "url": "http://localhost",
12 12
       "webRoot": "${workspaceFolder}"
13 13
     }
14 14
   ]

+ 15 - 16
assets/js/controllers/customform/customformCtrl.js

@@ -12341,7 +12341,7 @@ appFormly.config(function config(formlyConfigProvider) {
12341 12341
                   if(options.templateOptions.uuKey == 'knowledge_leve.dutyDepartment'){
12342 12342
                     let data = result[options.templateOptions.optionsDataKey];
12343 12343
                     for (var i = 0; i < data.length; i++) {
12344
-                      data[i].parent = {id: data[i].branch, name: data[i].branchName};
12344
+                      data[i].parent = {id: data[i].branch + '_branch', name: data[i].branchName};
12345 12345
                       data[i].name = data[i].dept;
12346 12346
                     }
12347 12347
                     var parentList = []
@@ -12367,7 +12367,7 @@ appFormly.config(function config(formlyConfigProvider) {
12367 12367
                       //add an entry for this node to the map so that any future children can
12368 12368
                       //lookup the parent
12369 12369
                       if(idToNodeMap[datum.parent.id]){
12370
-                        idToNodeMap[datum.parent.id].push(datum);
12370
+                        idToNodeMap[datum.parent.id].push(JSON.parse(JSON.stringify(datum)));
12371 12371
                       }
12372 12372
                       //Does this node have a parent?
12373 12373
                     }
@@ -12377,6 +12377,7 @@ appFormly.config(function config(formlyConfigProvider) {
12377 12377
                         parentList[index].children = idToNodeMap[key];
12378 12378
                       };
12379 12379
                     };
12380
+                    console.log(parentList)
12380 12381
                     options.templateOptions.options = parentList;
12381 12382
                   }else{
12382 12383
                     if (options.templateOptions.optionsDataKey) {
@@ -12570,20 +12571,18 @@ appFormly.config(function config(formlyConfigProvider) {
12570 12571
         // }
12571 12572
         // $scope.model[$scope.options.key]=[];
12572 12573
         // $scope.fn
12573
-        if ($scope.to.uuKey === 'knowledge_leve.dutyDepartment') {
12574
-          $rootScope.bala1 = function (items, fn) {
12575
-            // $scope.fn = fn;
12576
-            console.log(items);
12577
-            // console.log($scope.options.templateOptions.refresh(items, 'search', fn))
12578
-            $scope.options.templateOptions.refresh(items, "search", fn);
12579
-
12580
-            // $scope.options.templateOptions.bala($scope.options.templateOptions.APIService,items.filterKeyword).then(function(res){
12581
-            //     // return res.list;
12582
-            //     console.log(666)
12583
-            //     fn(res.list)
12584
-            // })
12585
-          };
12586
-        }
12574
+        $rootScope.bala1 = function (items, fn) {
12575
+          // $scope.fn = fn;
12576
+          console.log(items);
12577
+          // console.log($scope.options.templateOptions.refresh(items, 'search', fn))
12578
+          $scope.options.templateOptions.refresh(items, "search", fn);
12579
+
12580
+          // $scope.options.templateOptions.bala($scope.options.templateOptions.APIService,items.filterKeyword).then(function(res){
12581
+          //     // return res.list;
12582
+          //     console.log(666)
12583
+          //     fn(res.list)
12584
+          // })
12585
+        };
12587 12586
       },
12588 12587
     ],
12589 12588
   });

+ 1 - 1
bower_components/angular-multi-select-tree/dist/angular-multi-select-tree-0.1.0.js

@@ -49,7 +49,7 @@
49 49
             "      <i class=\"caret pull-right\"></i>\n" +
50 50
             "    </div>\n" +
51 51
             "    <div class=\"tree-view\" ng-show=\"showTree\">\n" +
52
-            "        <div class=\"helper-container\">\n" +
52
+            "        <div class=\"helper-container\" data-ng-if=\"false\">\n" +
53 53
             "             <div class=\"line\" data-ng-if=\"switchView\">\n" +
54 54
             "                 <button type=\"button\" ng-click=\"switchCurrentView($event);\" class=\"helper-button\">{{switchViewLabel}}</button>\n" +
55 55
             "             </div>\n" +