lj1559651600@163.com 6 днів тому
батько
коміт
ae93771a05

+ 27 - 33
.idea/workspace.xml

@@ -4,24 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="41cd2400-3735-4e1a-9a77-7ea2e4a1c041" name="更改" comment="合并冲突">
-      <change afterPath="$PROJECT_DIR$/apps/web/src/components/SetterCommon/condition/BranchCard.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/apps/web/src/components/SetterCommon/condition/ConditionBuilder.vue" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/apps/web/src/components/SetterCommon/condition/VariablePicker.vue" afterDir="false" />
+    <list default="true" id="41cd2400-3735-4e1a-9a77-7ea2e4a1c041" name="更改" comment="update">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/web/components.d.ts" beforeDir="false" afterPath="$PROJECT_DIR$/apps/web/components.d.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/web/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/apps/web/package.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/web/src/components/SetterCommon/Code/CodeEditor.vue" beforeDir="false" afterPath="$PROJECT_DIR$/apps/web/src/components/SetterCommon/Code/CodeEditor.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/web/src/components/SetterCommon/Code/InputVariables.vue" beforeDir="false" afterPath="$PROJECT_DIR$/apps/web/src/components/SetterCommon/Code/InputVariables.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/web/src/components/SetterCommon/Code/OutputVariables.vue" beforeDir="false" afterPath="$PROJECT_DIR$/apps/web/src/components/SetterCommon/Code/OutputVariables.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/web/src/components/SetterCommon/Code/TabGroup.vue" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/apps/web/src/components/SetterCommon/Code/TestConfig.vue" beforeDir="false" afterPath="$PROJECT_DIR$/apps/web/src/components/SetterCommon/Code/TestConfig.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/web/src/components/setter/CodeSetter.vue" beforeDir="false" afterPath="$PROJECT_DIR$/apps/web/src/components/setter/CodeSetter.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/web/src/components/setter/ConditionSetter.vue" beforeDir="false" afterPath="$PROJECT_DIR$/apps/web/src/components/setter/ConditionSetter.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/web/src/main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/apps/web/src/main.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/web/src/views/Editor.vue" beforeDir="false" afterPath="$PROJECT_DIR$/apps/web/src/views/Editor.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/apps/web/vite.config.ts" beforeDir="false" afterPath="$PROJECT_DIR$/apps/web/vite.config.ts" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pnpm-lock.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pnpm-lock.yaml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -53,21 +38,21 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;feature-0123-Ai-workFlow&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/Users/liujie/Desktop/shalu/shalu-agent-workflow&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;pnpm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.keymap&quot;,
-    &quot;ts.external.directory.path&quot;: &quot;/Users/liujie/Desktop/shalu/shalu-agent-workflow/node_modules/typescript/lib&quot;,
-    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "git-widget-placeholder": "main",
+    "last_opened_file_path": "/Users/liujie/Desktop/shalu/shalu-agent-workflow",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "pnpm",
+    "settings.editor.selected.configurable": "preferences.keymap",
+    "ts.external.directory.path": "/Users/liujie/Desktop/shalu/shalu-agent-workflow/node_modules/typescript/lib",
+    "vue.rearranger.settings.migration": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/apps/web/src/components/SetterCommonComponents/Code" />
@@ -138,7 +123,15 @@
       <option name="project" value="LOCAL" />
       <updated>1769523432476</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="update">
+      <option name="closed" value="true" />
+      <created>1769537149075</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1769537149075</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -157,6 +150,7 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="合并冲突" />
-    <option name="LAST_COMMIT_MESSAGE" value="合并冲突" />
+    <MESSAGE value="update" />
+    <option name="LAST_COMMIT_MESSAGE" value="update" />
   </component>
-</project>
+</project>

+ 4 - 4
apps/web/src/components/SetterCommon/Code/TestConfig.vue

@@ -26,10 +26,10 @@
             </label>
             <ElSelect v-model="config.errorHandling" @change="handleConfigChange"
                 class="w-full px-3 py-2 text-sm border border-gray-200 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 bg-white">
-                <el-option value="none"></el-option>
-                <el-option value="stop">停止执行</el-option>
-                <el-option value="continue">继续执行</el-option>
-                <el-option value="retry">重试</el-option>
+                <el-option value="none" label="无"></el-option>
+                <el-option value="stop" label="停止执行"></el-option>
+                <el-option value="continue" label="继续执行"></el-option>
+                <el-option value="retry" label="重试"></el-option>
             </ElSelect>
         </div>
     </div>