diff --git a/Delphi10/开发档案/Dp10RepoV1/public10/design/U_BaseList.pas b/Delphi10/开发档案/Dp10RepoV1/public10/design/U_BaseList.pas index b91d529..b647c01 100644 --- a/Delphi10/开发档案/Dp10RepoV1/public10/design/U_BaseList.pas +++ b/Delphi10/开发档案/Dp10RepoV1/public10/design/U_BaseList.pas @@ -73,7 +73,10 @@ begin fModuleId:=StringReplace(Trim(jsonObject.GetValue('moduleId').ToString),'"','',[rfReplaceAll]); fModuleSubId:=StringReplace(trim(jsonObject.GetValue('moduleSubId').ToString),'"','',[rfReplaceAll]); gTeamWorker:=StringReplace(trim(jsonObject.GetValue('teamWorkerId').ToString),'"','',[rfReplaceAll]); - fParameters10:=''; + if Parameters1='ѯ' then + fParameters10:='ѯ' + else + fParameters10:=''; finally jsonValue.Free; end; diff --git a/Delphi10/开发档案/Dp10RepoV1/public10/design/U_WindowFormdesign.pas b/Delphi10/开发档案/Dp10RepoV1/public10/design/U_WindowFormdesign.pas index 63639e7..047a380 100644 --- a/Delphi10/开发档案/Dp10RepoV1/public10/design/U_WindowFormdesign.pas +++ b/Delphi10/开发档案/Dp10RepoV1/public10/design/U_WindowFormdesign.pas @@ -427,6 +427,7 @@ begin toolBar.List := mToolBarList; end; // + if fFormRightButtons<>'' then initUserFormButtons(toolBar); //continue; @@ -710,7 +711,7 @@ begin if (mCaption = 'ر') or (mCaption = '˳') or (mCaption = '') then exit; /// //////////////////////////////////////// - if trim(mOperRight) = 'ѯ' then + if (trim(mOperRight) = 'ѯ') or (trim(mOperRight) = 'ѯģ') then begin if pos(mCaption, 'ѯ,ˢ,,߼,߼ѯ') > 0 then // ,鿴,ϸ begin @@ -740,7 +741,7 @@ begin exit; end; /// //////////////////////////////////////////////// - if trim(mOperRight) = 'ѯ' then + if (trim(mOperRight) = 'ѯ') or (trim(mOperRight) = 'ѯģ') then exit; with mParent do begin