Commit 14edc080aa69655a052b56202e8d385260bce061
1 parent
d4ff565e
update
Showing
2 changed files
with
17 additions
and
29 deletions
src/main/resources/static/pages/scheduleApp/module/common/prj-common-directive.js
| @@ -694,44 +694,30 @@ angular.module('ScheduleApp').directive("saSelect3", [ | @@ -694,44 +694,30 @@ angular.module('ScheduleApp').directive("saSelect3", [ | ||
| 694 | //console.log("start"); | 694 | //console.log("start"); |
| 695 | // 清空内部数据 | 695 | // 清空内部数据 |
| 696 | scope[ctrlAs].$$data_real = []; | 696 | scope[ctrlAs].$$data_real = []; |
| 697 | + scope[ctrlAs].$$data = [] | ||
| 697 | for (var i = 0; i < result.length; i ++) { | 698 | for (var i = 0; i < result.length; i ++) { |
| 698 | - // TODO：超级大BUG | ||
| 699 | - var data = {}; // data是result的一部分属性集合，根据配置来确定 | ||
| 700 | - if ($icname_attr) { | ||
| 701 | - if ($mlp_attr) { | ||
| 702 | - eval("data" + "." + $icname_attr + " = result[i]" + "." + $icname_attr + ";"); | ||
| 703 | - } else { | ||
| 704 | - data[$icname_attr] = result[i][$icname_attr]; | ||
| 705 | - } | ||
| 706 | - } | ||
| 707 | - if ($icname2_attr) { | ||
| 708 | - if ($mlp_attr) { | ||
| 709 | - eval("data" + "." + $icname2_attr + " = result[i]" + "." + $icname2_attr + ";"); | ||
| 710 | - } else { | ||
| 711 | - data[$icname2_attr] = result[i][$icname2_attr]; | ||
| 712 | - } | ||
| 713 | - } | ||
| 714 | if ($icname_s_attr) { | 699 | if ($icname_s_attr) { |
| 715 | - // 动态添加基于名字的拼音 | ||
| 716 | if ($mlp_attr) { | 700 | if ($mlp_attr) { |
| 717 | - eval("data" + "." + $icname_s_attr + " = result[i]" + "." + $icname_s_attr + ";"); | ||
| 718 | - if (eval("data" + "." + $icname_s_attr)) { | 701 | + if (eval("result[i]" + "." + $icname_s_attr)) { |
| 719 | // 全拼 | 702 | // 全拼 |
| 720 | - data["fullChars"] = pinyin.getFullChars(eval("result[i]" + "." + $icname_s_attr)).toUpperCase(); | 703 | + result[i]["fullChars"] = pinyin.getFullChars(eval("result[i]" + "." + $icname_s_attr)).toUpperCase(); |
| 721 | // 简拼 | 704 | // 简拼 |
| 722 | - data["camelChars"] = pinyin.getCamelChars(eval("result[i]" + "." + $icname_s_attr)); | 705 | + result[i]["camelChars"] = pinyin.getCamelChars(eval("result[i]" + "." + $icname_s_attr)); |
| 723 | } | 706 | } |
| 724 | } else { | 707 | } else { |
| 725 | - data[$icname_s_attr] = result[i][$icname_s_attr]; | ||
| 726 | - if (data[$icname_s_attr]) { | ||
| 727 | - data["fullChars"] = pinyin.getFullChars(result[i][$icname_s_attr]).toUpperCase(); // 全拼 | ||
| 728 | - data["camelChars"] = pinyin.getCamelChars(result[i][$icname_s_attr]); // 简拼 | 708 | + if (result[i][$icname_s_attr]) { |
| 709 | + // 全拼 | ||
| 710 | + result[i]["fullChars"] = pinyin.getFullChars(result[i][$icname_s_attr]).toUpperCase(); | ||
| 711 | + // 简拼 | ||
| 712 | + result[i]["camelChars"] = pinyin.getCamelChars(result[i][$icname_s_attr]); | ||
| 729 | } | 713 | } |
| 730 | } | 714 | } |
| 731 | } | 715 | } |
| 732 | - if (data["fullChars"]) { // 有拼音的加入数据源 | ||
| 733 | - scope[ctrlAs].$$data_real.push(data); | 716 | + |
| 717 | + if (result[i]["fullChars"]) { // 有拼音的加入数据源 | ||
| 718 | + scope[ctrlAs].$$data_real.push(result[i]); | ||
| 734 | } | 719 | } |
| 720 | + | ||
| 735 | } | 721 | } |
| 736 | //console.log("start2"); | 722 | //console.log("start2"); |
| 737 | 723 |
src/main/resources/static/pages/scheduleApp/module/core/scheduleRuleManage/form.html
| @@ -69,8 +69,10 @@ | @@ -69,8 +69,10 @@ | ||
| 69 | dcvalue="{{ctrl.scheduleRuleManageForSave.carConfigInfo.id}}" | 69 | dcvalue="{{ctrl.scheduleRuleManageForSave.carConfigInfo.id}}" |
| 70 | dcname="carConfigInfo.id" | 70 | dcname="carConfigInfo.id" |
| 71 | icname="id" | 71 | icname="id" |
| 72 | - icnames="nbbm" | ||
| 73 | - datatype="cci" | 72 | + icnames="cl.insideCode" |
| 73 | + datatype="cci2" | ||
| 74 | + dataassociate="true" | ||
| 75 | + dataparam="{{ {'xl.id_eq': ctrl.scheduleRuleManageForSave.xl.id} | json }}" | ||
| 74 | mlp="true" | 76 | mlp="true" |
| 75 | required > | 77 | required > |
| 76 | </sa-Select3> | 78 | </sa-Select3> |