Disable cells in the common editor section can be edited -- common editor 部分disable 单元格可以编辑 (resolve: #14609)

When the common editor action type is disabled, it is not grayed out -- common editor action 类型 disable 时没有变灰(resolve: #14614)
Common editor online enum type request error -- common editor online enum 类型请求报错(resolve: #14608)

ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditorActivity.java

@@ -16,6 +16,7 @@ import android.text.InputFilter;
 import android.text.InputType;
 import android.text.TextUtils;
 import android.text.TextWatcher;
+import android.util.JsonReader;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -2280,16 +2281,26 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
 
                 boolean readonly = content_data_download.optBoolean("readonly");
 
+
+
+
                 JSONObject item_json = content_data_control.optJSONArray(groupPosition).optJSONObject(childPosition);
+
+                boolean disable = item_json.optBoolean("disable");
+                if (disable  || readonly) {
+                    return false;
+                }
+
+
                 String control = item_json.optString("control");
                 if (control.equals("editor")) {
                     handle_editor_cell_select(groupPosition,childPosition,item_json);
                 }
                 else if (control.equals("enum")) {
-                    boolean disable = item_json.optBoolean("disable");
-                    if (disable  || readonly) {
-                        return false;
-                    }
+//                    boolean disable = item_json.optBoolean("disable");
+//                    if (disable  || readonly) {
+//                        return false;
+//                    }
                     JSONObject cadedate_json = item_json.optJSONObject("cadedate");
                     String single_select = item_json.optString("single_select");
                     String title = item_json.optString("aname");
@@ -2306,6 +2317,10 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
 
                         JSONObject paramsjson = item_json.optJSONObject("params");
 
+                        JSONObject projectParams = prepare_project_parameters();
+
+                        RAUtil.mergeJson(paramsjson,projectParams);
+
                         Bundle params=RAUtil.Json2Bundle(paramsjson);
 
                         intent = new EnumSlectOnlineActivity.Builder().build(mCtx,title,max_select,groupPosition,childPosition,singleSelect,true,ONLINE_ENUM_URL,params);
@@ -2489,6 +2504,10 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
             return false;
         }
     }
+    protected JSONObject prepare_project_parameters()
+    {
+        throw new AssertionError("CommonEditor.prepare_project_parameters not impl");
+    }
 
     protected void handle_editor_cell_select( int groupIndex,int itemIndex,JSONObject item_json)
     {
@@ -3167,6 +3186,7 @@ protected void commonAction(String value, int groupIndex,int itemIndex,JSONObjec
         String value = null;
         String required = null;
         JSONObject data = null;
+        boolean disable = false;
 
         holder.group = group;
         holder.child = child;
@@ -3177,6 +3197,14 @@ protected void commonAction(String value, int groupIndex,int itemIndex,JSONObjec
             value = item_json.optString("value");
             required = item_json.optString("required");
             data = item_json.optJSONObject("data");
+            data = item_json.optJSONObject("data");
+
+
+            if (disable || readonly) {
+                holder.action_lb.setTextColor(Color.LTGRAY);
+            } else {
+                holder.action_lb.setTextColor(Color.BLACK);
+            }
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -3186,9 +3214,16 @@ protected void commonAction(String value, int groupIndex,int itemIndex,JSONObjec
             title = title + "*";
         }
 
+
+
+
         holder.action_lb.setText(title);
         holder.action_code = value;
 
+
+
+
+
         if (cancommit && required.equals("true") && data == null) {
             // Shadow red
         } else {

ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/EnumSlectOnlineActivity.java

@@ -132,6 +132,10 @@ public class EnumSlectOnlineActivity extends AppCompatActivity
         }
     }
 
+//    JSONObject GetCadedate(String url, Bundle params)
+//    {
+//        throw new AssertionError("EnumSelectOnlineActivity.handle_editor_cell_select not impl");
+//    }
     void LoadData(int option)
     {
 

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/tfeditor/TFEditorActivity.java

@@ -18,8 +18,10 @@ import androidx.appcompat.app.AlertDialog;
 import com.usai.commoneditorlib.CommonEditorActivity;
 import com.usai.commoneditorlib.EnumSlectOnlineActivity;
 import com.usai.ratradefiling.R;
+import com.usai.ratradefiling.dataprovider.OnlineDataProvider;
 import com.usai.ratradefiling.dataprovider.RADataProvider;
 import com.usai.redant.rautils.utils.Network;
+import com.usai.redant.rautils.utils.RAConverter;
 import com.usai.redant.rautils.utils.RAUtil;
 
 import org.json.JSONException;
@@ -62,6 +64,15 @@ public class TFEditorActivity extends CommonEditorActivity
 
         return RADataProvider.request_editor(request_url, params);
     }
+    @Override
+    protected JSONObject prepare_project_parameters()
+    {
+
+        Bundle proj_param = new Bundle();
+        OnlineDataProvider.prepare_addtional_params(proj_param);
+        return RAUtil.Bundle2Json(proj_param);
+    }
+
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item)
@@ -353,6 +364,17 @@ public class TFEditorActivity extends CommonEditorActivity
 
             JSONObject paramsjson = item_json.optJSONObject("params");
 
+
+
+
+
+            JSONObject projectParams = prepare_project_parameters();
+
+            RAUtil.mergeJson(paramsjson,projectParams);
+
+
+
+
             Bundle params=RAUtil.Json2Bundle(paramsjson);
 
             String single_select = item_json.optString("single_select");
@@ -434,6 +456,10 @@ public class TFEditorActivity extends CommonEditorActivity
 
             JSONObject paramsjson = item_json.optJSONObject("params");
 
+            JSONObject projectParams = prepare_project_parameters();
+
+            RAUtil.mergeJson(paramsjson,projectParams);
+
             Bundle params=RAUtil.Json2Bundle(paramsjson);
 
             String single_select = item_json.optString("single_select");