LiWeiMin-real
2018-02-02 a369dee3d20457b3e1d04ac04ecb51dcb5200319
Merge branch 'master' of ssh://122.114.176.216:29418/CustomForm-publish
2 files modified
34 ■■■■ changed files
publish/js/customAll/customS.js 15 ●●●●● patch | view | raw | blame | history
publish/js/customMin/customS_min.js 19 ●●●●● patch | view | raw | blame | history
publish/js/customAll/customS.js
@@ -9798,16 +9798,13 @@
        var $divContainer = "";
        var selectedItem = {};
        for (var i = 0; i < vals_selected.length; i++) {
            // $divContainer += '<div class="val-card ng-binding ng-scope ' + vals_selected[i].value +
            //     'Class" ng-repeat="sel_val in sel_val_lst track by $index" ng-show="true" multiple="" load-data="" style="height:40px;line-height:25px;">' +
            //     vals_selected[i].label + '  <i  class="icon iconfont icon-guanbijiantou"  val="' +
            //     vals_selected[i].value + '" style="color:#20b4aa;"></i></li>' + ' </a>' + ' </div>';
            //张吉男修改,下拉框默认值不可清空
            $divContainer += '<div class="val-card ng-binding ng-scope ' + vals_selected[i].value +
            'Class" ng-repeat="sel_val in sel_val_lst track by $index" ng-show="true" multiple="" load-data="" style="height:40px;line-height:25px;">' +
            vals_selected[i].label + '<a onclick="xhSelect.rm_option(this,\'' + vals_selected[i].value +
            '\')" ng-href="javascript:void(0);" href="javascript:void(0);">' + '  <i  class="icon iconfont icon-guanbijiantou"  val="' +
            vals_selected[i].value + '" style="color:#20b4aa;"></i></li>' + ' </a>' + ' </div>';
                'Class" ng-repeat="sel_val in sel_val_lst track by $index" ng-show="true" multiple="" load-data="" style="height:40px;line-height:25px;">' +
                vals_selected[i].label + '<a onclick="xhSelect.rm_option(this,\'' + vals_selected[i].value +
                '\')" ng-href="javascript:void(0);" href="javascript:void(0);">' + '  <i  class="icon iconfont icon-guanbijiantou"  val="' +
                vals_selected[i].value + '" style="color:#20b4aa;"></i></li>' + ' </a>' + ' </div>';
            selectedItem[vals_selected[i].value] = "1";
        }
publish/js/customMin/customS_min.js
@@ -9949,16 +9949,12 @@
        var $divContainer = "";
        var selectedItem = {};
        for (var i = 0; i < vals_selected.length; i++) {
            //张吉男修改 下拉框发布
            $divContainer += '<div class="val-card ng-binding ng-scope ' + vals_selected[i].value +
                'Class" ng-repeat="sel_val in sel_val_lst track by $index" ng-show="true" multiple="" load-data="" style="height:40px;line-height:25px;">' +
                vals_selected[i].label + '  <i  class="icon iconfont icon-guanbijiantou"  val="' +
                vals_selected[i].label + '<a onclick="xhSelect.rm_option(this,\'' + vals_selected[i].value +
                '\')" ng-href="javascript:void(0);" href="javascript:void(0);">' + '  <i  class="icon iconfont icon-guanbijiantou"  val="' +
                vals_selected[i].value + '" style="color:#20b4aa;"></i></li>' + ' </a>' + ' </div>';
            //张吉男修改,下拉框默认值不可清空
            // $divContainer += '<div class="val-card ng-binding ng-scope ' + vals_selected[i].value +
            // 'Class" ng-repeat="sel_val in sel_val_lst track by $index" ng-show="true" multiple="" load-data="" style="height:40px;line-height:25px;">' +
            // vals_selected[i].label + '<a onclick="xhSelect.rm_option(this,\'' + vals_selected[i].value +
            // '\')" ng-href="javascript:void(0);" href="javascript:void(0);">' + '  <i  class="icon iconfont icon-guanbijiantou"  val="' +
            // vals_selected[i].value + '" style="color:#20b4aa;"></i></li>' + ' </a>' + ' </div>';
            selectedItem[vals_selected[i].value] = "1";
        }
@@ -10068,7 +10064,14 @@
    delete selectItme[vals_selected];
    selectItmeJson = JSON.stringify(selectItme);
    $($(val).parent().parent().parent().parent()).find(".selectItme")[0].setAttribute('value', selectItmeJson);
    $(val).parent().remove();
    //张吉男修改 下拉框默认值不可以清空
    var cla=new RegExp("disableColor");
    //console.log(cla.test($(val).parent().parent().attr("class")));
    //判断下拉框是否是可编辑
    if(!(cla.test($(val).parent().parent().attr("class")))){
        $(val).parent().remove();
    }
    setTimeout(function () {
        xhSelect.scope.rm_optionFlag = false;
    }, 500);