Merge remote-tracking branch 'origin/master'

one_stop_public/models/DataColumn.js

@@ -107,10 +107,11 @@ export default {
       if (callback) callback(response);
     },
     *getSqlLabels({ payload, callback }, { call, put }) {
-      const response = yield call(apiRequest,api+"/getSqlLabels" ,payload);
       if(payload.allValues){
         payload.allValues=Base16Encode(payload.allValues)
       }
+      const response = yield call(apiRequest,api+"/getSqlLabels" ,payload);
+    
       if(!response){yield put({type: 'nom'});return }
 
       yield put({

one_stop_public/tableCompon/index.jsx

@@ -1983,9 +1983,9 @@ export default class tableCom extends Component {
       }
     }
 
-    if(initValue === null || initValue === undefined){
-      initValue = '';
-    }
+    // if(initValue === null || initValue === undefined){
+    //   initValue = '';
+    // }
 
     if (!isEdit) {
       if (this.props.fatherCode) {