From 9c190b7a9a845bcb35d3d09d255f12d9c879e403 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 23 十月 2024 18:07:50 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/ext-jrj/ext-jrj.vcxproj.filters | 163 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 98 insertions(+), 65 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index 3ac429a..0f6abff 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.filters
@@ -130,6 +130,12 @@
<Filter Include="devloper">
<UniqueIdentifier>{3df44a8b-be7b-441e-8310-dba7612e94e3}</UniqueIdentifier>
</Filter>
+ <Filter Include="jarch">
+ <UniqueIdentifier>{624fd2b8-58b5-415c-8331-dc0afbd991e7}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="jarch.impl">
+ <UniqueIdentifier>{4d691658-8fdc-4c09-8cfa-d8fa62419ef3}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="framework.h">
@@ -384,77 +390,86 @@
<ClInclude Include="..\xframe\devloper\XDevEditPage.cpp">
<Filter>devloper</Filter>
</ClInclude>
- <ClInclude Include="..\jarch.impl\JStringImpl.hpp">
- <Filter>澶存枃浠�</Filter>
+ <ClInclude Include="JAlloc.hpp">
+ <Filter>jarch</Filter>
</ClInclude>
<ClInclude Include="..\jarch\JByteStream.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch</Filter>
</ClInclude>
<ClInclude Include="..\jarch\JCharStream.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch</Filter>
</ClInclude>
<ClInclude Include="..\jarch\JConnect.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch</Filter>
</ClInclude>
<ClInclude Include="..\jarch\JDataSet.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch</Filter>
</ClInclude>
<ClInclude Include="..\jarch\JDataSource.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch</Filter>
</ClInclude>
<ClInclude Include="..\jarch\JDataStore.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch</Filter>
</ClInclude>
<ClInclude Include="..\jarch\JDouble.hpp">
- <Filter>澶存枃浠�</Filter>
- </ClInclude>
- <ClInclude Include="..\jarch\JInt.hpp">
- <Filter>澶存枃浠�</Filter>
- </ClInclude>
- <ClInclude Include="..\jarch\JObject.hpp">
- <Filter>澶存枃浠�</Filter>
- </ClInclude>
- <ClInclude Include="..\jarch\JObjectSvr.hpp">
- <Filter>澶存枃浠�</Filter>
- </ClInclude>
- <ClInclude Include="..\jarch\JSession.hpp">
- <Filter>澶存枃浠�</Filter>
- </ClInclude>
- <ClInclude Include="..\jarch\JStream.hpp">
- <Filter>澶存枃浠�</Filter>
- </ClInclude>
- <ClInclude Include="..\jarch\JString.hpp">
- <Filter>澶存枃浠�</Filter>
- </ClInclude>
- <ClInclude Include="..\jarch\JWin.hpp">
- <Filter>澶存枃浠�</Filter>
- </ClInclude>
- <ClInclude Include="..\jarch\JXPage.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch</Filter>
</ClInclude>
<ClInclude Include="JFactory.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch</Filter>
</ClInclude>
<ClInclude Include="JFactoryStringImpl.h">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JInt.hpp">
+ <Filter>jarch</Filter>
</ClInclude>
<ClInclude Include="JItemAlloc.hpp">
- <Filter>澶存枃浠�</Filter>
- </ClInclude>
- <ClInclude Include="JPtr.hpp">
- <Filter>澶存枃浠�</Filter>
- </ClInclude>
- <ClInclude Include="JAlloc.hpp">
- <Filter>澶存枃浠�</Filter>
- </ClInclude>
- <ClInclude Include="JPlatform.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch</Filter>
</ClInclude>
<ClInclude Include="JLang.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JObject.hpp">
+ <Filter>jarch</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JObjectSvr.hpp">
+ <Filter>jarch</Filter>
+ </ClInclude>
+ <ClInclude Include="JPlatform.hpp">
+ <Filter>jarch</Filter>
+ </ClInclude>
+ <ClInclude Include="JPtr.hpp">
+ <Filter>jarch</Filter>
</ClInclude>
<ClInclude Include="JScript.hpp">
- <Filter>澶存枃浠�</Filter>
+ <Filter>jarch</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JSession.hpp">
+ <Filter>jarch</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JStream.hpp">
+ <Filter>jarch</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JString.hpp">
+ <Filter>jarch</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch.impl\JStringImpl.hpp">
+ <Filter>jarch</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JWin.hpp">
+ <Filter>jarch</Filter>
+ </ClInclude>
+ <ClInclude Include="..\jarch\JXPage.hpp">
+ <Filter>jarch</Filter>
+ </ClInclude>
+ <ClInclude Include="JGui.hpp">
+ <Filter>jarch</Filter>
+ </ClInclude>
+ <ClInclude Include="..\xframe\kobject\kxsedit.hpp">
+ <Filter>xframe\kobject</Filter>
+ </ClInclude>
+ <ClInclude Include="..\xframe\xcontrol\xsedit.hpp">
+ <Filter>xframe\xcontrol</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
@@ -1358,18 +1373,6 @@
<ClCompile Include="..\project\business\ProductSample\BusinessProduct3.cpp">
<Filter>project\business\ProductSample</Filter>
</ClCompile>
- <ClCompile Include="..\jarch.impl\JStringImpl.cpp">
- <Filter>婧愭枃浠�</Filter>
- </ClCompile>
- <ClCompile Include="JFactoryStringImpl.cpp">
- <Filter>婧愭枃浠�</Filter>
- </ClCompile>
- <ClCompile Include="JItemAlloc.cpp">
- <Filter>婧愭枃浠�</Filter>
- </ClCompile>
- <ClCompile Include="JPtr.cpp">
- <Filter>婧愭枃浠�</Filter>
- </ClCompile>
<ClCompile Include="..\project\business\PO\BigPictureView.Product3.cpp">
<Filter>project\business\PO</Filter>
</ClCompile>
@@ -1394,17 +1397,47 @@
<ClCompile Include="..\project\business\Expense\CommodityInspectionExpense.cpp">
<Filter>project\business\Expense</Filter>
</ClCompile>
- <ClCompile Include="JAlloc.cpp">
- <Filter>婧愭枃浠�</Filter>
+ <ClCompile Include="JAllocImpl.cpp">
+ <Filter>jarch.impl</Filter>
</ClCompile>
- <ClCompile Include="JPlatform.cpp">
- <Filter>婧愭枃浠�</Filter>
+ <ClCompile Include="JFactoryStringImpl.cpp">
+ <Filter>jarch.impl</Filter>
+ </ClCompile>
+ <ClCompile Include="JItemAlloc.cpp">
+ <Filter>jarch.impl</Filter>
</ClCompile>
<ClCompile Include="JLang.cpp">
- <Filter>婧愭枃浠�</Filter>
+ <Filter>jarch.impl</Filter>
+ </ClCompile>
+ <ClCompile Include="JPlatform.cpp">
+ <Filter>jarch.impl</Filter>
+ </ClCompile>
+ <ClCompile Include="JPtr.cpp">
+ <Filter>jarch.impl</Filter>
</ClCompile>
<ClCompile Include="JScript.cpp">
- <Filter>婧愭枃浠�</Filter>
+ <Filter>jarch.impl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\jarch.impl\JStringImpl.cpp">
+ <Filter>jarch.impl</Filter>
+ </ClCompile>
+ <ClCompile Include="JGuiImpl.cpp">
+ <Filter>jarch.impl</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SO\select.gdnitem.so.cpp">
+ <Filter>project\business\SO</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\maint.Document.Test.v3.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
+ <ClCompile Include="..\xframe\devloper\sqlwatch.cpp">
+ <Filter>devloper</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Quote\QuoteFilePurch2Select.cpp">
+ <Filter>project\business\Quote</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\PO\paymentmethod.cpp">
+ <Filter>project\business\PO</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
--
Gitblit v1.9.3