imatrix-ui 2.9.68-dw → 2.9.70-dw

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.9.68-dw",
+  "version": "2.9.70-dw",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,

package/packages/rich-editor/index.vue

@@ -160,7 +160,21 @@ export default {
             tinymce.activeEditor && tinymce.activeEditor.uploadImages()
             return url
           }
-          return url
+          // 正则表达式，用于验证URL
+          const urlPattern = new RegExp(
+            '^(https?:\\/\\/)?' + // 协议 http:// 或者 https:// （可选）
+              '((([a-z\\d]([a-z\\d-]*[a-z\\d])*)\\.)+[a-z]{2,}|' + // 域名
+              '((\\d{1,3}\\.){3}\\d{1,3}))' + // 或者 IP (v4) 地址
+              '(\\:\\d+)?(\\/[-a-z\\d%_.~+]*)*' + // 端口号（可选）
+              '(\\?[;&a-z\\d%_.~+=-]*)?' + // 查询字符串（可选）
+              '(\\#[-a-z\\d_]*)?$', 'i') // 片段（可选）
+
+          if (urlPattern.test(url)) {
+            return url
+          } else {
+            alert('url invalid')
+            return ''
+          }
         },
         images_upload_handler: (blobInfo, success, failure, progress) => {
           let file

package/packages/super-grid/src/search-form-item.vue

@@ -232,7 +232,11 @@ export default {
     loadCompleteQuery: {
       type: Boolean,
       default: false
-    }
+    },
+		initializationQuery:{
+      type: Boolean,
+      default: true
+		}
   },
   data() {
     const customComponentNames = new Set()
@@ -245,7 +249,7 @@ export default {
   },
   mounted() {
     // 查询页面加载完成
-    if ((this.index + 1) === this.length && this.loadCompleteQuery) {
+    if (this.initializationQuery && (this.index + 1) === this.length && this.loadCompleteQuery) {
       this.$emit('submit-form')
     }
   },

package/packages/super-grid/src/search-form-open.vue

@@ -16,6 +16,7 @@
               :index="fieldNum*(r-1)+(n-1)"
               :length="searchableColumns.length"
               :load-complete-query="loadCompleteQuery"
+							:initializationQuery="initializationQuery"
               @submit-form="$emit('submit-form')"
             />
           </template>
@@ -106,7 +107,11 @@ export default {
     loadCompleteQuery: {
       type: Boolean,
       default: false
-    }
+    },
+		initializationQuery:{
+      type: Boolean,
+      default: true
+		}
   },
   data() {
     let isButtonNewRow = false

package/packages/super-grid/src/search-form-ordinarySearch.vue

@@ -14,8 +14,9 @@
         :row-num="rowNum"
         :is-open="isOpen"
         :load-complete-query="loadCompleteQuery"
-        @submit-form="$emit('submit-form')"
-        @reset-form="$emit('reset-form')"
+        :initialization-query="initializationQuery"
+        @submit-form="emitSubmitForm"
+        @reset-form="emitResetForm"
         @save-condition="$emit('save-condition')"
         @open-fold="openFold"
       />
@@ -54,8 +55,9 @@
 <script>
 import searchMethods from './search-methods'
 import store from './store'
-import { addDynamicProp, addDynamicPropDateSection } from './utils'
+import { addDynamicProp, addDynamicPropDateSection, isHasOptionFunction } from './utils'
 import SearchFormOpen from './search-form-open.vue'
+import { isPromise } from '../../../src/utils/common-util'
 export default {
   name: 'SearchForm',
   components: {
@@ -110,6 +112,10 @@ export default {
   },
   data() {
     const gridParams = store.get(this.code)
+    let initializationQuery = true
+    if (gridParams.basicInfo) {
+      initializationQuery = gridParams.basicInfo.initializationQuery
+    }
     let tableName
     if (gridParams && gridParams.basicInfo && gridParams.basicInfo.tableName) {
       tableName = gridParams.basicInfo.tableName
@@ -125,7 +131,8 @@ export default {
       dataTwo: null,
       tableName,
       isJoinTable: isHasJoinTable, // 是否是关联表
-      isOpen: false
+      isOpen: false,
+      initializationQuery
     }
   },
   computed: {
@@ -144,6 +151,56 @@ export default {
         })
       })
     },
+    emitSubmitForm() {
+      const gridParams = store.get(this.code)
+      let canSearch = true
+      if (isHasOptionFunction('beforeListQueryButtonClick', this.code)) {
+        canSearch = gridParams.options.beforeListQueryButtonClick.call(this, {
+          searchForm: this.searchForm
+        })
+      }
+      if (isPromise(canSearch)) {
+        canSearch.then((result) => {
+          if (result === undefined || result === true) {
+            this.$emit('submit-form')
+          } else {
+            this.searchComplete()
+          }
+        })
+      } else {
+        if (canSearch === undefined || canSearch === true) {
+          this.$emit('submit-form')
+        } else {
+          this.searchComplete()
+        }
+      }
+    },
+    emitResetForm() {
+      const gridParams = store.get(this.code)
+      this.loading = true
+      this.searchParams = this.packageSearchParam()
+      let canSearch = true
+      if (isHasOptionFunction('beforeListResetButtonClick', this.code)) {
+        canSearch = gridParams.options.beforeListResetButtonClick.call(this, {
+          searchForm: this.searchForm
+        })
+      }
+      if (isPromise(canSearch)) {
+        canSearch.then((result) => {
+          if (result === undefined || result === true) {
+            this.$emit('reset-form')
+          } else {
+            this.searchComplete()
+          }
+        })
+      } else {
+        if (canSearch === undefined || canSearch === true) {
+          this.$emit('reset-form')
+        } else {
+          this.searchComplete()
+        }
+      }
+    },
     resetForm() {
       // console.log('customComponentNames=', this.customComponentNames)
       if (this.customComponentNames && this.customComponentNames.length > 0) {

package/packages/super-grid/src/search-form.vue

@@ -144,7 +144,7 @@ export default {
   },
   data() {
     const customComponentNames = new Set()
-    const gridParams = store.get(this.code)
+		const gridParams = store.get(this.code)
     const propMap = {}
     let searchForm = {}
     if (this.searchParam !== null) {
@@ -206,7 +206,7 @@ export default {
       advancedQuery,
       normalQuery,
       searchFormList: [],
-      searchType: null
+			searchType: null
     }
   },
   computed: {