diff --git a/wms-web/src/views/wxpublic/wxconfig/columns.tsx b/wms-web/src/views/wxpublic/wxconfig/columns.tsx
index f41a05f..15422fe 100644
--- a/wms-web/src/views/wxpublic/wxconfig/columns.tsx
+++ b/wms-web/src/views/wxpublic/wxconfig/columns.tsx
@@ -41,7 +41,7 @@ export const formSchema: FormSchema[] = [
{
field: 'divider-selects',
component: 'Divider',
- label: '',
+ label: '基本信息',
},
{
label: '',
@@ -73,6 +73,9 @@ export const formSchema: FormSchema[] = [
component: 'Input',
required: true,
colProps: { span: 24 },
+ dynamicDisabled: ({ values }) => {
+ return !!values.id;
+ },
},
{
field: 'indexUrl',
diff --git a/wmsapi-service/.idea/.idea.wmsapi-service/.idea/workspace.xml b/wmsapi-service/.idea/.idea.wmsapi-service/.idea/workspace.xml
index 195e757..efe9aa5 100644
--- a/wmsapi-service/.idea/.idea.wmsapi-service/.idea/workspace.xml
+++ b/wmsapi-service/.idea/.idea.wmsapi-service/.idea/workspace.xml
@@ -28,6 +28,7 @@
+
@@ -208,7 +209,7 @@
-
+
diff --git a/wmsapi-service/DS.Module.Core/Extensions/ObjectExtensions.cs b/wmsapi-service/DS.Module.Core/Extensions/ObjectExtensions.cs
index 85c86cf..df719a3 100644
--- a/wmsapi-service/DS.Module.Core/Extensions/ObjectExtensions.cs
+++ b/wmsapi-service/DS.Module.Core/Extensions/ObjectExtensions.cs
@@ -201,6 +201,7 @@ public static class ObjectExtensions
return value == null ? true : false;
}
+
public static bool IsNotNull(this object value)
{
return !value.IsNull();
diff --git a/wmsapi-service/DS.Module.Core/Filters/FEGCrosFilter.cs b/wmsapi-service/DS.Module.Core/Filters/FEGCrosFilter.cs
new file mode 100644
index 0000000..7ac6c30
--- /dev/null
+++ b/wmsapi-service/DS.Module.Core/Filters/FEGCrosFilter.cs
@@ -0,0 +1,29 @@
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace DS.Module.Core.Filters;
+
+///
+/// 解决跨域时的预检查204 options重复请求
+///
+public class FegCrosFilter : IActionFilter
+{
+ ///
+ ///
+ ///
+ ///
+ public void OnActionExecuted(ActionExecutedContext context)
+ {
+
+ }
+ ///
+ ///
+ ///
+ ///
+ public void OnActionExecuting(ActionExecutingContext context)
+ {
+ //简单粗暴
+ context.HttpContext.Request.Headers.Add("Access-Control-Allow-Headers", "*");
+ context.HttpContext.Request.Headers.Add("Access-Control-Allow-Methods", "*");
+ context.HttpContext.Request.Headers.Add("Access-Control-Max-Age", new Microsoft.Extensions.Primitives.StringValues("24*60*60"));
+ }
+}
\ No newline at end of file
diff --git a/wmsapi-service/DS.Module.SqlSugar/DS.Module.SqlSugar.csproj b/wmsapi-service/DS.Module.SqlSugar/DS.Module.SqlSugar.csproj
index 43b8e1e..571f26b 100644
--- a/wmsapi-service/DS.Module.SqlSugar/DS.Module.SqlSugar.csproj
+++ b/wmsapi-service/DS.Module.SqlSugar/DS.Module.SqlSugar.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/wmsapi-service/DS.Module.SqlSugar/SqlsugarInstall.cs b/wmsapi-service/DS.Module.SqlSugar/SqlsugarInstall.cs
index 4f4b9a7..2734ac0 100644
--- a/wmsapi-service/DS.Module.SqlSugar/SqlsugarInstall.cs
+++ b/wmsapi-service/DS.Module.SqlSugar/SqlsugarInstall.cs
@@ -154,12 +154,12 @@ public static class SqlsugarInstall
//从程序集拿到实体type集合
Type[] types = Assembly
.LoadFrom(servicesDllFile) //如果 .dll报错,可以换成 xxx.exe 有些生成的是exe
- .GetTypes().Where(it => it.FullName.Contains("DS.WMS.Core.")) //命名空间过滤,当然你也可以写其他条件过滤
+ .GetTypes().Where(it => it.FullName.Contains("DS.WMS.Core.") && it.GetCustomAttributes(typeof(SugarTable), true)?.FirstOrDefault() != null) //命名空间过滤,当然你也可以写其他条件过滤
.ToArray(); //断点调试一下是不是需要的Type,不是需要的在进行过滤
//全局过滤器
// var superAdminViewAllData = Convert.ToBoolean(App.GetOptions().SuperAdminViewAllData);
foreach (var entityType in types)
- {
+ {
// 配置多租户全局过滤器
if (!entityType.GetProperty("TenantId").IsNull())
{
@@ -169,7 +169,8 @@ public static class SqlsugarInstall
(new[] { Expression.Parameter(entityType, "it") },
typeof(bool), $"{nameof(DBEntityTenant.TenantId)} == @0 ",
user.GetTenantId());
- dbProvider.QueryFilter.Add(new TableFilterItem