agilebuilder-ui 1.1.35-sit1 → 1.1.35-sit3

package/lib/{tab-content-iframe-index-f6bcacf3.js → tab-content-iframe-index-8f8128dd.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-73d07db3.js";
+import { _ as s } from "./index-78107f31.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-4a0d7f2d.js → tab-content-index-9d7fc3c7.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-73d07db3.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-78107f31.js";
 import { resolveComponent as u, openBlock as d, createBlock as b, withCtx as g, createVNode as v, TransitionGroup as L, createElementBlock as p, Fragment as T, renderList as C, 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-dcb3009a.js → tache-subprocess-history-a3e8a008.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-73d07db3.js";
+import { _ as I } from "./index-78107f31.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.35-sit1",
+  "version": "1.1.35-sit3",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

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

@@ -1,4 +1,3 @@
-import { isDynamicDataSourceSource } from './utils'
 import dayjs from 'dayjs'
 import weekOfYear from 'dayjs/plugin/weekOfYear'
 dayjs.extend(weekOfYear)
@@ -165,7 +164,7 @@ export function doFormatWithValueSet(column, value) {
   const valueSet = column.valueSet
   // 先处理值设置再处理格式化设置：即会对值设置的结果进行格式化设置
   if (valueSet !== undefined) {
-    if (column.componentType === 'multiselect' && !isDynamicDataSourceSource(column)) {
+    if (column.componentType === 'multiselect') {
       if (typeof value === 'number') {
         // 当value是0时， value instanceof Number 为false
         value += ''
@@ -180,7 +179,9 @@ export function doFormatWithValueSet(column, value) {
           label.push(item[0].label)
         }
       })
-      value = label.join(',')
+      if(label.length > 0){
+        value = label.join(',')
+      }
     } else {
       const item = valueSet.filter((item) => {
         return item.value === value + ''

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

@@ -30,7 +30,6 @@
 import searchMethods from './search-methods'
 import SearchFormItem from './search-form-item.vue'
 import SearchButton from './search-button.vue'
-import storeVuex from '../../../src/store';
 
 export default {
 	name: 'SearchFormOpen',

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

@@ -101,7 +101,7 @@ const superGridService = {
             }
 
             // 需要多个组件共享的数据放到store中，避免组件定义一堆props来接收这些共享数据
-            packageEnumAndBeanColumnValueSets(data.columns, this.code)
+            packageEnumAndBeanColumnValueSets(data.columns, this.code, gridParams.additionalParamMap, this.parentFormData)
               .then(() => {
                 return this.getDynamicColumnByBean(
                   additionalParams,

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

@@ -755,7 +755,15 @@ export function getDynamicDataSourceOptions(column, isSql, additionalParamMap, b
 
 // 值设置是否是动态数据源类型的数据源
 export function isDynamicDataSourceSource(column) {
+  if(column.valueSetOptions) {
+    const valueSetOptionsObj = JSON.parse(column.valueSetOptions)
+    if((valueSetOptionsObj.type && valueSetOptionsObj.type === 'dynamicData') || valueSetOptionsObj.dynamicDataSourceCode){
+      // 表示是动态数据源
+      return true
+    }
+  }
   if (column.valueSet && column.valueSet.length > 0 && column.valueSet[0].value === 'dynamicDataSource') {
+    // 表示是动态数据源
     return true
   } else {
     return false

package/packages/utils/value-set.js

@@ -1,8 +1,19 @@
 import * as Vue from 'vue'
+import { isPlateSys } from '../../src/utils/common-util'
+
+export function packageEnumAndBeanColumnValueSets(columns, listCode, additionalParamMap, entity) {
+  if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
+    // 平台系统时，beanName和枚举类型时
+    return packageEnumAndBeanColumnValueSetsWhenPlate(columns, listCode)
+  } else {
+    // 业务系统时，获得选项配置
+    return packageEnumAndBeanColumnValueSetsWhenOtherSys(columns, listCode, additionalParamMap, entity)
+  }
+}
 /**
  * 封装值设置为枚举 或 bean方式时的值为'key-value'键值对信息
  */
-export function packageEnumAndBeanColumnValueSets(columns, listCode) {
+function packageEnumAndBeanColumnValueSetsWhenPlate(columns, listCode) {
   return new Promise((resolve, reject) => {
     const valueSetColumnsInfo = {
       listCode: listCode,
@@ -95,3 +106,138 @@ function packageEnumAndBeanColumnValueSet(valueSetInfo) {
     return BEAN_NAME_PREFIX + beanName
   }
 }
+
+/**
+ * 封装值设置为枚举 或 bean方式时的值为'key-value'键值对信息
+ */
+function packageEnumAndBeanColumnValueSetsWhenOtherSys(columns, listCode, additionalParamMap, entity, systemCode) {
+  return new Promise((resolve, reject) => { 
+    const dataSourceList = getDataSourceConfigList(columns)
+    const valueSetColumnIndexs = dataSourceList.valueSetColumnIndexs
+    const param = {
+      listCode: listCode,
+      entityMap: entity,
+      additionalParamMap: additionalParamMap,
+      dataSourceList: dataSourceList.dataSourceConfigList,
+      dataSourceListTitle: dataSourceList.dataSourceConfigListTitle,
+      systemCode: systemCode
+    }
+    const url = window.$vueApp.config.globalProperties.baseURL + '/common/common-data/find-grid-datas'
+    //const url = window['$vueApp'].config.globalProperties.baseAPI + '/common/common-data/xxxx'
+    window.$vueApp.config.globalProperties.$http
+      .post(url, param)
+      .then((result) => {
+        const columnValueSet = result.columnValueSet
+        const columnTitleValueSet = result.columnTitleValueSet
+        for(let prop in valueSetColumnIndexs){
+          const columnIndex = valueSetColumnIndexs[prop]
+          const valueSet = columnValueSet[prop]
+          if (valueSet) {
+            columns[columnIndex].valueSet = valueSet
+          }
+          const valueSetTitle = columnTitleValueSet[prop]
+          if (valueSetTitle) {
+            columns[columnIndex].titleValueSetValue = valueSetTitle
+          }
+        }
+        console.log('查询选项数据完成', result)
+        resolve(result)
+      })
+      .catch((error) => {
+        console.log('查询选项数据失败', error)
+        //失败时
+        reject(error)
+      })
+  })
+}
+
+function getDataSourceConfigList(columns) {
+  const dataSourceConfigList = []
+  const dataSourceConfigListTitle = []
+  const valueSetColumnIndexs = {}
+  for (let i = 0; i < columns.length; i++) {
+    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)
+    }
+    if (columnValueSet || titleValueSet) {
+      if (columnValueSet) {
+        // 字段的值设置
+        dataSourceConfigList.push(columnValueSet)
+      }
+      if (titleValueSet) {
+        dataSourceConfigListTitle.push(titleValueSet)
+      }
+      valueSetColumnIndexs[prop] = i
+    }
+  }
+  return {dataSourceConfigList, dataSourceConfigListTitle, valueSetColumnIndexs}
+}
+
+function getConfigWithValueSet(valueSetInfo, prop, column) {
+  /**
+   * 枚举类型值设置前缀
+   */
+  const ENUM_NAME_PREFIX = 'enumname:'
+  /**
+   * bean形式值设置前缀
+   */
+  const BEAN_NAME_PREFIX = 'beanname:'
+  const enumName = valueSetInfo.enumName
+  const beanName = valueSetInfo.beanName
+  let infoObj = {
+    uuid: prop
+  }
+  // 选项组的在解析列表字段配置时就获得了，不需要在此处获得了
+  if (enumName && enumName !== '') {
+    if (valueSetInfo.remoteEnum === true) {
+      // 需要远程获得枚举值
+      infoObj.type = 'enumName'
+      infoObj.props = {
+        prop: prop,
+        valueSet: ENUM_NAME_PREFIX + enumName
+      }
+    }
+  } else if (beanName && beanName !== '') {
+      infoObj.type = 'beanName'
+      infoObj.props = {
+        prop: prop,
+        valueSet: BEAN_NAME_PREFIX + beanName
+      }
+  }else if(column && column.valueSetOptions) {
+    // 动态数据源、数据表/视图、服务
+    const valueSetOptionsObj = JSON.parse(column.valueSetOptions)
+    if((valueSetOptionsObj.type || valueSetOptionsObj.dynamicDataSourceCode) && valueSetOptionsObj.valueLabelSwitch){
+      // 表示是动态数据源等值设置信息
+      // 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
+}
+
+