add build tag: amisgo_use-_local_sdk

zrcoder · Dec 30, 2024 · cc1d3c6 · cc1d3c6
1 parent 8562411
commit cc1d3c6
Show file tree

Hide file tree

Showing 134 changed files with 85,164 additions and 44 deletions.
diff --git a/amis.go b/amis.go
@@ -6,7 +6,6 @@ import (
 	"strings"
 
 	"github.com/zrcoder/amisgo/conf"
-	"github.com/zrcoder/amisgo/internal/servermux"
 	"github.com/zrcoder/amisgo/util"
 )
 
@@ -16,17 +15,6 @@ type Engine struct {
 	mux    *http.ServeMux
 }
 
-// New creates an Engine instance with options
-func New(opts ...conf.Option) *Engine {
-	cfg := conf.Default()
-	cfg.Apply(opts...)
-
-	return &Engine{
-		Config: cfg,
-		mux:    servermux.Mux(),
-	}
-}
-
 // Mount registers an Amis component at the given path
 func (e *Engine) Mount(path string, component any, middlewares ...func(http.Handler) http.Handler) *Engine {
 	var h http.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

diff --git a/comp/carousel.go b/comp/carousel.go
@@ -99,7 +99,7 @@ func (c carousel) ItemSchema(value string) carousel {
 }
 
 // Multiple 设置 multiple 属性
-func (c carousel) Multiple(value string) carousel {
+func (c carousel) Multiple(value any) carousel {
 	return c.set("multiple", value)
 }
 
@@ -114,7 +114,7 @@ func (c carousel) OnEvent(value any) carousel {
 }
 
 // Options 设置 options 属性
-func (c carousel) Options(value ...MOption) carousel {
+func (c carousel) Options(value ...any) carousel {
 	return c.set("options", value)
 }
 
@@ -173,7 +173,7 @@ func (c carousel) TestID(value string) carousel {
 	return c.set("testid", value)
 }
 
-// ThumbMode 设置 thumbMode 属性
+// ThumbMode 设置 thumbMode 属性, contain | cover
 func (c carousel) ThumbMode(value string) carousel {
 	return c.set("thumbMode", value)
 }

diff --git a/comp/chainedSelect.go b/comp/chainedSelect.go
@@ -244,7 +244,7 @@ func (c chainedSelect) OnEvent(value any) chainedSelect {
 }
 
 // Options 选项集合
-func (c chainedSelect) Options(value ...MOption) chainedSelect {
+func (c chainedSelect) Options(value ...any) chainedSelect {
 	return c.set("options", value)
 }
 

diff --git a/comp/checkboxes.go b/comp/checkboxes.go
@@ -262,7 +262,7 @@ func (c checkboxes) OnEvent(value any) checkboxes {
 }
 
 // 选项集合
-func (c checkboxes) Options(value ...MOption) checkboxes {
+func (c checkboxes) Options(value ...any) checkboxes {
 	return c.set("options", value)
 }
 

diff --git a/comp/gridNav.go b/comp/gridNav.go
@@ -54,7 +54,7 @@ func (g gridNav) ItemClassName(value string) gridNav {
 }
 
 // Options 列表项图标
-func (g gridNav) Options(value ...MOption) gridNav {
+func (g gridNav) Options(value ...any) gridNav {
 	return g.set("options", value)
 }
 

diff --git a/comp/i_api.go b/comp/i_api.go
@@ -67,7 +67,7 @@ func (b MApi) Method(value string) MApi {
 }
 
 // QsOptions qs 配置项
-func (b MApi) QsOptions(value ...MOption) MApi {
+func (b MApi) QsOptions(value ...any) MApi {
 	return b.set("qsOptions", value)
 }
 

diff --git a/comp/images.go b/comp/images.go
@@ -89,7 +89,7 @@ func (i images) OnEvent(value any) images {
 }
 
 // Options
-func (i images) Options(value ...MOption) images {
+func (i images) Options(value ...any) images {
 	return i.set("options", value)
 }
 

diff --git a/comp/inputImage.go b/comp/inputImage.go
@@ -64,7 +64,7 @@ func (i inputImage) Compress(value bool) inputImage {
 }
 
 // CompressOptions 压缩选项
-func (i inputImage) CompressOptions(value ...MOption) inputImage {
+func (i inputImage) CompressOptions(value ...any) inputImage {
 	return i.set("compressOptions", value)
 }
 

diff --git a/comp/inputNumber.go b/comp/inputNumber.go
@@ -301,7 +301,7 @@ func (nc inputNumber) TestIdBuilder(value string) inputNumber {
 }
 
 // UnitOptions 单位列表
-func (nc inputNumber) UnitOptions(value ...MOption) inputNumber {
+func (nc inputNumber) UnitOptions(value ...any) inputNumber {
 	return nc.set("unitOptions", value)
 }
 

diff --git a/comp/inputRepeat.go b/comp/inputRepeat.go
@@ -145,7 +145,7 @@ func (rc inputRepeat) OnEvent(value any) inputRepeat {
 }
 
 // Options
-func (rc inputRepeat) Options(value ...MOption) inputRepeat {
+func (rc inputRepeat) Options(value ...any) inputRepeat {
 	return rc.set("options", value)
 }
 

diff --git a/comp/inputTag.go b/comp/inputTag.go
@@ -269,7 +269,7 @@ func (t inputTag) OnEvent(value map[string]string) inputTag {
 }
 
 // Options 选项 (选项)
-func (t inputTag) Options(value ...MOption) inputTag {
+func (t inputTag) Options(value ...any) inputTag {
 	return t.set("options", value)
 }
 

diff --git a/comp/listSelect.go b/comp/listSelect.go
@@ -265,7 +265,7 @@ func (lc listSelect) OnEvent(value any) listSelect {
 }
 
 // Options 选项集合
-func (lc listSelect) Options(value ...MOption) listSelect {
+func (lc listSelect) Options(value ...any) listSelect {
 	return lc.set("options", value)
 }
 

diff --git a/comp/options.go b/comp/options.go
@@ -101,7 +101,7 @@ func (o options) Name(value string) options {
 }
 
 // Options 选项组，供用户选择
-func (o options) Options(value ...MOption) options {
+func (o options) Options(value ...any) options {
 	return o.set("options", value)
 }
 

diff --git a/comp/picker.go b/comp/picker.go
@@ -270,7 +270,7 @@ func (pc picker) OnEvent(value any) picker {
 }
 
 // Options 选项列表
-func (pc picker) Options(value ...MOption) picker {
+func (pc picker) Options(value ...any) picker {
 	return pc.set("options", value)
 }
 

diff --git a/comp/radios.go b/comp/radios.go
@@ -255,7 +255,7 @@ func (rc radios) Option(value any) radios {
 }
 
 // Options 配置选项列表
-func (rc radios) Options(value ...MOption) radios {
+func (rc radios) Options(value ...any) radios {
 	return rc.set("options", value)
 }
 

diff --git a/comp/schemaApi.go b/comp/schemaApi.go
@@ -65,7 +65,7 @@ func (s schemaApi) Method(value string) schemaApi {
 }
 
 // QsOptions qs 配置项
-func (s schemaApi) QsOptions(value ...MOption) schemaApi {
+func (s schemaApi) QsOptions(value ...any) schemaApi {
 	return s.set("qsOptions", value)
 }
 

diff --git a/comp/select.go b/comp/select.go
@@ -279,7 +279,7 @@ func (sc selectControl) Mode(value string) selectControl {
 }
 
 // noneOptions 对于 `autoComplete` API 提供的值不被选择项本身支持的时候，用于配置没有值时的提示文字
-func (sc selectControl) NoneOptions(value ...MOption) selectControl {
+func (sc selectControl) NoneOptions(value ...any) selectControl {
 	return sc.set("noneOptions", value)
 }
 

diff --git a/comp/tabsTransfer.go b/comp/tabsTransfer.go
@@ -269,7 +269,7 @@ func (t tabsTransfer) Nested(value bool) tabsTransfer {
 }
 
 // Options 选项
-func (t tabsTransfer) Options(value ...MOption) tabsTransfer {
+func (t tabsTransfer) Options(value ...any) tabsTransfer {
 	return t.set("options", value)
 }
 

diff --git a/comp/transfer.go b/comp/transfer.go
@@ -280,7 +280,7 @@ func (tc transfer) Option(value string) transfer {
 }
 
 // Options 选项数据
-func (tc transfer) Options(value ...MOption) transfer {
+func (tc transfer) Options(value ...any) transfer {
 	return tc.set("options", value)
 }
 
@@ -295,7 +295,7 @@ func (tc transfer) ReadOnly(value bool) transfer {
 }
 
 // RemoteOptions 远程获取选项
-func (tc transfer) RemoteOptions(value ...MOption) transfer {
+func (tc transfer) RemoteOptions(value ...any) transfer {
 	return tc.set("remoteOptions", value)
 }
 

diff --git a/comp/transferPicker.go b/comp/transferPicker.go
@@ -269,7 +269,7 @@ func (tpc transferPicker) Name(value string) transferPicker {
 }
 
 // Options 数据源配置
-func (tpc transferPicker) Options(value ...MOption) transferPicker {
+func (tpc transferPicker) Options(value ...any) transferPicker {
 	return tpc.set("options", value)
 }
 

diff --git a/comp/userSelect.go b/comp/userSelect.go
@@ -244,7 +244,7 @@ func (usc userSelect) OnEvent(value any) userSelect {
 }
 
 // Options 选项集合
-func (usc userSelect) Options(value ...MOption) userSelect {
+func (usc userSelect) Options(value ...any) userSelect {
 	return usc.set("options", value)
 }
 
@@ -309,7 +309,7 @@ func (usc userSelect) StaticPlaceholder(value string) userSelect {
 }
 
 // StaticOptions 静态选项集合
-func (usc userSelect) StaticOptions(value ...MOption) userSelect {
+func (usc userSelect) StaticOptions(value ...any) userSelect {
 	return usc.set("staticOptions", value)
 }
 

diff --git a/conf/config.go b/conf/config.go
@@ -28,12 +28,13 @@ const (
 
 // Config holds all configuration options for the application
 type Config struct {
-	Theme     Theme
-	Lang      Lang
-	Title     string
-	Icon      string
-	CustomCSS string
-	CustomJS  string
+	Theme       Theme
+	Lang        Lang
+	Title       string
+	Icon        string
+	CustomCSS   string
+	CustomJS    string
+	UseLocalSDK bool
 	template.Template
 }
 

diff --git a/internal/template/template.gohtml b/internal/template/template.gohtml
@@ -13,12 +13,27 @@
     <link rel="icon" href="{{.Icon}}" />
     {{ end }}
     {{ if .Theme }}
-    <link rel="stylesheet" href="{{ .AmisBaseURL }}@{{ .AmisVersion }}/sdk/{{ .Theme }}.min.css" />
+      {{ if .UseLocalSDK }}
+      <link rel="stylesheet" href="/__amisgo__sdk/{{ .Theme}}.css" />
+      {{ else }}
+      <link rel="stylesheet" href="{{ .AmisBaseURL }}@{{ .AmisVersion }}/sdk/{{ .Theme }}.min.css" />
+      {{ end }}
     {{ else }}
-    <link rel="stylesheet" href="{{ .AmisBaseURL }}@{{ .AmisVersion }}/sdk/sdk.min.css" />
+      {{ if .UseLocalSDK }} 
+      <link rel="stylesheet" href="/__amisgo__sdk/sdk.css" />
+      {{ else }}
+      <link rel="stylesheet" href="{{ .AmisBaseURL }}@{{ .AmisVersion }}/sdk/sdk.min.css" />
+      {{ end }}
     {{ end }}
+
+    {{ if .UseLocalSDK }} 
+    <link rel="stylesheet" href="/__amisgo__sdk/helper.css" />
+    <link rel="stylesheet" href="/__amisgo__sdk/iconfont.css" />
+    {{ else }}
     <link rel="stylesheet" href="{{ .AmisBaseURL }}@{{ .AmisVersion }}/sdk/helper.min.css" />
     <link rel="stylesheet" href="{{ .AmisBaseURL }}@{{ .AmisVersion }}/sdk/iconfont.min.css" />
+    {{ end }}
+
     <style>
       html,
       body,
@@ -34,7 +49,11 @@
   </head>
   <body>
     <div id="root" class="app-wrapper"></div>
+    {{ if .UseLocalSDK }}
+    <script src="/__amisgo__sdk/sdk.js"></script>
+    {{ else }}
     <script src="{{ .AmisBaseURL }}@{{ .AmisVersion }}/sdk/sdk.min.js"></script>
+    {{ end }}
     {{ if .CustomJS }}
     <script type="text/javascript">
     {{ .CustomJS }}

diff --git a/jssdk/ang-ie11.css b/jssdk/ang-ie11.css
diff --git a/jssdk/ang.css b/jssdk/ang.css
diff --git a/jssdk/antd-ie11.css b/jssdk/antd-ie11.css
diff --git a/jssdk/antd.css b/jssdk/antd.css