|
@@ -4,12 +4,7 @@
|
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
<option name="autoReloadType" value="SELECTIVE" />
|
|
|
</component>
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="41cd2400-3735-4e1a-9a77-7ea2e4a1c041" name="更改" comment="合并冲突">
|
|
|
|
|
- <change afterPath="$PROJECT_DIR$/apps/web/store/componentsMap.ts" afterDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/apps/web/src/components/setter/HttpSetter.vue" beforeDir="false" afterPath="$PROJECT_DIR$/apps/web/src/components/setter/HttpSetter.vue" afterDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/apps/web/src/components/setter/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/apps/web/src/components/setter/index.vue" afterDir="false" />
|
|
|
|
|
- <change beforePath="$PROJECT_DIR$/pnpm-lock.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pnpm-lock.yaml" afterDir="false" />
|
|
|
|
|
- </list>
|
|
|
|
|
|
|
+ <list default="true" id="41cd2400-3735-4e1a-9a77-7ea2e4a1c041" name="更改" comment="update" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
@@ -21,7 +16,7 @@
|
|
|
<component name="Git.Settings">
|
|
<component name="Git.Settings">
|
|
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
|
|
<map>
|
|
<map>
|
|
|
- <entry key="$PROJECT_DIR$" value="main" />
|
|
|
|
|
|
|
+ <entry key="$PROJECT_DIR$" value="feature-0123-Ai-workFlow" />
|
|
|
</map>
|
|
</map>
|
|
|
</option>
|
|
</option>
|
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
@@ -30,6 +25,9 @@
|
|
|
"associatedIndex": 7
|
|
"associatedIndex": 7
|
|
|
}</component>
|
|
}</component>
|
|
|
<component name="ProjectId" id="38m4mc5E2lcGRA9UjefZP9wo9yp" />
|
|
<component name="ProjectId" id="38m4mc5E2lcGRA9UjefZP9wo9yp" />
|
|
|
|
|
+ <component name="ProjectLevelVcsManager" settingsEditedManually="true">
|
|
|
|
|
+ <ConfirmationsSetting value="2" id="Add" />
|
|
|
|
|
+ </component>
|
|
|
<component name="ProjectViewState">
|
|
<component name="ProjectViewState">
|
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
|
<option name="showLibraryContents" value="true" />
|
|
<option name="showLibraryContents" value="true" />
|
|
@@ -37,7 +35,7 @@
|
|
|
<component name="PropertiesComponent"><![CDATA[{
|
|
<component name="PropertiesComponent"><![CDATA[{
|
|
|
"keyToString": {
|
|
"keyToString": {
|
|
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
- "git-widget-placeholder": "feature-0123-Ai-workFlow",
|
|
|
|
|
|
|
+ "git-widget-placeholder": "main",
|
|
|
"last_opened_file_path": "/Users/liujie/Desktop/shalu/shalu-agent-workflow",
|
|
"last_opened_file_path": "/Users/liujie/Desktop/shalu/shalu-agent-workflow",
|
|
|
"node.js.detected.package.eslint": "true",
|
|
"node.js.detected.package.eslint": "true",
|
|
|
"node.js.detected.package.tslint": "true",
|
|
"node.js.detected.package.tslint": "true",
|
|
@@ -102,7 +100,15 @@
|
|
|
<option name="project" value="LOCAL" />
|
|
<option name="project" value="LOCAL" />
|
|
|
<updated>1769393225277</updated>
|
|
<updated>1769393225277</updated>
|
|
|
</task>
|
|
</task>
|
|
|
- <option name="localTasksCounter" value="5" />
|
|
|
|
|
|
|
+ <task id="LOCAL-00005" summary="update">
|
|
|
|
|
+ <option name="closed" value="true" />
|
|
|
|
|
+ <created>1769536842611</created>
|
|
|
|
|
+ <option name="number" value="00005" />
|
|
|
|
|
+ <option name="presentableId" value="LOCAL-00005" />
|
|
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
|
|
+ <updated>1769536842611</updated>
|
|
|
|
|
+ </task>
|
|
|
|
|
+ <option name="localTasksCounter" value="6" />
|
|
|
<servers />
|
|
<servers />
|
|
|
</component>
|
|
</component>
|
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
<component name="TypeScriptGeneratedFilesManager">
|
|
@@ -121,6 +127,8 @@
|
|
|
</component>
|
|
</component>
|
|
|
<component name="VcsManagerConfiguration">
|
|
<component name="VcsManagerConfiguration">
|
|
|
<MESSAGE value="合并冲突" />
|
|
<MESSAGE value="合并冲突" />
|
|
|
- <option name="LAST_COMMIT_MESSAGE" value="合并冲突" />
|
|
|
|
|
|
|
+ <MESSAGE value="编写条件判断" />
|
|
|
|
|
+ <MESSAGE value="update" />
|
|
|
|
|
+ <option name="LAST_COMMIT_MESSAGE" value="update" />
|
|
|
</component>
|
|
</component>
|
|
|
</project>
|
|
</project>
|