agilebuilder-ui 1.1.50-sit1 → 1.1.50-sit3

package/lib/{tab-content-iframe-index-75aa0f68.js → tab-content-iframe-index-0768e207.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-c625583f.js";
+import { _ as s } from "./index-aad7870b.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-229106e0.js → tab-content-index-dedfc960.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-c625583f.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-aad7870b.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-ea3e3d70.js → tache-subprocess-history-81710a48.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-c625583f.js";
+import { _ as I } from "./index-aad7870b.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-sit1",
+  "version": "1.1.50-sit3",
   "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/dynamic-input.vue

@@ -861,12 +861,20 @@ export default {
     // 如果是多选文件类型，需要解析（需要设置临时字段，判断文件还是图片，图片需要预览）
     if (this.column.valueSetOptions) {
       if (this.column.componentType === 'switch') {
-        const valueSetOptionsObj = JSON.parse(this.column.valueSetOptions)
+        let valueSetOptionsObj = JSON.parse(this.column.valueSetOptions)
+        if(typeof valueSetOptionsObj === 'string'){
+          // 再转一次
+          valueSetOptionsObj = JSON.parse(valueSetOptionsObj)
+        }
         if (valueSetOptionsObj) {
           this.valueSetOptions = valueSetOptionsObj
         }
       } else if (this.column.componentType !== 'inputNumber') {
-        const valueSetOptionsObj = JSON.parse(this.column.valueSetOptions)
+        let valueSetOptionsObj = JSON.parse(this.column.valueSetOptions)
+        if(typeof valueSetOptionsObj === 'string'){
+          // 再转一次
+          valueSetOptionsObj = JSON.parse(valueSetOptionsObj)
+        }
         if (valueSetOptionsObj && valueSetOptionsObj.valueSetOptions) {
           this.valueSetOptions = valueSetOptionsObj.valueSetOptions
         }
@@ -990,7 +998,11 @@ export default {
      */
     getDateAllowTime() {
       if (this.column.valueSetOptions) {
-        const optionsObj = JSON.parse(this.column.valueSetOptions)
+        let optionsObj = JSON.parse(this.column.valueSetOptions)
+        if(typeof optionsObj === 'string'){
+          // 再转一次
+          optionsObj = JSON.parse(optionsObj)
+        }
         const nowTime = Date.now()
         if (optionsObj.stateForbiddenTime) {
           const stateDayNumber = optionsObj.stateForbiddenTime
@@ -1822,7 +1834,11 @@ export default {
             this.column.valueSetOptions !== '' &&
             this.column.componentType === 'inputNumber'
           ) {
-            const inputNumberSetting = JSON.parse(this.column.valueSetOptions)
+            let inputNumberSetting = JSON.parse(this.column.valueSetOptions)
+            if(typeof inputNumberSetting === 'string'){
+              // 再转一次
+              inputNumberSetting = JSON.parse(inputNumberSetting)
+            }
             if (inputNumberSetting.min) {
               defaultValue = inputNumberSetting.min
             }
@@ -1912,7 +1928,11 @@ export default {
           this.column.valueSetOptions !== '' &&
           this.column.componentType === 'inputNumber'
         ) {
-          const inputNumberSetting = JSON.parse(this.column.valueSetOptions)
+          let inputNumberSetting = JSON.parse(this.column.valueSetOptions)
+          if(typeof inputNumberSetting === 'string'){
+            // 再转一次
+            inputNumberSetting = JSON.parse(inputNumberSetting)
+          }
           this.inputNumberSet = inputNumberSetting
         } else {
           this.inputNumberSet = {

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) => {
@@ -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)
+      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/utils/value-set.js

@@ -27,7 +27,7 @@ function packageEnumAndBeanColumnValueSetsWhenPlate(columns, listCode) {
       let titleValueSet = null
       const titleValueSetJson = column.titleValueSet
       if (titleValueSetJson) {
-        titleValueSet = packageEnumAndBeanColumnValueSet(JSON.parse(titleValueSetJson))
+        titleValueSet = column.titleValueSet
       }
       if (columnValueSet || titleValueSet) {
         const valueSetMeta = {
@@ -150,11 +150,7 @@ function getDataSourceConfigList(columns) {
     const column = columns[i]
     const prop = column.prop ? column.prop : column.label
     const columnValueSet = getConfigWithValueSet(column, prop, column)
-    let titleValueSet = null
-    const titleValueSetJson = column.titleValueSet
-    if (titleValueSetJson) {
-      titleValueSet = getConfigWithValueSet(JSON.parse(titleValueSetJson), prop)
-    }
+    let titleValueSet = getConfigWithTitleValueSet(column.titleValueSetOptions, prop)
     if (columnValueSet || titleValueSet) {
       if (columnValueSet) {
         // 字段的值设置
@@ -178,14 +174,14 @@ function getConfigWithValueSet(valueSetInfo, prop, column) {
    * bean形式值设置前缀
    */
   const BEAN_NAME_PREFIX = 'beanname:'
-  const enumName = valueSetInfo.enumName
-  const beanName = valueSetInfo.beanName
+  const enumName = valueSetInfo?valueSetInfo.enumName:null
+  const beanName = valueSetInfo?valueSetInfo.beanName:null
   let infoObj = {
     uuid: prop
   }
   // 选项组的在解析列表字段配置时就获得了，不需要在此处获得了
   if (enumName && enumName !== '') {
-    if (valueSetInfo.remoteEnum === true) {
+    if (valueSetInfo && valueSetInfo.remoteEnum === true) {
       // 需要远程获得枚举值
       infoObj.type = 'enumName'
       infoObj.props = {
@@ -233,3 +229,47 @@ function getConfigWithValueSet(valueSetInfo, prop, column) {
   }
   return null
 }
+
+// 动态列标题列值设置解析
+function getConfigWithTitleValueSet(valueSetOptions, prop) {
+  let valueSetOptionsObj
+  if(valueSetOptions){
+    valueSetOptionsObj = JSON.parse(valueSetOptions)
+  }
+  let infoObj = {
+    uuid: prop
+  }
+  if (valueSetOptionsObj) {
+    // 动态数据源(select开启value-label自动转换或者)、数据表/视图、服务
+    const valueSetOptionsObj = JSON.parse(valueSetOptions)
+    if (
+      valueSetOptionsObj.type || valueSetOptionsObj.dynamicDataSourceCode
+    ) {
+      // 表示是动态数据源等值设置信息
+      // const isShouldInitSearch = (valueSetOptionsObj.filterType === undefined || valueSetOptionsObj.filterType != 'remote')
+      if (!valueSetOptionsObj.type || valueSetOptionsObj.type !== 'optionGroup') {
+        // 选项组时不需要在此处获得
+        Object.assign(infoObj, valueSetOptionsObj)
+        // 更新uuid为字段名
+        infoObj.uuid = prop
+        if (!infoObj.props) {
+          infoObj.props = {}
+        }
+        infoObj.props.prop = prop
+      }
+      if (valueSetOptionsObj.dynamicDataSourceCode) {
+        infoObj.type = 'dynamicData'
+        if (!infoObj.props) {
+          infoObj.props = {}
+        }
+        infoObj.props.code = valueSetOptionsObj.dynamicDataSourceCode
+      }
+    }
+  }
+  if (infoObj.type) {
+    // 表示是有效的值设置
+    return infoObj
+  }
+  return null
+}
+