From 1bb041847d2d4a6a490d991126dd8ae6d83d1179 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 11 七月 2024 10:28:55 +0800
Subject: [PATCH] sample
---
jrj/xframe/kobject/kdwgrid.hpp | 3 +++
jrj/project/business/ProductSample/OutstoreSample3Win.cpp | 0
jrj/xframe/xcontrol/xdwgrid.hpp | 5 +++++
jrj/ext-jrj/ext-jrj.vcxproj | 6 ++++--
jrj/project/business/ProductSample/InstoreSample3Win.cpp | 0
jrj/ext-jrj/ext-jrj.vcxproj.filters | 6 ++++++
6 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 1e4088f..5a281d9 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -127,7 +127,7 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableUAC>false</EnableUAC>
- <AdditionalDependencies>xarch.shape.lib;xarch.base.lib;xarch.util.lib;xarch.network.lib;xarch.xframe.lib;xarch.xcontrol.lib;xoffice.xcell.lib;xoffice.xgrid.lib;xoffice.xreport.lib;xoffice.frame.lib;shlwapi.lib;xoffice.xflow.lib;comsuppw.lib;%(AdditionalDependencies);$(CoreLibraryDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>xarch.shape.lib;xarch.base.lib;xarch.util.lib;xarch.network.lib;xarch.xframe.lib;xarch.xcontrol.lib;xoffice.xcell.lib;xoffice.xgrid.lib;xoffice.xreport.lib;xoffice.frame.lib;shlwapi.lib;xoffice.xflow.lib;comsuppw.lib;tsclib.lib;%(AdditionalDependencies);$(CoreLibraryDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>D:\xclient64</AdditionalLibraryDirectories>
</Link>
<PostBuildEvent>
@@ -507,7 +507,9 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\ProductSample\CheckOut.instore.Sample.cpp" />
- <ClCompile Include="..\project\business\ProductSample\InstoreSample3Win.cpp" />
+ <ClCompile Include="..\project\business\ProductSample\InstoreSample3Win.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\project\business\ProductSample\OutstoreSample3Win.cpp" />
<ClCompile Include="..\project\business\ProductSample\SampleBarcodePrint.cpp" />
<ClCompile Include="..\project\business\Public\GroupManagerList.cpp">
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index 86be6e2..c3625f5 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.filters
@@ -809,5 +809,11 @@
<ClCompile Include="..\project\business\ProductSample\OutstoreSample3Win.cpp">
<Filter>project\business\ProductSample</Filter>
</ClCompile>
+ <ClCompile Include="..\project\business\ProductSample\CheckOut.instore.Sample.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\ProductSample\SampleBarcodePrint.cpp">
+ <Filter>婧愭枃浠�</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/jrj/project/business/ProductSample/InstoreSample3Win.cpp b/jrj/project/business/ProductSample/InstoreSample3Win.cpp
index 7afccab..d359638 100644
--- a/jrj/project/business/ProductSample/InstoreSample3Win.cpp
+++ b/jrj/project/business/ProductSample/InstoreSample3Win.cpp
Binary files differ
diff --git a/jrj/project/business/ProductSample/OutstoreSample3Win.cpp b/jrj/project/business/ProductSample/OutstoreSample3Win.cpp
index 1049ff9..81a83f0 100644
--- a/jrj/project/business/ProductSample/OutstoreSample3Win.cpp
+++ b/jrj/project/business/ProductSample/OutstoreSample3Win.cpp
Binary files differ
diff --git a/jrj/xframe/kobject/kdwgrid.hpp b/jrj/xframe/kobject/kdwgrid.hpp
index f44ac80..702d8cc 100644
--- a/jrj/xframe/kobject/kdwgrid.hpp
+++ b/jrj/xframe/kobject/kdwgrid.hpp
@@ -238,6 +238,9 @@
public:
void ResetRepeats();
void AddRepeats(wchar_t* colName);
+ public:
+ void ShowEditor();
+
};
}}
}}
diff --git a/jrj/xframe/xcontrol/xdwgrid.hpp b/jrj/xframe/xcontrol/xdwgrid.hpp
index 656d9d3..8525154 100644
--- a/jrj/xframe/xcontrol/xdwgrid.hpp
+++ b/jrj/xframe/xcontrol/xdwgrid.hpp
@@ -334,6 +334,11 @@
return getKReport()->AddRepeats(colName);
}
public:
+ void ShowEditor()
+ {
+ getKReport()->ShowEditor();
+ }
+public:
LPCTSTR GetColumnProp(int nCol, LPCTSTR pItem)
{
return L"";
--
Gitblit v1.9.3