Explorar o código

网址不能黏贴的问题

lqq %!s(int64=8) %!d(string=hai) anos
pai
achega
6a9a655352

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
AppCom/AppCentreCom.dproj


BIN=BIN
AppCom/AppCentreCom.res


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
CA/CA.dproj


BIN=BIN
CA/CA.res


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
COM/RealICQCOMInterfaces/RealICQCOMInterfaces.dproj


BIN=BIN
COM/RealICQCOMInterfaces/RealICQCOMInterfaces.res


+ 1 - 1
Client/FormController/MainFormFooter.pas

@@ -35,7 +35,7 @@ type
 var
   MainFrmFooter: TMainFrmFooter;
 
-{$I LXTalk.inc}
+{$I ..\LXTalk.inc}
 
 implementation
 

+ 2 - 2
Client/LXTalk.inc

@@ -1,7 +1,7 @@
 {.$DEFINE OldGroup}
 
 //用于宁夏企税通
-{$DEFINE NXQST}
+{.$DEFINE NXQST}
 
 //用于丽水市办公助手
-{.$DEFINE LSSBGZS}
+{$DEFINE LSSBGZS}

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
Client/Lxtalk.dproj


BIN=BIN
Client/Lxtalk.res


+ 1 - 1
Client/TalkingFrm.dfm

@@ -9079,7 +9079,7 @@ object TalkingForm: TTalkingForm
     Left = 48
     Top = 312
     Bitmap = {
-      494C0101040009002C0210001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010104000900300210001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000002000000001002000000000000020
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000

+ 12 - 37
Client/TalkingFrm.pas

@@ -4396,14 +4396,8 @@ begin
   Result := ws;
 end;
 
-//------------------------------------------------------------------------------
-
-
 function TTalkingForm.PasteImage(AUseTemp: Boolean = True): Boolean;
 var
-  //vMetafile:   TMetafile;
-
-
   Picture: TPicture;
   Bitmap: TBitmap;
   GIF: TGIFImage;
@@ -4425,16 +4419,9 @@ begin
   Result := False;
   ClipboardText := Clipboard.AsText;
 
+  /// 如果复制内容是文件
   if Clipboard.HasFormat(CF_HDROP) and ((not Clipboard.HasFormat(CF_METAFILEPICT)) and (not Clipboard.HasFormat(CF_PICTURE))) then
   begin
-//    if FCategory = tcTeam then
-//    begin
-//      Result := True;
-//      Exit;
-//    end;
-
-
-
     GetMem(PFileName, MAX_PATH + 1);
     DataHandle := Clipboard.GetAsHandle(CF_HDROP);
     FilesCount := DragQueryFile(DataHandle, MAXDWORD, PFileName, MAX_PATH);
@@ -4469,6 +4456,7 @@ begin
 
   //粘贴HTML数据
   CF_HTML := RegisterClipboardFormat('HTML Format');
+  ///如果复制内容是HTML
   if Clipboard.HasFormat(CF_HTML) and not ((Length(ClipboardText) > 0) and (tabCount > 0) and (tabCount >= returnCount) and (Clipboard.HasFormat(CF_METAFILEPICT))) then
   begin
     Screen.Cursor := crHourGlass;
@@ -4482,22 +4470,12 @@ begin
       StrHTML := GetHTMLUBBCode(StrHTML, ABaseURL);
       RichEditTemp.Clear;
       RichEditTemp.Lines.Add(StrHTML);
-      APasted := ReAlighHTMLContent(ABaseURL);
+      ///提取出HTML中的图片
+      Result := ReAlighHTMLContent(ABaseURL);
     finally
       Screen.Cursor := crDefault;
     end;
-
-    if (not APasted) then
-    begin
-
-//      Result := False;
-//      Exit;
-    end
-    else
-    begin
-      Result := True;
-      Exit;
-    end;
+    Exit;
   end;
 
   {$region '先在临时RichEdit中粘贴'}
@@ -4505,32 +4483,29 @@ begin
   begin
     RichEditTemp.Clear;
     RichEditTemp.PasteFromClipboard;
-    AIndexes := RichEditTemp.GetFaceIndexes;
-
+    AIndexes := RichEditTemp.GetFaceIndexes;    
     if High(AIndexes) = 0 then  //只有一个对象
-
-    begin
+
    begin
       AFaceInRichEdit := AIndexes[0];
       if AFaceInRichEdit.FaceIndex > 0 then //已经是表情对象
-
-      begin
+
      begin
         Result := False;
         RichEditTemp.Clear;
-        Exit;
       end
       else if ((not Clipboard.HasFormat(CF_METAFILEPICT)) and (not Clipboard.HasFormat(CF_PICTURE))) then
       begin
         Result := True;
         RichEditTemp.Clear;
-        Exit;
       end;
     end;
+    Exit;
   end;
   {$endregion}
 
 
 
   try
+    ///截图
     if Clipboard.HasFormat(CF_METAFILEPICT) then
     begin
       if (Length(ClipboardText) > 0) and (tabCount > 0) and (tabCount >= returnCount) then
@@ -4586,9 +4561,9 @@ begin
     on E: Exception do
       Error(E.Message, 'TTalkingForm.PasteImage');
   end;
+  RichEdInputer.PasteFromClipboard;
 end;
-//------------------------------------------------------------------------------
-
+
 
 procedure TTalkingForm.btCloseClick(Sender: TObject);
 begin

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
Controls/RealICQComponents.dproj


BIN=BIN
Controls/RealICQComponents.res


+ 4 - 4
DataProvider/DataProvider.dproj

@@ -109,8 +109,8 @@
         <VerInfo_Release>0</VerInfo_Release>
         <DCC_ExeOutput>..\ZWT\binary</DCC_ExeOutput>
         <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=浙江万赛软件科技有限公司;FileDescription=数据驱动;FileVersion=1.0.0.11;InternalName=DTP;LegalCopyright=(C) Winsoft Corporation. All rights reserved.;LegalTrademarks=Winsoft(R);OriginalFilename=DTP.dll;ProductName=政务通;ProductVersion=1.0;Comments=</VerInfo_Keys>
-        <VerInfo_Build>11</VerInfo_Build>
+        <VerInfo_Keys>CompanyName=浙江万赛软件科技有限公司;FileDescription=数据驱动;FileVersion=1.0.0.12;InternalName=DTP;LegalCopyright=(C) Winsoft Corporation. All rights reserved.;LegalTrademarks=Winsoft(R);OriginalFilename=DTP.dll;ProductName=政务通;ProductVersion=1.0;Comments=</VerInfo_Keys>
+        <VerInfo_Build>12</VerInfo_Build>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -479,13 +479,13 @@
                         <Operation>1</Operation>
                     </Platform>
                 </DeployClass>
-                <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
+                <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
-                <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
             </Deployment>
             <Platforms>
                 <Platform value="OSX32">False</Platform>

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
Includes/FlatStyle/FlatStyle.dproj


BIN=BIN
Includes/FlatStyle/FlatStyle.res


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 1 - 1
Log/Logger.dproj


BIN=BIN
Log/Logger.res


BIN=BIN
ZWT/Lxtalk.rar