Merge branch 'master' of http://192.168.0.110:11080/wangguangchao/hangzhoutd2bdsproject

script/stgmod.0001.script

@@ -35,7 +35,7 @@ void gridCfgAddFld(String argins,IDatafield argfld,int argpos,String arghea,int
     Platform.sysDump( Platform.formatText( "STGMOD.GridAddFld: Instance $1 used in definition of field $2 in module $3 not previously defined with GridAddIns", ins, fldNam, fldPth ) );
   }
   // determine the sql fieldreference
-  String col = ins + "." + fldNam;
+  String col = ins + "." + fldNam + " " + ins + "_" + fldNam;
   // determine datatype of field
   int fldTyp = Platform.getAttribute( argfld, tdAttrDatatype );
   // Determine a default column width

script/stgmod.0008.script

@@ -73,7 +73,9 @@ void gridEtySelect(IModule argrec,String argtds,String argcon,String argorder)
     Platform.cacheRead( grdValBox, "stgmod", argtds, "StreamGridValues" );
     grdVal=grdValBox.value;
     ignore = Platform.errorCode();
-    que = Platform.promptStream( stgStm, grdHea, grdVal, Platform.parseInt( grdLft ), Platform.parseInt( grdTop ) );
+    que = (String) ctx.restoreData("selsptinr");
+    // que = Platform.promptStream( stgStm, grdHea, grdVal, Platform.parseInt( grdLft ), Platform.parseInt( grdTop ) );
+    MdaEnv.setGridData(grdHea, grdVal, stgStm);
     if( Platform.isEmpty( que ) )
     {
       Platform.setErrorCode( tdOdbcNotSelected, "" );

script/stgmod.0014.script

@@ -96,7 +96,9 @@ void gridCfgStore(String argtds)
         fldIdx = Platform.parseInt( Platform.mid( lin, 1, pos - 1 ) );
         fldLin = Platform.getLine( $fldstm.getValue(), fldIdx + 1 );
         posTab = Platform.pos( fldLin, "\t" );
-        Platform.cacheWrite( Platform.mid( fldLin, 1, posTab - 1 ), "stgmod", argtds, "SqlSelectOrder" );
+        fldLin = MdaUtilsEx.mid(fldLin, 1, posTab - 1);
+        fldLin = fldLin.split(" ")[0];
+        Platform.cacheWrite( fldLin, "stgmod", argtds, "SqlSelectOrder" );
         break;
       }
       idx = idx + 1;

script/stgmod.0015.script

@@ -34,7 +34,9 @@ void gridCfgSetDefaultOrder(String argtds,String argorder)
       col = Platform.trim( Platform.mid( arg, 1, pos ) );
       arg = Platform.trim( Platform.mid( arg, pos + 1 ) );
     }
-    idx = Platform.streamSearch( $fldstm, col + "\t" );
+    //idx = Platform.streamSearch( $fldstm, col + "\t" );
+    //TODO兼容 弹出回填页签
+    idx = MdaUtils.streamSearch(this.getFldstm(),col);
     if( idx == 0 )
     {
       Platform.sysDump( Platform.formatText( "STGMOD.GridCfgSetDefaultOrder: Field '$3' in definition of $1 with order $2 is not yet defined.", argtds, argorder, col ) );

script/sysmod.0411.script

 init $$\ order 9000570
 {
   String errflg = "";
-  Platform.dbRead( $\sysmod\ucl, "WHERE USR = '" + $\sysmod\usr\extkey.getValue() + "'" );
+  //Platform.dbRead( $\sysmod\ucl, "WHERE USR = '" + $\sysmod\usr\extkey.getValue() + "'" );
   if( Platform.errorCode() > 0 )
   {
     if( Platform.isEmpty( errflg ) )