update

LiFan

2024-07-03 dc2beee129c1b258e9444fee073ef74cceb879ed

update

 jrj/ext-jrj/ext-jrj.vcxproj

@@ -270,11 +270,11 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\HR\AdministrativeDepartment.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\HR\AdministrativeDepartmentFolder.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\HR\BlankExcelTemplate.cpp">
@@ -288,7 +288,7 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\HR\ManpowerFileWindow.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\PO\business4.cpp">

 jrj/project/business/HR/AdministrativeDepartment.cpp

@@ -121,7 +121,7 @@
        int OnPreRetrieve()
        {
            HTREEITEM hItem = tv_folder.GetSelectedItem();
            if (hItem <= 0) return 1;
            if (!hItem ) return 1;

            //int     hCursor = xutil::SetCursorWait();
            KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
@@ -152,7 +152,7 @@
            if (changeddlb)
                return 1;
            HTREEITEM hItem = tv_folder.GetSelectedItem();
            if (hItem <= 0)
            if (!hItem)
                return 1;
            HTREEITEM child = tv_folder.GetChildItem(hItem);
            if (!child) {
@@ -178,7 +178,7 @@
        int OnAdd()
        {
            HTREEITEM hItem = tv_folder.GetSelectedItem();
            if (hItem <= 0)
            if (!hItem )
                return 1;
            HCURSOR hCursor = xutil::SetCursorWait();
            KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
@@ -304,6 +304,7 @@
            AttachEvent(L"WM_XCOMMAND", (FEvent)&ViewAdministrativeDepartmentList::OnXCommand);
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&ViewAdministrativeDepartmentList::OnSetFocus);
            return 1;
        }

        /*

 jrj/project/business/HR/AdministrativeDepartmentFolder.cpp

@@ -109,6 +109,7 @@
            AttachEvent(L"WM_XCOMMAND", (FEvent)&AdministrativeDepartmentFolderView::OnXCommand);
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&AdministrativeDepartmentFolderView::OnSetFocus);
            return 1;
        }

        int  OnParentRetrieve()

 jrj/project/business/HR/ManpowerFileWindow.cpp

@@ -110,6 +110,7 @@
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&ViewManpowerFileWiondow::OnSetFocus);
            AttachEvent(L"dw_base", L"DWV_ITEMCHANGING", (FEvent)&ViewManpowerFileWiondow::OnItemChanging);
            return 1;
        }

        int OnItemChanging(TEvent* evt, LPARAM p)
@@ -118,6 +119,9 @@
            xstring colname = hdr.colname;
            xstring value = hdr.data;
            int row = hdr.row;
#if 0



            if (value == L"") return 1;
            xstring cellType = dw_base.GetColumnProp(colname, L"celltype");
@@ -131,6 +135,8 @@
                    return 1;
                }
            }
#endif // 0
            return 1;
        }

        int  OnRetrieve()