agilebuilder-ui 1.1.35-sit2 → 1.1.35-sit3

package/lib/{tab-content-iframe-index-84fee73c.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-5d1deed4.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-ddd15021.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-5d1deed4.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-00e89e0a.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-5d1deed4.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-sit2",
+  "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)

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

@@ -211,7 +211,7 @@ function getConfigWithValueSet(valueSetInfo, prop, column) {
   }else if(column && column.valueSetOptions) {
     // 动态数据源、数据表/视图、服务
     const valueSetOptionsObj = JSON.parse(column.valueSetOptions)
-    if((valueSetOptionsObj.type || valueSetOptionsObj.dynamicDataSourceCode) && (valueSetOptionsObj.valueLabelSwitch || valueSetOptionsObj.valueLabelSwitch=== undefined)){
+    if((valueSetOptionsObj.type || valueSetOptionsObj.dynamicDataSourceCode) && valueSetOptionsObj.valueLabelSwitch){
       // 表示是动态数据源等值设置信息
       // const isShouldInitSearch = (valueSetOptionsObj.filterType === undefined || valueSetOptionsObj.filterType != 'remote')
       if(!valueSetOptionsObj.type || valueSetOptionsObj.type !== 'optionGroup'){