fix $(...).sortable is not a function

Resolve #5
EasyAbp · Jul 10, 2022 · a1a116d · a1a116d
1 parent 0193d19
commit a1a116d
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 3 deletions.
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>0.5.4</Version>
+    <Version>0.5.5</Version>
     <NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
     <AbpProjectType>module</AbpProjectType>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

diff --git a/src/EasyAbp.Abp.DynamicEntity.Web/Bundling/DynamicEntityScriptContributor.cs b/src/EasyAbp.Abp.DynamicEntity.Web/Bundling/DynamicEntityScriptContributor.cs
@@ -11,7 +11,8 @@ public override void ConfigureBundle(BundleConfigurationContext context)
         {
             context.Files.AddRange(new[]
             {
-                "/libs/easy-abp/easy-abp-dynamic.js",
+                "/easy-abp/easy-abp-dynamic.js",
+                "/libs/jquery-ui/js/jquery-ui.min.js"
             });
         }
     }

diff --git a/src/EasyAbp.Abp.DynamicEntity.Web/Pages/DynamicEntity/ModelDefinition/index.js b/src/EasyAbp.Abp.DynamicEntity.Web/Pages/DynamicEntity/ModelDefinition/index.js
@@ -6,7 +6,7 @@
     var createModal = new abp.ModalManager(
         {
             viewUrl: abp.appPath + 'DynamicEntity/ModelDefinition/CreateModal',
-            scriptUrl: "/Pages/DynamicEntity/ModelDefinition/createEditModal.js",
+            scriptUrl: "/Pages/DynamicEntity/ModelDefinition/createEditModal.js?v=1",
             modalClass: "CreateEditModal",
         }
     );

diff --git a/src/EasyAbp.Abp.DynamicEntity.Web/abp.resourcemapping.js b/src/EasyAbp.Abp.DynamicEntity.Web/abp.resourcemapping.js
@@ -0,0 +1,11 @@
+module.exports = {
+    aliases: {
+
+    },
+    clean: [
+
+    ],
+    mappings: {
+        "@node_modules/jquery-ui-dist/jquery-ui.min.js": "@libs/jquery-ui/js/"
+    }
+};
diff --git a/src/EasyAbp.Abp.DynamicEntity.Web/package.json b/src/EasyAbp.Abp.DynamicEntity.Web/package.json
@@ -0,0 +1,8 @@
+{
+  "version": "0.1.0",
+  "name": "my-app",
+  "private": true,
+  "dependencies": {
+    "jquery-ui-dist": "^1.13.1"
+  }
+}
diff --git a/...wwwroot/libs/easy-abp/easy-abp-dynamic.js → ....Web/wwwroot/easy-abp/easy-abp-dynamic.js b/...wwwroot/libs/easy-abp/easy-abp-dynamic.js → ....Web/wwwroot/easy-abp/easy-abp-dynamic.js
diff --git a/src/EasyAbp.Abp.DynamicEntity.Web/wwwroot/libs/jquery-ui/js/jquery-ui.min.js b/src/EasyAbp.Abp.DynamicEntity.Web/wwwroot/libs/jquery-ui/js/jquery-ui.min.js
diff --git a/src/EasyAbp.Abp.DynamicEntity.Web/yarn.lock b/src/EasyAbp.Abp.DynamicEntity.Web/yarn.lock
@@ -0,0 +1,15 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+jquery-ui-dist@^1.13.1:
+  version "1.13.1"
+  resolved "https://registry.npmmirror.com/jquery-ui-dist/-/jquery-ui-dist-1.13.1.tgz#47dcc1bf9cec141221ece59b2c8eaabad846ec0e"
+  integrity sha512-Y711Pu4BRVrAlL58KSxX4ail74jaCJZaZcdNDLava+MgZeNwmVWmyYiK7KxyoJu1MB73eSunjJvYDbOuNrOA7w==
+  dependencies:
+    jquery ">=1.8.0 <4.0.0"
+
+"jquery@>=1.8.0 <4.0.0":
+  version "3.6.0"
+  resolved "https://registry.npmmirror.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
+  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==