agilebuilder-ui 1.1.50-sit2 → 1.1.50-sit4

package/lib/{tab-content-iframe-index-d31749cc.js → tab-content-iframe-index-a6efa4fc.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-d6261c73.js";
+import { _ as s } from "./index-90b19f05.js";
 const u = ["src"], f = s({ data: () => ({ src: null }), watch: { $route(n, c) {
   this.src = this.$route.query.src;
 } }, mounted() {

package/lib/{tab-content-index-43b5bbb8.js → tab-content-index-fecc0e4d.js}

@@ -1,4 +1,4 @@
-import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-d6261c73.js";
+import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-90b19f05.js";
 import { resolveComponent as u, openBlock as l, createBlock as b, withCtx as g, createVNode as v, TransitionGroup as L, createElementBlock as p, Fragment as C, renderList as T, createElementVNode as m, toDisplayString as w, normalizeClass as S, createCommentVNode as y } from "vue";
 const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ levelList: null }), computed: { levelListWithTitle() {
   return this.levelList.filter((e) => e.meta.title !== void 0 && e.meta.title !== null);

package/lib/{tache-subprocess-history-7caf5c5a.js → tache-subprocess-history-3204f7f2.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as t, openBlock as a, createElementBlock as s, createElementVNode as y, createVNode as l, withCtx as r, createTextVNode as n, toDisplayString as p, createCommentVNode as c, createBlock as h } from "vue";
-import { _ as I } from "./index-d6261c73.js";
+import { _ as I } from "./index-90b19f05.js";
 const g = { style: { "padding-bottom": "10px" } }, k = { key: 0, class: "graphDiv" }, N = I({ name: "TacheSubprocessHistory", data: () => ({ type: "graph", workflowId: null }), created() {
   const o = this.$route.query.workflowId;
   o && (this.workflowId = parseInt(o));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.50-sit2",
+  "version": "1.1.50-sit4",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/super-grid/src/apis.js

@@ -1471,6 +1471,15 @@ const apis = {
       }
     }
     gridParams.gridData[rowIndex]['validateErrorField'] = fieldName
+  },
+  /**
+   * 手动执行自定义查询
+   * @param {Array} searchableColumns 查询字段集合
+   * @param {object} searchData 查询值对象。例如：{'DEPT_CODE':'xxx','DEPT_NAME':'xxxx'}
+   */
+  handleSearch(searchableColumns, searchData){
+    const searchForm = this.packageSearchParamNormalType(searchableColumns, searchData)
+    this.doSearch(searchForm)
   }
 }
 export default apis

package/packages/super-grid/src/search-methods.js

@@ -7,140 +7,7 @@ const searchMethods = {
       this.searchType === undefined ||
       this.searchType === ''
     ) {
-      const searchParams = []
-      this.searchableColumns.forEach((column) => {
-        const param = { leftBracket: '', rightBracket: '', joinSign: 'and' }
-        // 布尔型字段时prop中去掉了is字符，查询时返回带有is的属性字段，
-        // 否则会导致查询布尔型报500错误
-        let orgProp = column.orgProp
-        // sql查询时，会把点“.”改为两个下划线"__"
-        const replaceDot = '__'
-        if (orgProp && orgProp.indexOf(replaceDot) > 0) {
-          // 表示包括点“.”，需要把两个下划线"__"重新改为点“.”,否则会导致查询报500错误
-          orgProp = orgProp.replace(replaceDot, '.')
-        }
-        param.propName = orgProp
-        param.enumName = column.enumName
-        param.operator = this.getOperator(column)
-        param.dataType = column.dataType
-        param.matchingType = column.queryMatching
-        param.formatter = column.formatter ? JSON.parse(JSON.stringify(column.formatter)) : column.formatter
-        param.isEmptyValue = column._emptyValue && column._emptyValue === '#blank#' ? true : false
-        const values = this.getFormItemValue(column.prop)
-        if (column.dataType === 'DATE' || column.dataType === 'TIME') {
-          // 日期 或 时间类型
-          // console.log('values==', values, column.prop)
-          if (values && values.length === 2 && values[0] !== null && values[1] !== null) {
-            const format = this.getDateTimeSearchFormatter(column, column.dataType, column.formatter)
-            if (format) {
-              if (!param.formatter) {
-                param.formatter = {}
-                param.formatter.options = {}
-              } else if (!param.formatter.options) {
-                param.formatter.options = {}
-              }
-              param.formatter.options.format = format
-            }
-            param.startValue = this.getDateTimeMillsByDateStr(values[0], format)
-            param.endValue = this.getDateTimeMillsByDateStr(values[1], format)
-            searchParams.push(param)
-          }
-        } else if (
-          (column.dataType === 'INTEGER' || column.dataType === 'LONG' || column.dataType === 'DOUBLE') &&
-          Array.isArray(values)
-        ) {
-          // 日期 或 时间类型
-          // const values1 = this.getFormItemValue(column.prop)
-          if (values) {
-            if (column.componentType === 'yearRange') {
-              if (values[0] || values[1]) {
-                param.startValue = values[0]
-                param.endValue = values[1]
-                if (values[0] && !values[1]) {
-                  param.startValue = values[0]
-                  param.endValue = 9999
-                } else if (!values[0] && values[1]) {
-                  param.startValue = 0
-                  param.endValue = values[1]
-                }
-                searchParams.push(param)
-              }
-            } else {
-              if (!Array.isArray(values) || values.length < 2 || (values[0] === null && values[1] === null)) {
-                // 填写了一个有效值
-                if (!Array.isArray(values)) {
-                  param.propValue = values
-                  searchParams.push(param)
-                } else if (values.length < 2) {
-                  param.propValue = values[0]
-                  searchParams.push(param)
-                } else if (values[0] === null) {
-                  param.propValue = values[1]
-                  searchParams.push(param)
-                } else if (values[1] === null) {
-                  param.propValue = values[0]
-                  searchParams.push(param)
-                }
-              } else {
-                // 填写了两个有效值
-
-                param.startValue = values[0]
-                param.endValue = values[1]
-                searchParams.push(param)
-              }
-            }
-          }
-        } else if (
-          column.componentType &&
-          column.componentType.indexOf('Tree') !== -1 &&
-          column.componentType.indexOf('single') === -1
-        ) {
-          // 说明是多选组织树
-          // 是否是人员树
-          const isUser = this.isUserTree(column.componentType)
-          const values = this.getFormItemValue(column.prop)
-          if (values && values !== '') {
-            const newValue = []
-            let valueArr = values
-            if (Array.isArray(values)) {
-              // 表示是数组
-              valueArr = values
-            } else {
-              // 表示是字符串
-              valueArr = values.split(',')
-            }
-            if (Array.isArray(valueArr) && valueArr && valueArr.length > 0) {
-              valueArr.forEach((val) => {
-                // 截取用户名中的英文名信息
-                const userName = this.getUserName(isUser, val)
-                if (userName !== undefined && userName !== null) {
-                  newValue.push(userName)
-                }
-              })
-            }
-            this.packageValueWithArray(newValue, searchParams, param)
-          }
-        } else if (column.componentType && column.componentType.indexOf('Tree') !== -1) {
-          // 说明是单选组织树
-          // 是否是人员树
-          const isUser = this.isUserTree(column.componentType)
-          let propValue = this.getFormItemValue(column.prop)
-          // 截取用户名中的英文名信息
-          propValue = this.getUserName(isUser, propValue)
-          this.packageValueWithArray(propValue, searchParams, param)
-        } else {
-          if (column.componentType === 'multiselect') {
-            // 表示是多选下拉框选择器选择的值
-            const values = this.getFormItemValue(column.prop)
-            // console.log('values==', values, column.prop)
-            this.packageValueWithArray(values, searchParams, param)
-          } else {
-            const propValue = this.getFormItemValue(column.prop)
-            this.packageValueWithArray(propValue, searchParams, param)
-          }
-        }
-      })
-      return searchParams
+      return this.packageSearchParamNormalType(this.searchableColumns)
     } else {
       const newSearchFormList = []
       this.searchFormList.forEach((param) => {
@@ -305,7 +172,7 @@ const searchMethods = {
     }
     return val
   },
-  getOperator(column) {
+  getOperator(column, searchForm) {
     if (
       (column.dataType === 'TEXT' || column.dataType === 'CLOB') &&
       column.fuzzy &&
@@ -318,7 +185,7 @@ const searchMethods = {
     ) {
       // 是否是文本类型的字段，且启用了模糊查询，则表示操作符为contains模糊查询
       return 'CONTAIN'
-    } else if (Array.isArray(this.getFormItemValue(column.prop))) {
+    } else if (Array.isArray(this.getFormItemValue(column.prop, null, searchForm))) {
       if (column.dataType === 'INTEGER' || column.dataType === 'LONG' || column.dataType === 'DOUBLE') {
         return 'BETWEEN'
       } else {
@@ -329,7 +196,10 @@ const searchMethods = {
       return 'EQ'
     }
   },
-  getFormItemValue(prop, index) {
+  getFormItemValue(prop, index, searchForm) {
+    if(!searchForm){
+      searchForm = this.searchForm
+    }
     if (prop.indexOf('.') > 0) {
       const parentOjbect = this.getParentObject(prop)
       if (index != null && index !== undefined) {
@@ -339,9 +209,9 @@ const searchMethods = {
       }
     } else {
       if (index != null && index !== undefined) {
-        return this.searchForm[prop][index]
+        return searchForm[prop][index]
       } else {
-        return this.searchForm[prop]
+        return searchForm[prop]
       }
     }
   },
@@ -508,6 +378,145 @@ const searchMethods = {
       return queryRangeFormat
     }
     return queryRange
+  },
+  packageSearchParamNormalType(searchableColumns, searchForm) {
+    const searchParams = []
+    if(!searchableColumns){
+      return searchParams
+    }
+    searchableColumns.forEach((column) => {
+      const param = { leftBracket: '', rightBracket: '', joinSign: 'and' }
+      // 布尔型字段时prop中去掉了is字符，查询时返回带有is的属性字段，
+      // 否则会导致查询布尔型报500错误
+      let orgProp = column.orgProp
+      // sql查询时，会把点“.”改为两个下划线"__"
+      const replaceDot = '__'
+      if (orgProp && orgProp.indexOf(replaceDot) > 0) {
+        // 表示包括点“.”，需要把两个下划线"__"重新改为点“.”,否则会导致查询报500错误
+        orgProp = orgProp.replace(replaceDot, '.')
+      }
+      param.propName = orgProp
+      param.enumName = column.enumName
+      param.operator = this.getOperator(column, searchForm)
+      param.dataType = column.dataType
+      param.matchingType = column.queryMatching
+      param.formatter = column.formatter ? JSON.parse(JSON.stringify(column.formatter)) : column.formatter
+      param.isEmptyValue = column._emptyValue && column._emptyValue === '#blank#' ? true : false
+      const values = this.getFormItemValue(column.prop, null, searchForm)
+      if (column.dataType === 'DATE' || column.dataType === 'TIME') {
+        // 日期 或 时间类型
+        // console.log('values==', values, column.prop)
+        if (values && values.length === 2 && values[0] !== null && values[1] !== null) {
+          const format = this.getDateTimeSearchFormatter(column, column.dataType, column.formatter)
+          if (format) {
+            if (!param.formatter) {
+              param.formatter = {}
+              param.formatter.options = {}
+            } else if (!param.formatter.options) {
+              param.formatter.options = {}
+            }
+            param.formatter.options.format = format
+          }
+          param.startValue = this.getDateTimeMillsByDateStr(values[0], format)
+          param.endValue = this.getDateTimeMillsByDateStr(values[1], format)
+          searchParams.push(param)
+        }
+      } else if (
+        (column.dataType === 'INTEGER' || column.dataType === 'LONG' || column.dataType === 'DOUBLE') &&
+        Array.isArray(values)
+      ) {
+        // 日期 或 时间类型
+        // const values1 = this.getFormItemValue(column.prop, null, searchForm)
+        if (values) {
+          if (column.componentType === 'yearRange') {
+            if (values[0] || values[1]) {
+              param.startValue = values[0]
+              param.endValue = values[1]
+              if (values[0] && !values[1]) {
+                param.startValue = values[0]
+                param.endValue = 9999
+              } else if (!values[0] && values[1]) {
+                param.startValue = 0
+                param.endValue = values[1]
+              }
+              searchParams.push(param)
+            }
+          } else {
+            if (!Array.isArray(values) || values.length < 2 || (values[0] === null && values[1] === null)) {
+              // 填写了一个有效值
+              if (!Array.isArray(values)) {
+                param.propValue = values
+                searchParams.push(param)
+              } else if (values.length < 2) {
+                param.propValue = values[0]
+                searchParams.push(param)
+              } else if (values[0] === null) {
+                param.propValue = values[1]
+                searchParams.push(param)
+              } else if (values[1] === null) {
+                param.propValue = values[0]
+                searchParams.push(param)
+              }
+            } else {
+              // 填写了两个有效值
+
+              param.startValue = values[0]
+              param.endValue = values[1]
+              searchParams.push(param)
+            }
+          }
+        }
+      } else if (
+        column.componentType &&
+        column.componentType.indexOf('Tree') !== -1 &&
+        column.componentType.indexOf('single') === -1
+      ) {
+        // 说明是多选组织树
+        // 是否是人员树
+        const isUser = this.isUserTree(column.componentType)
+        const values = this.getFormItemValue(column.prop, null, searchForm)
+        if (values && values !== '') {
+          const newValue = []
+          let valueArr = values
+          if (Array.isArray(values)) {
+            // 表示是数组
+            valueArr = values
+          } else {
+            // 表示是字符串
+            valueArr = values.split(',')
+          }
+          if (Array.isArray(valueArr) && valueArr && valueArr.length > 0) {
+            valueArr.forEach((val) => {
+              // 截取用户名中的英文名信息
+              const userName = this.getUserName(isUser, val)
+              if (userName !== undefined && userName !== null) {
+                newValue.push(userName)
+              }
+            })
+          }
+          this.packageValueWithArray(newValue, searchParams, param)
+        }
+      } else if (column.componentType && column.componentType.indexOf('Tree') !== -1) {
+        // 说明是单选组织树
+        // 是否是人员树
+        const isUser = this.isUserTree(column.componentType)
+        let propValue = this.getFormItemValue(column.prop, null, searchForm)
+        // 截取用户名中的英文名信息
+        propValue = this.getUserName(isUser, propValue)
+        this.packageValueWithArray(propValue, searchParams, param)
+      } else {
+        if (column.componentType === 'multiselect') {
+          // 表示是多选下拉框选择器选择的值
+          const values = this.getFormItemValue(column.prop, null, searchForm)
+          // console.log('values==', values, column.prop)
+          this.packageValueWithArray(values, searchParams, param)
+        } else {
+          const propValue = this.getFormItemValue(column.prop, null, searchForm)
+          this.packageValueWithArray(propValue, searchParams, param)
+        }
+      }
+    })
+    return searchParams
   }
 }
 export default searchMethods

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

@@ -227,6 +227,7 @@ import { getGuId } from '../../../src/utils/guid.js'
 // import resizeMixin from '../../../src/mixins/resizeMixin.js';
 import storeVuex from '../../../src/store'
 import { setPageDataToChatAiStore, setPageInfoToChatStore } from '../../../src/utils/chat-ai-util.ts'
+import searchMethods from './search-methods'
 export default {
   components: {
     IndexColumn,
@@ -943,6 +944,7 @@ export default {
     ...events,
     ...publicMethods,
     ...superGridService,
+		...searchMethods,
     ...apis,
     onResize(entry) {
       this.resizeTableHeight()