ci

sp42 · Jun 5, 2024 · 02f59fa · 02f59fa
1 parent 4a7f015
commit 02f59fa
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 88 deletions.
diff --git a/aj-backend/aj-framework/aj-web/src/main/java/com/ajaxjs/web/security/Filter.java b/aj-backend/aj-framework/aj-web/src/main/java/com/ajaxjs/web/security/Filter.java
@@ -95,7 +95,7 @@ public static String cleanXSS(String str) {
 	 * @param type
 	 * @return
 	 */
-	public static String cleanXSS(String str, Handle type) {
+	public static String --------(String str, Handle type) {
 		return clean(str, XSS_Pattern, matcher -> {
 			if (type == Handle.TYPE_DELETE)
 				return matcher.replaceAll("");

diff --git a/aj-ui/aj-ui-widget/aj/package.json b/aj-ui/aj-ui-widget/aj/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@ajaxjs/ui",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "description": "real ajaxjs ui library",
   "main": "dist/index.js",
   "types": "dist/libs/common.d.ts",
   "homepage": "https://framework.ajaxjs.com/",
   "repository": {
     "type": "git",
-    "url": "https://github.com/sp42/ajaxjs/tree/master/aj-ui-widget/aj"
+    "url": "https://github.com/sp42/ajaxjs/tree/master/aj-ui/aj-ui-widget/aj"
   },
   "bugs": {
     "url": "https://github.com/sp42/ajaxjs/issues"

diff --git a/aj-ui/aj-ui-widget/aj/src/App.vue b/aj-ui/aj-ui-widget/aj/src/App.vue
@@ -1,5 +1,6 @@
 <template>
   <router-view />
+
 </template>
 
 <script>

diff --git a/aj-ui/aj-ui-widget/aj/src/pages/widgets.vue b/aj-ui/aj-ui-widget/aj/src/pages/widgets.vue
@@ -59,6 +59,8 @@
       <li><a target="iframepage" href="../job/job.jsp">招聘管理</a></li>
     </OpacityBanner>
 
+        <br />
+    <br />
     <br />
     <br />
     <br />
@@ -126,35 +128,6 @@
       </li>
     </AccordionMenu>
 
-    <br />
-    <br />
-    <br />
-
-    <h2>Baidu 自定义搜索</h2>
-    <table class="aj-table" align="center">
-      <thead>
-        <tr>
-          <th>属性</th>
-          <th>含义</th>
-          <th>类型</th>
-          <th>是否必填，默认值</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td>siteDomainName</td>
-          <td>搜索网站之域名</td>
-          <td>String</td>
-          <td>n, 通过 js 返回域名</td>
-        </tr>
-      </tbody>
-    </table>
-    <br />
-    <br />
-    <div style="margin:0 auto;width:600px;">
-      <BaiduSearch />
-    </div>
-
     <br />
     <br />
 
@@ -180,9 +153,8 @@
 import OpacityBanner from "@/widget/OpacityBanner.vue";
 import ProcessLine from "@/widget/ProcessLine.vue";
 import AccordionMenu from "@/widget/AccordionMenu.vue";
-import Expander from "@/widget/Expander.vue";
-import BaiduSearch from "@/widget/BaiduSearch.vue";
-import ImageEnlarger from "@/widget/ImageEnlarger.vue";
+import Expander from "@/widget/Expander";
+import ImageEnlarger from "@/widget/ImageEnlarger";
 import Article from '@/widget/Article.vue';
 
 export default {
@@ -191,7 +163,6 @@ export default {
     ProcessLine,
     AccordionMenu,
     Expander,
-    BaiduSearch,
     ImageEnlarger,
     Article
   },

diff --git a/aj-ui/aj-ui-widget/aj/src/widget/Article.vue b/aj-ui/aj-ui-widget/aj/src/widget/Article.vue
@@ -22,7 +22,7 @@
 <script>
 import FontSize from './AdjustFontSize.vue';
 
-export default {老王爱学习 
+export default { 
   props: {
     title: String, author: String, source: String
   },

diff --git a/aj-ui/aj-ui-widget/aj/src/widget/BaiduSearch.vue b/aj-ui/aj-ui-widget/aj/src/widget/BaiduSearch.vue
diff --git a/aj-ui/aj-ui-widget/aj/vue.config.js b/aj-ui/aj-ui-widget/aj/vue.config.js
@@ -1,10 +1,11 @@
+const path = require('path');
 module.exports = {
     publicPath: './', // vue_cli 打包后的项目，默认使用的是绝对路径。改为相对路径
     runtimeCompiler: true,
     pluginOptions: {
         'style-resources-loader': {
             preProcessor: 'less',
-            patterns: ['C:\\code\\aj\\aj-all\\ajaxjs\\aj-ui-widget\\aj\\src\\style\\common-functions.less']
+            patterns: [path.resolve(__dirname, '.\\src\\style\\common-functions.less')]
         }
     },
     lintOnSave: true,