Browse Source

xls:保单号增加长度限制

xulisong 6 years ago
parent
commit
c1192ebf6a

+ 2 - 1
MBI/CEFSharpWPF/SetBrowserEnvironment.cs

@@ -55,8 +55,9 @@ namespace CEFSharpWpf
             {
                 CefSettings settings = new CefSettings();
                 settings.Locale = "zh-CN";
-                settings.AcceptLanguageList = "zh-CN";
+                settings.AcceptLanguageList = "zh-CN";               
                 Cef.Initialize(settings);
+                CefSharpSettings.LegacyJavascriptBindingEnabled = true;
             }
        
         }

+ 30 - 0
MBI/CEFSharpWPF/UcGplotShow.xaml.cs

@@ -8,6 +8,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using CefSharp;
+using CefSharp.Wpf;
 using CEFSharpWpf;
 
 namespace CEFSharpWPF
@@ -60,6 +61,35 @@ namespace CEFSharpWPF
             URL = url;
             ReloadUrl(url);
         }
+        #region 封装交互
+        /*
+         * 不想直接饮用程序集,将公开方法封装一遍
+         */
+        /// <summary>
+        /// 获取浏览器选项
+        /// </summary>
+        public ChromiumWebBrowser Browser
+        {
+            get { return webBrowser; }
+        }
+        /// <summary>
+        /// 注册绑定对象
+        /// </summary>
+        /// <param name="objName"></param>
+        /// <param name="obj"></param>
+        public void RegisterJsObject(string objName, object obj)
+        {
+            Browser.RegisterJsObject(objName, obj, new BindingOptions() {CamelCaseJavascriptNames = false});
+        }
+        /// <summary>
+        /// 执行js函数
+        /// </summary>
+        /// <param name="fun"></param>
+        public void ExecuteJsFun(string fun)
+        {
+            Browser.ExecuteScriptAsync(fun);
+        }
 
+        #endregion
     }
 }

BIN
MBI/Dlls/FirmLibDll/FWindSoft.Wpf.dll


BIN
MBI/Dlls/FirmLibDll/FWindSoft.dll


+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Insuer/VmInsurancePolicyEditor.cs

@@ -344,7 +344,7 @@ namespace Com.FirmLib.UI.Insuer
         }
         public bool CanSaveCommand(object parameter)
         {
-            return IsValidated;
+            return IsValidated&&ValidateProject;
         }
         /// <summary>
         /// 选择保单号

+ 1 - 0
MBI/FirmLib/Com.FirmLib.UI/Insuer/WinInsurancePolicyEditor.xaml

@@ -46,6 +46,7 @@
                     <Binding Path="PolicyNo" Mode="TwoWay" UpdateSourceTrigger="LostFocus" >
                         <Binding.ValidationRules>
                             <fw:RequireValidationRule ></fw:RequireValidationRule>
+                             <fw:LengthValidationRule MaxLength="50" ></fw:LengthValidationRule>
                         </Binding.ValidationRules>
                     </Binding>
                 </TextBox>

+ 1 - 0
MBI/FirmLib/Com.FirmLib.UI/Insuer/WinSimplePolicyEditor.xaml

@@ -25,6 +25,7 @@
                     <Binding Path="PolicyNo" Mode="TwoWay" UpdateSourceTrigger="LostFocus" >
                         <Binding.ValidationRules>
                             <fw:RequireValidationRule ></fw:RequireValidationRule>
+                              <fw:LengthValidationRule MaxLength="50" ></fw:LengthValidationRule>
                         </Binding.ValidationRules>
                     </Binding>
                 </TextBox>

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Maintainer/VmMaintainerProjectAsset.cs

@@ -156,7 +156,7 @@ namespace Com.FirmLib.UI.Maintainer
         }
         public bool CanSaveCommand(object parameter)
         {
-            return IsValidated;
+            return IsValidated&&ValidateProject;;
         }
         /// <summary>
         /// 选择设备

+ 1 - 1
MBI/FirmLib/Com.FirmLib.UI/Seller/VmSellerProjectContract.cs

@@ -199,7 +199,7 @@ namespace Com.FirmLib.UI.Seller
         }
         public bool CanSaveCommand(object parameter)
         {
-            return IsValidated;
+            return IsValidated&&ValidateProject;
         }
         /// <summary>
         /// 删除在保资产

+ 11 - 1
MBI/SAGA.MBI/WinView/Space/WinCreateSpaceWeb.xaml

@@ -6,9 +6,19 @@
              xmlns:local="clr-namespace:SAGA.MBI.WinView.Space"
              xmlns:windows="clr-namespace:SAGA.RevitUtils.Windows;assembly=SAGA.RevitUtils"
              xmlns:cefSharpWpf="clr-namespace:CEFSharpWPF;assembly=CEFSharpWPF"
+                 Title="空间管理"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
-               <cefSharpWpf:UcGplotShow Grid.Row="0" Grid.Column="1" x:Name="ucShowElement"></cefSharpWpf:UcGplotShow>
+        <Grid.RowDefinitions>
+            <RowDefinition></RowDefinition>
+            <RowDefinition Height="Auto"></RowDefinition>
+              <RowDefinition Height="Auto"></RowDefinition>
+               <RowDefinition Height="Auto"></RowDefinition>
+        </Grid.RowDefinitions>
+        <cefSharpWpf:UcGplotShow Grid.Row="0" Grid.Column="0" x:Name="ucShowElement"></cefSharpWpf:UcGplotShow>
+            <TextBox Name="Js" Grid.Row="1"></TextBox>
+        <Button Content="调用" Grid.Row="2" Click="Button_Click"></Button>
+         <Button Content="刷新" Grid.Row="3" Click="Button_Click_1" ></Button>
     </Grid>
 </windows:WinBase>

+ 48 - 0
MBI/SAGA.MBI/WinView/Space/WinCreateSpaceWeb.xaml.cs

@@ -24,6 +24,54 @@ namespace SAGA.MBI.WinView.Space
         public WinCreateSpaceWeb()
         {
             InitializeComponent();
+             ucShowElement.RegisterJsObject("wpfEvent", this);
+            this.Loaded += WinCreateSpaceWeb_Loaded;
+         
+           
+        }
+
+        private void WinCreateSpaceWeb_Loaded(object sender, RoutedEventArgs e)
+        {
+               ucShowElement.Show(" http://192.168.20.86:8091/#/demo");
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            //var strJs = Js.Text;
+            StringBuilder builder = new StringBuilder();
+            for (int i = 0; i < 1024 * 1024 * 10; i++)
+            {
+                builder.Append("a");
+            }
+
+            var strJs = $"getData('{builder.ToString()}')";
+            ucShowElement.ExecuteJsFun(strJs);
+        }
+
+        public void Save()
+        {
+         
+
+            MessageBox.Show("Save");
+        }
+
+        public void SaveStr(string path)
+        {
+            MessageBox.Show(path??"没有数据");
+        }
+        public void SaveObj(object obj)
+        {
+            if (obj != null)
+            {
+                 MessageBox.Show(obj.ToString());
+            }
+
+           
+        }
+        private void Button_Click_1(object sender, RoutedEventArgs e)
+        {
+               ucShowElement.Show(" http://192.168.20.86:8091/#/demo");
         }
     }
+ 
 }