From 9a587e276e6fe52fdbf0e08b62e7b2d590db37bf Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Thu, 22 Aug 2024 13:48:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20api=E8=AF=B7=E6=B1=82=E7=A4=BA?=
 =?UTF-8?q?=E4=BE=8B=E9=80=BB=E8=BE=91=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: api请求示例逻辑代码优化
---
 .../Save/Scene/Save/BranchesTabs.vue          |   5 +-
 .../Save/Scene/Save/Terms/WhenItem.vue        |   3 +-
 .../Configuration/Save/Scene/Save/utils.ts    |   5 +-
 .../Scene/Save/components/Terms/Terms.vue     | 894 +++++++++---------
 .../Platforms/Api/components/ApiDoes.vue      |   3 +-
 src/views/system/Platforms/Api/utils.ts       |  28 +-
 vite.config.ts                                |   4 +-
 7 files changed, 500 insertions(+), 442 deletions(-)

diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/BranchesTabs.vue b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/BranchesTabs.vue
index 93534cae..a2d8ace6 100644
--- a/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/BranchesTabs.vue
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/BranchesTabs.vue
@@ -13,10 +13,9 @@
           :key="group.key"
         >
           <div v-for="(branch, index) in group.children">
-            <div style="display: flex;align-items: center" v-if="show">
-              <span v-if="branch.when" style="padding-right: 12px;font-weight: bold;font-size: 16px;width: 46px; display: inline-block;">{{ index === 0 ? '当' : '否则' }}</span>
+            <div style="display: flex;align-items: center" v-if="show && branch.when.length">
+              <span  style="padding-right: 12px;font-weight: bold;font-size: 16px;width: 46px; display: inline-block;">{{ index === 0 ? '当' : '否则' }}</span>
               <Terms :when="branch.whenOptions" :data="branch.when" />
-
             </div>
             <div class="branches-shakeLimit" v-if="show">
               <span class="branches-shakeLimit-action">执行</span>
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/Terms/WhenItem.vue b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/Terms/WhenItem.vue
index 35f7636f..f7d35c68 100644
--- a/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/Terms/WhenItem.vue
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/Terms/WhenItem.vue
@@ -15,13 +15,12 @@
     </div>
     <div v-if="_value" class="dropdown-button value">
       <AIcon type='icon-canshu' />
-      {{ _value[0] }}
+      {{ typeof(_value) === 'object' ? _value[0] : _value}}
     </div>
     <div v-if="value[2][1]" class="dropdown-button value">
       <AIcon type='icon-canshu' />
       {{ _value[1] }}
     </div>
-
   </div>
 </template>
 
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/utils.ts b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/utils.ts
index 9585930c..cd0e1caf 100644
--- a/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/utils.ts
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/utils.ts
@@ -267,7 +267,10 @@ export const handleGroupAndFilter = (branches: any[], when: any[]) =>{
 
     branches.forEach((item, index) => {
         if (when) {
-            item.whenOptions = when[index]
+            // item.whenOptions = when[index]
+            item.whenOptions = when.find((i)=>{
+              return  item?.branchId === i.key
+            })
         }
 
         if (index === 0 || item.executeAnyway) {
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/Terms.vue b/src/views/rule-engine/Scene/Save/components/Terms/Terms.vue
index aac1fdb1..2b5e3b36 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/Terms.vue
+++ b/src/views/rule-engine/Scene/Save/components/Terms/Terms.vue
@@ -1,476 +1,528 @@
 <template>
-  <div class='actions-terms'>
-    <TitleComponent data='执行动作' style='font-size: 14px;' >
-    </TitleComponent>
-<!--    <template v-if='open'>-->
-      <div>
-        <j-tabs type="editable-card" v-model:activeKey="activeKey" @edit="addGroup" @tabClick="showEditCondition">
-          <j-tab-pane
-            v-for="(b, i) in group"
-            :key="b.id"
-            :closable="false"
-            :forceRender="true"
-          >
-            <template #tab>
-              <TermsTabPane :showClose="group.length > 1" @close="() => addGroup(b.id, 'close')">
-                {{ b.branchName || `条件${i+1}` }}
-              </TermsTabPane>
-            </template>
-            <div class="filterConditionSwitch">
-                <span>执行</span>
-                  <j-switch
-                      v-model:checked='b.openFilter'
-                      @change='(e)=>change(e,b,i)'
-                      checkedChildren='开'
-                      unCheckedChildren='关'
-                      style='margin-left: 4px;'
-                  />
-                 </div>
-            <template v-for='(item, index) in data.branches'>
-              <template v-if="index >= b.start && index < (b.start + b.len)">
-                <Branches
-                  v-if='!!item'
-                  :data='item'
-                  :isFirst='index === b.start'
-                  :name='index'
-                  :branches_Index='item.branches_Index'
-                  :groupLen="b.start + b.len"
-                  :groupIndex="i + 1"
-                  :key='item.key'
-                  :showGroupDelete="group.length !== 1"
-                  @delete='branchesDelete(index)'
-                  @deleteAll='branchesDeleteAll'
-                  @add="branchesAdd"
-                />
-                <div v-else class='actions-terms-warp' :style='{ marginTop: data.branches.length === 2 ? 0 : 24 }'>
-                  <div class='actions-terms-title' style='padding: 0;margin-bottom: 24px;'>
-                    否则
-                  </div>
-                  <div class='actions-terms-options no-when'>
-                    <AIcon type='PlusOutlined' class='when-add-button' @click='() => addBranches(b.start + b.len)' />
-                  </div>
-                </div>
-              </template>
-            </template>
-          </j-tab-pane>
-        </j-tabs>
-      </div>
+    <div class="actions-terms">
+        <TitleComponent data="执行动作" style="font-size: 14px">
+        </TitleComponent>
+        <!--    <template v-if='open'>-->
+        <div>
+            <j-tabs
+                type="editable-card"
+                v-model:activeKey="activeKey"
+                @edit="addGroup"
+                @tabClick="showEditCondition"
+            >
+                <j-tab-pane
+                    v-for="(b, i) in group"
+                    :key="b.id"
+                    :closable="false"
+                    :forceRender="true"
+                >
+                    <template #tab>
+                        <TermsTabPane
+                            :showClose="group.length > 1"
+                            @close="() => addGroup(b.id, 'close')"
+                        >
+                            {{ b.branchName || `条件${i + 1}` }}
+                        </TermsTabPane>
+                    </template>
+                    <div class="filterConditionSwitch">
+                        <span>执行</span>
+                        <j-switch
+                            v-model:checked="b.openFilter"
+                            @change="(e) => change(e, b, i)"
+                            checkedChildren="开"
+                            unCheckedChildren="关"
+                            style="margin-left: 4px"
+                        />
+                    </div>
+                    <template v-for="(item, index) in data.branches">
+                        <template
+                            v-if="index >= b.start && index < b.start + b.len"
+                        >
+                            <Branches
+                                v-if="!!item"
+                                :data="item"
+                                :isFirst="index === b.start"
+                                :name="index"
+                                :branches_Index="item.branches_Index"
+                                :groupLen="b.start + b.len"
+                                :groupIndex="i + 1"
+                                :key="item.key"
+                                :showGroupDelete="group.length !== 1"
+                                @delete="branchesDelete(index)"
+                                @deleteAll="branchesDeleteAll"
+                                @add="branchesAdd"
+                            />
+                            <div
+                                v-else
+                                class="actions-terms-warp"
+                                :style="{
+                                    marginTop:
+                                        data.branches.length === 2 ? 0 : 24,
+                                }"
+                            >
+                                <div
+                                    class="actions-terms-title"
+                                    style="padding: 0; margin-bottom: 24px"
+                                >
+                                    否则
+                                </div>
+                                <div class="actions-terms-options no-when">
+                                    <AIcon
+                                        type="PlusOutlined"
+                                        class="when-add-button"
+                                        @click="
+                                            () => addBranches(b.start + b.len)
+                                        "
+                                    />
+                                </div>
+                            </div>
+                        </template>
+                    </template>
+                </j-tab-pane>
+            </j-tabs>
+        </div>
 
-<!--    </template>-->
-<!--    <div v-else class='actions-branches-item'>-->
-<!--      <j-form-item-->
-<!--        :name='["branches", 0, "then"]'-->
-<!--        :rules='thenRules'-->
-<!--      >-->
-<!--        <Action-->
-<!--          :name='0'-->
-<!--          :openShakeLimit="true"-->
-<!--          :thenOptions='data.branches[0]?.then'-->
-<!--        />-->
-<!--      </j-form-item>-->
-<!--    </div>-->
-  </div>
-  <BranchesNameEdit
-    v-if="editConditionVisible"
-    :name="conditionName"
-    @cancel="editConditionVisible = false"
-    @ok="changeBranchName"
-  />
+        <!--    </template>-->
+        <!--    <div v-else class='actions-branches-item'>-->
+        <!--      <j-form-item-->
+        <!--        :name='["branches", 0, "then"]'-->
+        <!--        :rules='thenRules'-->
+        <!--      >-->
+        <!--        <Action-->
+        <!--          :name='0'-->
+        <!--          :openShakeLimit="true"-->
+        <!--          :thenOptions='data.branches[0]?.then'-->
+        <!--        />-->
+        <!--      </j-form-item>-->
+        <!--    </div>-->
+    </div>
+    <BranchesNameEdit
+        v-if="editConditionVisible"
+        :name="conditionName"
+        @cancel="editConditionVisible = false"
+        @ok="changeBranchName"
+    />
 </template>
 
-<script setup lang='ts' name='Terms'>
+<script setup lang="ts" name="Terms">
 import { storeToRefs } from 'pinia';
-import { useSceneStore } from '@/store/scene'
-import { cloneDeep } from 'lodash-es'
-import { provide } from 'vue'
-import { ContextKey, handleParamsData } from './util'
-import {getParseTerm} from '@/api/rule-engine/scene'
-import type { FormModelType} from '@/views/rule-engine/Scene/typings'
-import Branches from './Branches.vue'
-import {randomNumber, randomString} from "@/utils/utils";
-import TermsTabPane from './TermsTabPane.vue'
-import BranchesNameEdit from "./BranchesNameEdit.vue";
-import {Modal} from "ant-design-vue";
-import {queryBindScene, unBindAlarmMultiple} from "@/api/rule-engine/configuration";
+import { useSceneStore } from '@/store/scene';
+import { cloneDeep } from 'lodash-es';
+import { provide } from 'vue';
+import { ContextKey, handleParamsData } from './util';
+import { getParseTerm } from '@/api/rule-engine/scene';
+import type { FormModelType } from '@/views/rule-engine/Scene/typings';
+import Branches from './Branches.vue';
+import { randomNumber, randomString } from '@/utils/utils';
+import TermsTabPane from './TermsTabPane.vue';
+import BranchesNameEdit from './BranchesNameEdit.vue';
+import { Modal } from 'ant-design-vue';
+import {
+    queryBindScene,
+    unBindAlarmMultiple,
+} from '@/api/rule-engine/configuration';
 
-const sceneStore = useSceneStore()
-const { data } = storeToRefs(sceneStore)
-const columnOptions = ref<any>([])
-const group = ref<Array<{ id: string, len: number}>>([])
-const activeKey = ref('')
+const sceneStore = useSceneStore();
+const { data } = storeToRefs(sceneStore);
+const columnOptions = ref<any>([]);
+const group = ref<Array<{ id: string; len: number }>>([]);
+const activeKey = ref('');
 const editConditionVisible = ref(false);
-const conditionName = ref<any>()
+const conditionName = ref<any>();
 
-provide(ContextKey, columnOptions)
+provide(ContextKey, columnOptions);
 
-const change = (e: boolean,groupItem:any,index:number) => {
-  // group.value = []
-  // activeKey.value = ''
-  // if (!e) {
-  //   data.value.branches!.length = 1
-  //   data.value.branches![0].when = []
-  // } else {
-  //   data.value.branches!.push(null as any)
-  //   data.value.branches![0].when = [
-  //     {
-  //       terms: [
-  //         {
-  //           column: undefined,
-  //           value: {
-  //             source: 'fixed',
-  //             value: undefined
-  //           },
-  //           termType: undefined,
-  //           key: `params_${randomString()}`,
-  //           type: 'and',
-  //         },
-  //       ],
-  //       type: 'and',
-  //       key: `terms_${randomString()}`,
-  //     },
-  //   ]
-  // }
-  const start = groupItem.start
-  const len = groupItem.len
-  if(!e){
-    data.value.branches?.splice(start + 1 , len - 1)
-    data.value.branches![start].when = []
-    data.value.options!.when.splice(start,len - 1)
-  }else{
-    data.value.branches!.splice(start + 1,0,null)
-       data.value.branches![start].when = [
-      {
-        terms: [
-          {
-            column: undefined,
-            value: {
-              source: 'fixed',
-              value: undefined
+const change = (e: boolean, groupItem: any, index: number) => {
+    // group.value = []
+    // activeKey.value = ''
+    // if (!e) {
+    //   data.value.branches!.length = 1
+    //   data.value.branches![0].when = []
+    // } else {
+    //   data.value.branches!.push(null as any)
+    //   data.value.branches![0].when = [
+    //     {
+    //       terms: [
+    //         {
+    //           column: undefined,
+    //           value: {
+    //             source: 'fixed',
+    //             value: undefined
+    //           },
+    //           termType: undefined,
+    //           key: `params_${randomString()}`,
+    //           type: 'and',
+    //         },
+    //       ],
+    //       type: 'and',
+    //       key: `terms_${randomString()}`,
+    //     },
+    //   ]
+    // }
+    const start = groupItem.start;
+    const len = groupItem.len;
+    if (!e) {
+        data.value.branches?.splice(start + 1, len - 1);
+        data.value.branches![start].when = [];
+        // data.value.options!.when.splice(start,len - 1)
+        data.value.options!.when[start].terms = [
+            {
+                terms: [['', 'eq', '', 'and']],
             },
-            termType: undefined,
-            key: `params_${randomString()}`,
-            type: 'and',
-          },
-        ],
-        type: 'and',
-        key: `terms_${randomString()}`,
-      },
-    ]
-  }
-}
+        ];
+    } else {
+        data.value.branches!.splice(start + 1, 0, null);
+        data.value.branches![start].when = [
+            {
+                terms: [
+                    {
+                        column: undefined,
+                        value: {
+                            source: 'fixed',
+                            value: undefined,
+                        },
+                        termType: undefined,
+                        key: `params_${randomString()}`,
+                        type: 'and',
+                    },
+                ],
+                type: 'and',
+                key: `terms_${randomString()}`,
+            },
+        ];
+    }
+};
 
 const queryColumn = (dataModel: FormModelType) => {
-  const cloneDevice = cloneDeep(dataModel)
-  cloneDevice.branches = cloneDevice.branches?.filter(item => !!item)
-  getParseTerm(cloneDevice).then(res => {
-      columnOptions.value = handleParamsData(res.result as any[], 'column', '0')
-  })
-}
+    const cloneDevice = cloneDeep(dataModel);
+    cloneDevice.branches = cloneDevice.branches?.filter((item) => !!item);
+    getParseTerm(cloneDevice).then((res) => {
+        columnOptions.value = handleParamsData(
+            res.result as any[],
+            'column',
+            '0',
+        );
+    });
+};
 
 const addBranches = (len: number) => {
-  const key = randomNumber()
-  const branchesItem = {
-    when: [],
-    key: key,
-    shakeLimit: {
-      enabled: false,
-      time: 1,
-      threshold: 1,
-      alarmFirst: false,
-    },
-    then: [],
-    branchId: key
-  }
-  // const lastIndex = data.value.branches!.length - 1 || 0
-  data.value.branches?.splice(len - 1, 1, branchesItem)
-  data.value.options!.when.splice(len - 1, 1, {
-    terms: [],
-    key
-  })
-}
+    const key = randomNumber();
+    const branchesItem = {
+        when: [],
+        key: key,
+        shakeLimit: {
+            enabled: false,
+            time: 1,
+            threshold: 1,
+            alarmFirst: false,
+        },
+        then: [],
+        branchId: key,
+    };
+    // const lastIndex = data.value.branches!.length - 1 || 0
+    data.value.branches?.splice(len - 1, 1, branchesItem);
+    data.value.options!.when.splice(len - 1, 1, {
+        terms: [],
+        key,
+    });
+};
 
 const branchesDelete = (index: any) => {
-  groupDelete({
-    start: index,
-    len: 1
-  }, -1)
-}
+    groupDelete(
+        {
+            start: index,
+            len: 1,
+        },
+        -1,
+    );
+};
 
 const addGroup = (targetKey: string, action: string) => {
-  if (action === 'add') {
-    const lastGroup = group.value[group.value.length - 1]
-    const lastIndex = (lastGroup?.groupIndex || group.value.length) + 1
-    const key = randomNumber()
+    if (action === 'add') {
+        const lastGroup = group.value[group.value.length - 1];
+        const lastIndex = (lastGroup?.groupIndex || group.value.length) + 1;
+        const key = randomNumber();
 
-    const branchesItem: any = {
-      when: [
-        {
-          terms: [
-            {
-              column: undefined,
-              value: {
-                source: 'fixed',
-                value: undefined
-              },
-              termType: undefined,
-              key: `params_${randomString()}`,
-              type: 'and',
+        const branchesItem: any = {
+            when: [
+                {
+                    terms: [
+                        {
+                            column: undefined,
+                            value: {
+                                source: 'fixed',
+                                value: undefined,
+                            },
+                            termType: undefined,
+                            key: `params_${randomString()}`,
+                            type: 'and',
+                        },
+                    ],
+                    type: 'and',
+                    key: `terms_${randomString()}`,
+                },
+            ],
+            key: key,
+            shakeLimit: {
+                enabled: false,
+                time: 1,
+                threshold: 1,
+                alarmFirst: false,
             },
-          ],
-          type: 'and',
-          key: `terms_${randomString()}`,
-        },
-      ],
-      key: key,
-      shakeLimit: {
-        enabled: false,
-        time: 1,
-        threshold: 1,
-        alarmFirst: false,
-      },
-      then: [],
-      executeAnyway: true,
-      branchId: key,
-      branchName: ''
+            then: [],
+            executeAnyway: true,
+            branchId: key,
+            branchName: '',
+        };
+        data.value.branches?.push(branchesItem, null);
+        // data.value.branches?.push(null as any)
+        activeKey.value = key;
+        data.value.options!.when.push({
+            terms: [
+                {
+                    terms: [['', 'eq', '', 'and']],
+                },
+            ],
+            branchName: '',
+            key,
+            executeAnyway: true,
+            groupIndex: lastIndex,
+        });
+    } else {
+        const index = group.value.findIndex(
+            (item) => item.branchId === targetKey,
+        );
+        groupDelete(group.value[index], index);
     }
-    data.value.branches?.push(branchesItem, null)
-    // data.value.branches?.push(null as any)
-    activeKey.value = key
-    data.value.options!.when.push({
-      terms: [{
-        terms: [['','eq','','and']],
-      }],
-      branchName: '',
-      key,
-      executeAnyway: true,
-      groupIndex: lastIndex
-    })
-  } else {
-    const index = group.value.findIndex(item => item.branchId === targetKey)
-    groupDelete(group.value[index], index)
-  }
-}
+};
 
-const branchesDeleteAll = () => {
-
-}
+const branchesDeleteAll = () => {};
 
 const groupDelete = async (g: any, index: number) => {
+    // 校验当前条件下是否有数据
+    let actionLen = 0;
+    let alarmTerms: Array<Record<string, string>> = [];
 
-  // 校验当前条件下是否有数据
-  let actionLen = 0
-  let alarmTerms: Array<Record<string, string>> = []
-
-  for (let i = g.start; i < g.start + g.len; i++) {
-    const item = data.value.branches[i]
-    if (item) {
-      item.then?.forEach(thenItem => {
-        actionLen += thenItem.actions.length
-        if (thenItem.actions) {
-          thenItem.actions.forEach((actionItem) => {
-            const _actionId = actionItem.actionId
-            if (actionItem.executor === 'alarm') {
-              alarmTerms.push({
-                column: 'branchIndex',
-                value: _actionId || item.branchId,
-                type: 'or'
-              })
-            }
-          })
+    for (let i = g.start; i < g.start + g.len; i++) {
+        const item = data.value.branches[i];
+        if (item) {
+            item.then?.forEach((thenItem) => {
+                actionLen += thenItem.actions.length;
+                if (thenItem.actions) {
+                    thenItem.actions.forEach((actionItem) => {
+                        const _actionId = actionItem.actionId;
+                        if (actionItem.executor === 'alarm') {
+                            alarmTerms.push({
+                                column: 'branchIndex',
+                                value: _actionId || item.branchId,
+                                type: 'or',
+                            });
+                        }
+                    });
+                }
+            });
         }
-      })
     }
-  }
 
-  if (actionLen) {
-    if (alarmTerms.length) {
-      const resp = await queryBindScene({
-        terms: alarmTerms
-      })
+    if (actionLen) {
+        if (alarmTerms.length) {
+            const resp = await queryBindScene({
+                terms: alarmTerms,
+            });
 
-      Modal.confirm({
-        title: `已关联 ${resp.result.total} 条告警，删除该条件会同步解除对应的关联告警，确认删除？`,
-        onOk() {
-          const _data = resp.result.data.map(item => {
-            return {
-              "alarmId": item.alarmId,
-              "ruleId": item.ruleId,
-              "branchIndex": item.branchIndex
-            }
-          })
-          unBindAlarmMultiple(_data)
-          removeBranchesData(g, index)
+            Modal.confirm({
+                title: `已关联 ${resp.result.total} 条告警，删除该条件会同步解除对应的关联告警，确认删除？`,
+                onOk() {
+                    const _data = resp.result.data.map((item) => {
+                        return {
+                            alarmId: item.alarmId,
+                            ruleId: item.ruleId,
+                            branchIndex: item.branchIndex,
+                        };
+                    });
+                    unBindAlarmMultiple(_data);
+                    removeBranchesData(g, index);
+                },
+            });
+        } else {
+            Modal.confirm({
+                title: '该条件下有执行动作，确认删除？',
+                onOk() {
+                    removeBranchesData(g, index);
+                },
+            });
         }
-      })
     } else {
-      Modal.confirm({
-        title: '该条件下有执行动作，确认删除？',
-        onOk() {
-          removeBranchesData(g, index)
-        }
-      })
+        removeBranchesData(g, index);
     }
-  } else {
-    removeBranchesData(g, index)
-  }
-
-}
+};
 
 const removeBranchesData = (g: any, index: number) => {
-  const removeBranches = data.value.branches.splice(g.start, g.len)
+    const removeBranches = data.value.branches.splice(g.start, g.len);
 
-  removeBranches.forEach(item => {
-    if (item) {
-      let _index = data.value.options!.when.findIndex(whenItem => whenItem.key === item.branchId)
-      if (_index !== -1) {
-        _index = item.branches_Index
-      }
-      data.value.options!.when.splice(_index, 1)
+    removeBranches.forEach((item) => {
+        if (item) {
+            let _index = data.value.options!.when.findIndex(
+                (whenItem) => whenItem.key === item.branchId,
+            );
+            if (_index !== -1) {
+                _index = item.branches_Index;
+            }
+            data.value.options!.when.splice(_index, 1);
+        }
+    });
+
+    if (index >= 0) {
+        // 删除整个条件组
+        group.value.splice(index, 1);
+
+        if (g.id === activeKey.value) {
+            //
+            let _moveIndex = index - 1;
+
+            if (_moveIndex < 0) {
+                // 左移
+                _moveIndex = 0;
+            }
+
+            activeKey.value = group.value[_moveIndex].id;
+        }
+    } else {
+        // 单个条件删除
+        const groupItem = group.value.find(
+            (item) => item.id === activeKey.value,
+        ); // 获取当前条件组
+        groupItem!.len -= 1;
+        const branchesItem = data.value.branches[g.start];
+        if (branchesItem === undefined || branchesItem?.executeAnyway) {
+            // 当前位置为undefined或者是下一个条件组的开始 就插入null
+            data.value.branches?.splice(g.start, 0, null);
+        }
     }
-  })
-
-  if (index >= 0) { // 删除整个条件组
-    group.value.splice(index, 1)
-
-    if (g.id === activeKey.value) { //
-      let _moveIndex = index - 1
-
-      if (_moveIndex < 0) { // 左移
-        _moveIndex = 0
-      }
-
-      activeKey.value = group.value[_moveIndex].id
-    }
-  } else { // 单个条件删除
-    const groupItem = group.value.find(item => item.id === activeKey.value) // 获取当前条件组
-    groupItem!.len -= 1
-    const branchesItem = data.value.branches[g.start]
-    if (branchesItem === undefined || branchesItem?.executeAnyway) { // 当前位置为undefined或者是下一个条件组的开始 就插入null
-      data.value.branches?.splice(g.start, 0, null)
-    }
-  }
-}
+};
 
 const branchesAdd = () => {
-  // const groupItem = group.value.find(item => item.id === activeKey.value) // 获取当前条件的组
-  // groupItem!.len += 1
-}
+    // const groupItem = group.value.find(item => item.id === activeKey.value) // 获取当前条件的组
+    // groupItem!.len += 1
+};
 
-const showEditCondition = (key:any) =>{
-  if(key === activeKey.value){
-    editConditionVisible.value = true;
-    conditionName.value = group.value.find((i:any)=>{
-      return i.branchId === key
-    })?.branchName
-  }
-}
-
-const changeBranchName = (name: string) =>{
-  let _activeKey = activeKey.value
-
-  data.value.branches?.forEach((item:any)=>{
-     if(item?.branchId === _activeKey){
-      item.branchName = name
-     }
-  })
-
-  let optionsItem = data.value.options!.when.find(item => item.key === _activeKey)
-
-  if (!optionsItem) {
-    const _index = group.value.findIndex(item => item.branchId === _activeKey)
-    if (_index !== -1) {
-      data.value.options!.when[_index].branchName = name
+const showEditCondition = (key: any) => {
+    if (key === activeKey.value) {
+        editConditionVisible.value = true;
+        conditionName.value = group.value.find((i: any) => {
+            return i.branchId === key;
+        })?.branchName;
     }
-  } else {
-    optionsItem.branchName = name
-  }
+};
 
-  editConditionVisible.value =false
-}
+const changeBranchName = (name: string) => {
+    let _activeKey = activeKey.value;
+
+    data.value.branches?.forEach((item: any) => {
+        if (item?.branchId === _activeKey) {
+            item.branchName = name;
+        }
+    });
+
+    let optionsItem = data.value.options!.when.find(
+        (item) => item.key === _activeKey,
+    );
+
+    if (!optionsItem) {
+        const _index = group.value.findIndex(
+            (item) => item.branchId === _activeKey,
+        );
+        if (_index !== -1) {
+            data.value.options!.when[_index].branchName = name;
+        }
+    } else {
+        optionsItem.branchName = name;
+    }
+
+    editConditionVisible.value = false;
+};
 
 const changePaneIndex = (index) => {
-  const _groupItem = group.value.find(item => {
-    return item.start >= index && index < (item.start + item.len)
-  })
+    const _groupItem = group.value.find((item) => {
+        return item.start >= index && index < item.start + item.len;
+    });
 
-  if (_groupItem) {
-    activeKey.value = _groupItem.branchId
-  }
-
-}
-
-watchEffect(() => {
-  if (data.value.trigger?.device) {
-    queryColumn({ trigger: data.value.trigger })
-  }
-})
-
-watchEffect(() => {
-  const branches = data.value.branches
-  let _group = []
-  let _branchesIndex = 0
-  if (branches) {
-    branches.forEach((item, index) => {
-
-      const lastIndex = _group.length - 1
-
-      let whenItem = data.value.options!.when.find(when => item?.branchId === when.key)
-
-      if (!whenItem) {
-        whenItem = data.value.options!.when[_branchesIndex]
-      }
-
-
-      if (index === 0 || item?.executeAnyway) {
-        _group[lastIndex + 1] = {
-          id: item.branchId,
-          len: 1,
-          start: index,
-          branchKey: item.key,
-          branchId: item.branchId,
-          // branchName: item.branchName || whenItem?.branchName || `条件 ${_branchesIndex + 1}`,
-          branchName: item.branchName || whenItem?.branchName || `条件`,
-          groupIndex: _branchesIndex,
-          openFilter: !!item.when.length
-        }
-
-      } else {
-        _group[lastIndex].len += 1
-      }
-
-      if (item) {
-        item.branches_Index = _branchesIndex
-        _branchesIndex += 1
-      }
-    })
-
-    // branches.filter(item => item).forEach((item, index) => {
-    //   item.branches_Index = index
-    // })
-
-    group.value = _group
-    if (!activeKey.value) {
-      activeKey.value = _group[0].id
+    if (_groupItem) {
+        activeKey.value = _groupItem.branchId;
     }
-  }
-})
+};
+
+watchEffect(() => {
+    if (data.value.trigger?.device) {
+        queryColumn({ trigger: data.value.trigger });
+    }
+});
+
+watchEffect(() => {
+    const branches = data.value.branches;
+    let _group = [];
+    let _branchesIndex = 0;
+    if (branches) {
+        branches.forEach((item, index) => {
+            const lastIndex = _group.length - 1;
+
+            let whenItem = data.value.options!.when.find(
+                (when) => item?.branchId === when.key,
+            );
+
+            if (!whenItem) {
+                whenItem = data.value.options!.when[_branchesIndex];
+            }
+
+            if (index === 0 || item?.executeAnyway) {
+                _group[lastIndex + 1] = {
+                    id: item.branchId,
+                    len: 1,
+                    start: index,
+                    branchKey: item.key,
+                    branchId: item.branchId,
+                    // branchName: item.branchName || whenItem?.branchName || `条件 ${_branchesIndex + 1}`,
+                    branchName:
+                        item.branchName || whenItem?.branchName || `条件`,
+                    groupIndex: _branchesIndex,
+                    openFilter: !!item.when.length,
+                };
+            } else {
+                _group[lastIndex].len += 1;
+            }
+
+            if (item) {
+                item.branches_Index = _branchesIndex;
+                _branchesIndex += 1;
+            }
+        });
+
+        // branches.filter(item => item).forEach((item, index) => {
+        //   item.branches_Index = index
+        // })
+
+        group.value = _group;
+        if (!activeKey.value) {
+            activeKey.value = _group[0].id;
+        }
+    }
+});
 
 defineExpose({
-  changePaneIndex
-})
-
+    changePaneIndex,
+});
 </script>
 
-<style scoped lang='less'>
+<style scoped lang="less">
 .actions-terms {
-  :deep(.ant-tabs-tab-active) {
-    .ant-tabs-tab-remove {
-      color: #fff;
+    :deep(.ant-tabs-tab-active) {
+        .ant-tabs-tab-remove {
+            color: #fff;
+        }
     }
-  }
 }
-.filterConditionSwitch{
-  display: flex;
+.filterConditionSwitch {
+    display: flex;
     gap: 16px;
     align-items: center;
     margin-bottom: 16px;
diff --git a/src/views/system/Platforms/Api/components/ApiDoes.vue b/src/views/system/Platforms/Api/components/ApiDoes.vue
index a3fc194e..c6611a24 100644
--- a/src/views/system/Platforms/Api/components/ApiDoes.vue
+++ b/src/views/system/Platforms/Api/components/ApiDoes.vue
@@ -154,9 +154,7 @@ const requestCard = reactive<cardType>({
         // schema不是Java中的类的话则不进行解析，直接结束
         if (!_ref) {
             const type = schema.type || '';
-            console.log(type,'type')
             requestCard.codeText = dealNoRef(type, schema);
-            console.log(requestCard.codeText)
         } else {
             const schemaName = _ref?.split('/').pop();
             const type = schema.type || '';
@@ -180,6 +178,7 @@ const requestCard = reactive<cardType>({
                     })),
                 },
             ];
+            // console.log(requestCard,'requestCard')
         }
     },
 });
diff --git a/src/views/system/Platforms/Api/utils.ts b/src/views/system/Platforms/Api/utils.ts
index 99677e11..0db68e83 100644
--- a/src/views/system/Platforms/Api/utils.ts
+++ b/src/views/system/Platforms/Api/utils.ts
@@ -6,9 +6,9 @@ import { schemaObjType } from "./typing";
  * @param schemas 实体类map
  * @param schemaName 实体类名称
  */
-export function findData(schemas: object, schemaName: string) {
+export function findData(schemas: object, schemaName: string , paths:string[]=[]) {
     const basicType = ['string', 'integer', 'boolean','number'];
-
+   
     if (!schemaName || !schemas[schemaName]) {
         return [];
     }
@@ -16,17 +16,21 @@ export function findData(schemas: object, schemaName: string) {
     const schema = schemas[schemaName];
     Object.entries(schema.properties).forEach((item: [string, any]) => {
         const paramsType =
-            item[1].type ||
             (item[1].$ref && item[1].$ref.split('/').pop()) ||
-            (item[1].items && item[1].items.$ref.split('/').pop()) ||
+            (item[1].items?.$ref && item[1].items.$ref.split('/').pop()) ||
+            item[1].item?.type ||
+            item[1].type ||
             '';
         const schemaObj: schemaObjType = {
             paramsName: item[0],
             paramsType,
             desc: item[1].description || '',
         };
-        if (!basicType.includes(paramsType))
-            schemaObj.children = findData(schemas, paramsType);
+      
+        if (!basicType.includes(paramsType) && paths.filter(path=>path === schemaName).length >=2 ){
+            paths.push(schemaName)
+            schemaObj.children =  findData(schemas, paramsType);
+        }
         result.push(schemaObj);
     });
 
@@ -68,16 +72,18 @@ export function getCodeText(
             default: {
                 const properties = schemas[item.paramsType]?.properties as object || {};
                 const newArr = Object.entries(properties).map(
-                    (item: [string, any]) => ({
+                    (item: [string, any]) => {
+                        return{
                         paramsName: item[0],
                         paramsType: level
-                            ? (item[1].$ref && item[1].$ref.split('/').pop()) ||
-                            (item[1].items &&
+                            ?   (item[1].$ref && item[1].$ref.split('/').pop()) ||
+                            (item[1].items?.$ref &&
                                 item[1].items.$ref.split('/').pop()) ||
-                            item[1].type ||
+                                item[1].item?.type ||
+                                item[1].type ||
                             ''
                             : item[1].type,
-                    }),
+                    }},
                 );
                 result[item.paramsName] = getCodeText(
                     schemas,
diff --git a/vite.config.ts b/vite.config.ts
index f286ff80..a2f0d845 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -96,8 +96,8 @@ export default defineConfig(({ mode}) => {
                   // target: 'http://192.168.32.244:8881',
                 //   target: 'http://192.168.32.217:8844', //张本地
                 //   target: 'http://120.77.179.54:8844', // 120测试
-                // target: 'http://192.168.33.46:8844', // 本地开发环境
-                target: 'http://192.168.33.97:8844', // 本地开发环境1
+                target: 'http://192.168.33.46:8844', // 本地开发环境
+                // target: 'http://192.168.33.99:8844', // 本地开发环境1
                 // target: 'http://192.168.33.6:38848', // 社区版开发环境
                 //   target: 'http://192.168.32.207:8844', // 刘本地
                 //   target: 'http://192.168.32.187:8844', // 谭本地

From e4c47d1fe7fec0d681214a9b993bbea5ef257572 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Thu, 22 Aug 2024 13:49:17 +0800
Subject: [PATCH 2/2] update: docker version

---
 build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index 473d0d4d..dfb2f698 100644
--- a/build.sh
+++ b/build.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-docker build -t registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.3.0-SNAPSHOT .
-docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.3.0-SNAPSHOT
+docker build -t registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.2.0 .
+docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.2.0