处理47控件固定显示百分比

fs-danaus

2022-05-25 ea472b9b5aa3629957c4e7cb698834a45adf718c

处理47控件固定显示百分比

 Grid/DataIn.js.bak

File was deleted

 Grid/DataOut.js

@@ -110,7 +110,6 @@
   var v = alldef&1 ? Get(row,c) : row[c]; 
   if(row[c+"_Link"]!=undefined) v=row[c+"_Link"];//***增加处理只读超链接时需要取原始值而不是表面的值
   if(row[c+"_Img"]!=undefined) v=row[c+"_Img"];//***增加处理图片时需要取原始值而不是表面的值
   if(row[c+"_Orig46"]!=undefined) v=row[c+"_Orig46"];//***增加处理46控件时需要取原始值而不是表面的值
    if(row[c+"_expr_val"]!=undefined) v=row[c+"_expr_val"];
   if(v==null) v = "";
  
@@ -302,8 +301,19 @@
                             row[c+"Orig"]=row[c+"_Img"];
                             
             }
             //****46控件 */
             if(this.Cols[c].colType!=undefined&&this.Cols[c].colType==46&& row[c+"_Orig46"]!=undefined){
               row[c+"Orig"]=row[c+"_Orig46"];
             }
                   SetAttr(row,c+"Orig");
              }else{
                  //****46控件 */
             if(this.Cols[c].colType!=undefined&&this.Cols[c].colType==46&& row[c+"_Orig46"]!=undefined){
                             if(row[c]==""){
                               //*****不修改原值，但又需要把它提交到后台
                              row[c]=row[c+"_Orig46"];
                            }
             } 
                  SetAttr(row,c);
             }
                if(this.Cols[c].audit&&row[c + "Orig"] != undefined){

 Grid/DataOut.js.bak

File was deleted

 Grid/Filter.js.bak

File was deleted

 Grid/RenderRow.js

@@ -669,7 +669,7 @@
               }
            }
         }
//**状态控制 把这个功能已经移到setPession
//**״̬���� ����������Ѿ��Ƶ�setPession
       if(this.formid!=9802&&!this.cp&&(type=="Text"||type=="Int"||type=="Float"||type=="Date"||type=="Bool"||type=="Enum"||
          type=="Lines"||type=="Html"||type=="Link"||type=="Radio"||type=="List"||type=="Pass")){
                  var cc=this.Cols[col];
@@ -727,7 +727,7 @@
               else if(!f&&!range&&(type=="Auto"?!L.IsExactNumber(val):!(val-0)&&val!="0")) { 
                  if(type=="Auto") { typecls = "Type"+prefix+"Text"; val = L.FormatString(val,null,1,range); }
                  else{
                      // val = L.NaN;//****去掉，显示原值
                      // val = L.NaN;//****ȥ������ʾԭֵ
                       }
                  }
               else { 
@@ -785,7 +785,7 @@
               val = L.FormatString(val,f,(type=="Lines"?this.NoFormatEscape!="0":this.NoFormatEscape)?1:2,range);
               if(trans) val = this.Translate(row,col,val,type);
               }
 /* 去掉**** 
 /* ȥ��**** 
            else if(typeof(val)=="string"){ 
               if(trans) val = this.Translate(row,col,val,type);
               if(val.search(L.CSearchEscape1)>=0) val = val.replace(L.CReplaceAmp,"&").replace(L.CReplaceLt,"<");
@@ -1201,6 +1201,12 @@
            MS.Digits; if(L.Digits&&(po+"").search(/\d/)>=0) po = L.ConvertDigits(po,this.GetAttr(row,col,"Digits")); ME.Digits;
            if(val.charAt(val.length-1)==">" && val.slice(-6)=="</div>") val = val.replace("</div>",po+"</div>");
            else val += po;
            //***47类型控件需要清除空格值，不然&nbsp;会占用空间造成100%进度也占不满 */
            try{
            if(this.Cols[col].colType!=undefined&&this.Cols[col].colType==47){
               val=val.replace(CNBSP,"");
            }
         }catch(e){}
            }
         if(trans && (pr!=null||po!=null)) val = this.Translate(row,col+"Fix",val,type);


 Grid/SelRow.js.bak

File was deleted

 Grid/Sort.js.bak

File was deleted

 Grid/Sort.js.bak.bak

File was deleted

 Grid/UpdateGrid.js.bak

File was deleted

 Grid/Value.js.bak

File was deleted

 core.js

@@ -2107,21 +2107,10 @@
        } catch (e) { }
        var sf = GT.threePop.setupParms(to, tep, df, filter, _.id, alue, _.formParm, rec, " like", false, false, true, false, this.Data.seInfo, null, null, null, null, this);
        this.setGridInfoTOPop(_, this, row);
        // if (_.colType != undefined && _.colType == 46) {
        //     //打开序列号扫码界面
        //     sf += "@p@" + this.id;
        //     showLayerGrid("/general/SerialNumber/warehousing.jsp" + sf, "-1");
        // } else {
            _.path = _.path.replace("#spellPath#", spellPath);
            parent.addTab("", _.formid, _.wtype, "", _.path + sf);
        //}
    } else {
        // if(_.colType==46){
        //     document.getElementById(_.Name+"_color").click();
        //     return;
        // }else{
        this.popAttr(_, row, col, 1);
        //}
    }

};
@@ -3111,7 +3100,13 @@
    for (var c in this.Cols) {
        if(this.Cols[c].colType==46){
            V[c+"CanEdit"]=0;
            V[c+"HtmlPrefix"]="<div style=\"background:#ffffff\"><input title=\"&#x53CC;&#x51FB;&#x9009;&#x53D6;&#x989C;&#x8272;\" type=\"color\"  style=\"width: 100%;height:25;border: none;\" value=\"#ffffff\" id=\""+c+"_color\" onchange=\"Grids["+this.Index+"].setcolorby46(this);\"/></div>";
            V[c+"HtmlPrefix"]="<div style=\"background:#ffffff\"><input title=\"&#x53CC;&#x51FB;&#x9009;&#x53D6;&#x989C;&#x8272;\" type=\"color\"  style=\"width: 100%;height:25;border: none;\" value=\"#ffffff\" id=\""+c+"_color\" onchange=\"Grids["+this.Index+"].setcolorby46(this);\"/>";
            V[c+"HtmlPostfix"]="</div>";
        }
        if(this.Cols[c].colType==47){
            V[c+"CanEdit"]=0;
            V[c+"HtmlPrefix"]="<div class=\"progress\" style=\"height: 25;\"><div class=\"progress-bar\" style=\"width:0%\"></div>";
            V[c+"HtmlPostfix"]="</div>";
        }
    }
    this.RefreshRow(V);
@@ -3852,14 +3847,19 @@
                A[cl.Name+"_Orig46"]=A[cl.Name];
                A[cl.Name]="";
            }

            A[cl.Name+"CanEdit"]=0;
            if(cl.CanEdit==0){
                //直接设置只读的情况，增加这个标记
                cl.is46OnlyRead=1
            }
            A[cl.Name+"CanEdit"]=0;//不管有没设置只读也要设置为只读
            if(cl.is46OnlyRead==1){
                //只读情况
                A[cl.Name+"HtmlPrefix"]="<div style=\"background:"+color+";width: 100%;height:25;border: none;\"></div>";
                A[cl.Name+"HtmlPrefix"]="<div style=\"background:"+color+";width: 100%;height:25;border: none;\">";
                A[cl.Name+"HtmlPostfix"]="</div>";
            
            }else{
                A[cl.Name + "HtmlPrefix"]="<div style=\"background:"+color+"\"><input title=\"&#x53CC;&#x51FB;&#x9009;&#x53D6;&#x989C;&#x8272;\" type=\"color\"  style=\"width: 100%;height:25;border: none;\" value=\""+color+"\" id=\""+cl.Name+"_color\" onchange=\"Grids["+this.Index+"].setcolorby46(this);\"/></div>";
                A[cl.Name + "HtmlPrefix"]="<div style=\"height:25;background:"+color+"\"><input title=\"&#x53CC;&#x51FB;&#x9009;&#x53D6;&#x989C;&#x8272;\" type=\"color\"  style=\"width: 100%;height:25;border: none;\" value=\""+color+"\" id=\""+cl.Name+"_color\" onchange=\"Grids["+this.Index+"].setcolorby46(this);\"/>";
                A[cl.Name+"HtmlPostfix"]="</div>";
            }
        }
        if(cl.colType==47){
@@ -3872,9 +3872,14 @@
            }
            progress=progress>1?1:progress;
            progress=progress<0?0:progress;
            A[cl.Name]="";
            A[cl.Name]=null;
            A[cl.Name+"CanEdit"]=0;
            A[cl.Name + "HtmlPrefix"]="<div class=\"progress\" style=\"height: 25;\"><div class=\"progress-bar\" style=\"width:"+(progress*100)+"%\">"+(progress*100)+"%</div></div>";
            var htmlperfix="<div class=\"progress\" style=\"position: relative;height: 25;\"><div class=\"progress-bar\" style=\"width:"+(progress*100)+"%\"></div>";
            if(progress>0){
                htmlperfix+="<div style=\"line-height: 25px;position: absolute;float: left;left: 50%;\">"+(progress*100)+"%</div>";
            }
            A[cl.Name + "HtmlPrefix"]=htmlperfix;
            A[cl.Name+"HtmlPostfix"]="</div>";
        }
        //处理超链接问题，手机端和PC端需要用不同的方式
        if (this.browserRedirect()) {
@@ -5659,6 +5664,7 @@
                result = (n1 * n2) / (t1 * t2)
                return result
            case 'divide':
                //console.log("divide:(n1 / n2) / (t2/ t1)="+n1+","+n2+","+t1+","+t2);
                result = (n1 / n2) * (t2 / t1)
                return result
        }