Merge remote-tracking branch 'origin/master'

FormInsertDiy/RenderForm/index.less

@@ -9,6 +9,9 @@
         width: 70% !important;  //可能有问题
       }
     }
+    .ant-pagination-options .ant-select{
+      width: auto !important;
+    }
   }
 
 

Services.js

@@ -9,7 +9,7 @@ import { uaaRequest } from './one_stop_public/utils/request';
 import config from '@/config/config';
 import { message } from 'antd';
 import { setOneStopConfig } from '@/webPublic/zyd_public/utils/utils';
-
+import { getOneStopConfigList } from '@/webPublic/one_stop_public/publicServices';
 // 根据模板code查询模板数据
 // 查询表格中某条数据
 // 查询元数据表格分页数据
@@ -138,7 +138,7 @@ export function getOnestopKey(key = '', formKey = 'key_list', formValue = 'value
         onestopConfigList[item[formKey]] = item[formValue];
       }
       setOneStopConfig(onestopConfigList);
-      // getOneStopConfigList();
+      getOneStopConfigList();
       if (key) {
         return onestopConfigList[key];
       }

one_stop_public/publicServices.js

 import {uaaRequest} from "@/webPublic/one_stop_public/utils/request";
 
-export const getOneStopSystemConfig = (params) => {
+const getOneStopSystemConfig = (params) => {
   return uaaRequest('/ConfigApi/getDetails', params);
 };