xieyonghong 3 лет назад
Родитель
Сommit
183bb3d09f

+ 2 - 1
src/pages/rule-engine/Scene/Save/index.tsx

@@ -78,6 +78,7 @@ export default () => {
 
         setTriggerValue({ trigger: _data.terms || [] });
         setTriggerDatas(_data.trigger);
+        setActionParams({ trigger: _data.trigger });
         if (_data.trigger?.shakeLimit) {
           setShakeLimit(_data.trigger?.shakeLimit || DefaultShakeLimit);
         }
@@ -224,7 +225,7 @@ export default () => {
                   setTriggerDatas(allValues.trigger);
                 }
               } else if (['timer', 'manual'].includes(changeValue.trigger.type)) {
-                setActionParams({ trigger: allValues.trigger });
+                setActionParams({ trigger: allValues.trigger }); // 用于内置参数请求
               }
             }
 

+ 0 - 1
src/pages/system/Platforms/Api/base.tsx

@@ -33,7 +33,6 @@ export default observer((props: ApiPageProps) => {
 
   const initModel = () => {
     ApiModel.data = [];
-    ApiModel.baseUrl = '';
     ApiModel.showTable = true;
     ApiModel.components = {};
     ApiModel.swagger = {};

+ 0 - 1
src/pages/system/Platforms/Api/leftTree.tsx

@@ -71,7 +71,6 @@ export default (props: LeftTreeType) => {
       const resp = await service.getApiNextLevel(name);
       if (resp) {
         ApiModel.components = resp.components;
-        ApiModel.baseUrl = resp.servers[0].url;
         const handleData = handleTreeData(resp);
         setTreeData((origin) => {
           const data = updateTreeData(origin, key, handleData);

+ 2 - 1
src/pages/system/Platforms/Api/swagger-ui/debugging.tsx

@@ -10,6 +10,7 @@ import { createForm } from '@formily/core';
 import { createSchemaField, FormProvider } from '@formily/react';
 import { FormItem, Input as FormilyInput, ArrayTable, Editable } from '@formily/antd';
 import type { ISchema } from '@formily/json-schema';
+import SystemConst from '@/utils/const';
 import classNames from 'classnames';
 
 export default observer(() => {
@@ -76,7 +77,7 @@ export default observer(() => {
       };
     }
 
-    request(`${ApiModel.baseUrl}${newUrl}`, options).then((resp) => {
+    request(`/${SystemConst.API_BASE}${newUrl}`, options).then((resp) => {
       if (resp.status === 200) {
         setResult(resp);
       } else {

+ 6 - 6
src/pages/system/Platforms/save.tsx

@@ -78,11 +78,10 @@ export default (props: SaveProps) => {
   const form = useMemo(
     () =>
       createForm({
-        validateFirst: false,
         effects() {
           onFieldValueChange('enableOAuth2', (field) => {
             form.setFieldState('redirectUrl', (state) => {
-              state.display = field.value ? 'visible' : 'none';
+              state.visible = field.value;
             });
           });
         },
@@ -93,7 +92,7 @@ export default (props: SaveProps) => {
   const getDetail = async (id: string) => {
     const resp = await service.getDetail(id);
     if (resp.status === 200) {
-      form.setValues({
+      form.setInitialValues({
         ...resp.result,
         confirm_password: resp.result.password,
       });
@@ -105,7 +104,7 @@ export default (props: SaveProps) => {
       if (props.type === 'edit') {
         getDetail(props.data.id);
       } else {
-        form.setValues({
+        form.setInitialValues({
           enableOAuth2: false,
           id: randomString(16),
           secureKey: randomString(),
@@ -378,7 +377,8 @@ export default (props: SaveProps) => {
             'x-component-props': {
               placeholder: '请输入redirectUrl',
             },
-            'x-hidden': true,
+            // 'x-hidden': true,
+            'x-visible': false,
             'x-decorator-props': {
               gridSpan: 2,
               tooltip: '授权后自动跳转的页面地址',
@@ -439,9 +439,9 @@ export default (props: SaveProps) => {
   };
 
   const saveData = useCallback(async () => {
-    // setLoading(true)
     const data: any = await form.submit();
     if (data) {
+      console.log(data);
       setLoading(true);
       const resp: any = props.type === 'edit' ? await service.edit(data) : await service.save(data);
       setLoading(false);