Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS.SDK/TEAMModelOS.SDK.csproj

@@ -37,6 +37,10 @@
 		<PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="2.0.0-preview" />
 		<!--<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />-->
 		<PackageReference Include="NPinyin.Core" Version="3.0.0" />
+		<PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
+		<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
+		<PackageReference Include="System.Net.Primitives" Version="4.3.1" />
+		<PackageReference Include="System.Text.Encoding.Extensions" Version="4.3.0" />
 		<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
 		<PackageReference Include="VueCliMiddleware" Version="6.0.0" />
 		<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.22.0" />

TEAMModelOS/ClientApp/public/kityformula/assets/styles/base.css

@@ -18,7 +18,7 @@
     left: 0;
 
     z-index: 1;
-    height: 0;
+    height: 290px !important;
     background-color: white;
     /*background-color: white;*/
     /*background-size: 21px 21px;*/

TEAMModelOS/ClientApp/src/utils/kityformula.js

@@ -6,7 +6,7 @@ export default function(editor) {
 
 	const conf = {
 		width: 900,
-		height: 560,
+		height: 450,
 
 		// panel 中可包含多个 tab
 		tabs: [{
@@ -14,9 +14,9 @@ export default function(editor) {
 				title: app.$t('evaluation.editor.insertFormula'),
 				// 模板
 				tpl: `<div>
-                  <iframe id="${inputIFrameId}" class="iframe" height="500px" width="100%" frameborder="0" scrolling="no" src="/kityformula/index.html"></iframe>
+                  <iframe id="${inputIFrameId}" class="iframe" height="400px" width="100%" frameborder="0" scrolling="no" src="/kityformula/index.html"></iframe>
                   <div class="w-e-button-container">
-                      <button id="${btnOkId}" class="right">
+                      <button id="${btnOkId}" class="right" style="float:left">
                           ${app.$t('evaluation.editor.confirmInsert')}
                       </button>
                   </div>