agilebuilder-ui 1.1.62 → 1.1.64

package/lib/{tab-content-iframe-index-f46a1375.js → tab-content-iframe-index-033ef471.js}

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

package/lib/{tab-content-index-92a1b881.js → tab-content-index-5f14c4e6.js}

@@ -1,4 +1,4 @@
-import { a8 as v, aa as I, ab as N, ac as $, ad as S, ae as E, af as F, ag as C, ah as O, ai as W, aj as R, ak as B, al as w, am as V } from "./index-f28c8390.js";
+import { a8 as v, aa as I, ab as N, ac as $, ad as S, ae as E, af as F, ag as C, ah as O, ai as W, aj as R, ak as B, al as w, am as V } from "./index-5b6965ad.js";
 import { createVNode as g, resolveComponent as d, openBlock as u, createBlock as p, withCtx as h, renderSlot as L, createElementBlock as f, normalizeClass as A, createCommentVNode as x, Fragment as k, renderList as P, defineComponent as D, h as b, createTextVNode as U, toDisplayString as T, TransitionGroup as j, createElementVNode as _ } from "vue";
 $(["sidebar", "protectedRouters"]);
 const J = v(D({ name: "MenuItem", functional: !0, props: { icon: { type: String, default: "" }, title: { type: String, default: "" }, hasChildren: { type: Boolean, default: !1 }, isRoot: { type: Boolean, default: !1 }, code: { type: Boolean, default: !1 }, backlogTotal: { type: Number, default: 0 }, menuLayer: { type: Number, default: null } }, render(e) {

package/lib/{tache-subprocess-history-97c77ac4.js → tache-subprocess-history-fdff909d.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as t, openBlock as l, createElementBlock as s, createElementVNode as y, createVNode as a, withCtx as r, createTextVNode as n, toDisplayString as p, createCommentVNode as c, createBlock as h } from "vue";
-import { a8 as I } from "./index-f28c8390.js";
+import { a8 as I } from "./index-5b6965ad.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/lib/{timeline-definition-MYPXXCX6-gLqnWxDu-aac04978.js → timeline-definition-MYPXXCX6-gLqnWxDu-a9d86afa.js}

@@ -1,6 +1,6 @@
-import { _ as a, D as yt, ag as gt, z as ft, d as G, c as mt, l as S, ac as xt, ad as bt, ae as _t, af as kt } from "./mermaid.core-CAqkCmS1-857883cc.js";
-import { d as K } from "./arc-Js_tyW10-fda7779e.js";
-import "./index-f28c8390.js";
+import { _ as a, D as yt, ag as gt, z as ft, d as G, c as mt, l as S, ac as xt, ad as bt, ae as _t, af as kt } from "./mermaid.core-CAqkCmS1-05df47fd.js";
+import { d as K } from "./arc-Js_tyW10-fbbc703f.js";
+import "./index-5b6965ad.js";
 import "vue";
 var q = function() {
   var n = a(function(s, d, l, h) {

package/lib/treemap-75Q7IDZK-B2atdfMH-cd6fd4ec.js

@@ -0,0 +1,11 @@
+import { T as s, h as T } from "./mermaid-parser.core-CH9ryA1K-10bc2e61.js";
+import "./index-5b6965ad.js";
+import "vue";
+import "./mermaid.core-CAqkCmS1-05df47fd.js";
+import "./_baseUniq-BXtq6_NW-4528764f.js";
+import "./min-BngCxx8g-524ed8b2.js";
+import "./clone-CEJtuQzg-882c7a6d.js";
+export {
+  s as TreemapModule,
+  T as createTreemapServices
+};

package/lib/{xychartDiagram-H2YORKM3-Whqa4ezL-00f4d70f.js → xychartDiagram-H2YORKM3-Whqa4ezL-d040fede.js}

@@ -1,8 +1,8 @@
-import { _ as n, a1 as hi, G as gt, F as Bt, H as oi, aD as ri, l as zt, a9 as kt, i as li, t as Ot, b as ci, a as gi, q as ui, g as xi, s as di, z as pi, K as fi, e as mi } from "./mermaid.core-CAqkCmS1-857883cc.js";
+import { _ as n, a1 as hi, G as gt, F as Bt, H as oi, aD as ri, l as zt, a9 as kt, i as li, t as Ot, b as ci, a as gi, q as ui, g as xi, s as di, z as pi, K as fi, e as mi } from "./mermaid.core-CAqkCmS1-05df47fd.js";
 import { i as yi } from "./init-ZxktEp_H-731b6c9b.js";
 import { o as bi } from "./ordinal-DSZU4PqD-57a34423.js";
-import { l as _t } from "./linear-DqgVh5FN-7d6a0039.js";
-import "./index-f28c8390.js";
+import { l as _t } from "./linear-DqgVh5FN-7dbb16c3.js";
+import "./index-5b6965ad.js";
 import "vue";
 import "./defaultLocale-DVr69WTU-dbb4acef.js";
 var Tt, Rt, Dt, Lt, Pt, vt, Et, Mt, It, $t;

package/package.json

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

package/packages/super-grid/src/components/select-input.vue

@@ -93,7 +93,7 @@
   </span>
 </template>
 <script lang="ts" setup>
-import { onMounted, ref, defineProps, defineEmits } from 'vue'
+import { onMounted, ref, defineProps, defineEmits, watch } from 'vue'
 import { useI18n } from 'vue-i18n'
 import {
   getClassOptionTitleCommon,
@@ -172,10 +172,18 @@ const props = defineProps({
 })
 
 const { t } = useI18n()
-const emits = defineEmits(['update:modelValue', 'cellEvent', 'extendParams', 'setCellValue', 'callCustomEventWithParam' ])
+const emits = defineEmits(['update:modelValue', 'cellEvent', 'extendParams', 'setCellValue', 'callCustomEventWithParam', 'setCellValueWithProp' ])
 const innerValue:any = ref(props.modelValue)
 const isJoinTable:any = ref(false) // 是否是关联表
-
+// 监控props.modelValue，解决js代码修改属性值时，下拉框显示值不改变问题
+watch(
+  () => props.modelValue,
+  (newVal, oldVal) => {
+    console.log('watch---props.modelValue---newVal=', newVal)
+    innerValue.value = newVal
+  },
+  { immediate: true }
+)
 const copyBtnId = 'copyBtn_'+new Date().getTime()
 const gridParams = store.get(props.listCode)
 if (gridParams && gridParams.basicInfo && gridParams.basicInfo.hasJoinTable) {
@@ -224,7 +232,7 @@ onMounted(()=>{
 const changeValue = (val: any) => {
   innerValue.value = val
   console.log('changeValue----val=', val)
-  if (valueSetOptionsObj.type && valueSetOptionsObj.type === 'dataTable' && props.valueSetOptions && props.valueSetOptions.length > 0) {
+ if (valueSetOptionsObj?.type && valueSetOptionsObj.type === 'dataTable' && props.valueSetOptions && props.valueSetOptions.length > 0) {
     // 如果有valueSetOptions，则根据valueSetOptions设置对应的值
     if(val === undefined || val === null || val === '') {
       // 清空时会走该判断
@@ -235,15 +243,23 @@ const changeValue = (val: any) => {
         props.valueSetOptions.forEach((item: any) => {
           if (item.valueField !== props.prop) {
             const value = selectedOptions[item.columnName]
-            emits('setCellValue', item.valueField, value, 'change')
-            emits('cellEvent','change', value)
+  console.log('changeValue-----setCellValue前')
+            emits('setCellValueWithProp', item.valueField, value)
+  console.log('changeValue-----setCellValue后')
+  // console.log('changeValue-----cellEvent前')
+  //           emits('cellEvent','change', value)
+  // console.log('changeValue-----cellEvent后')
           }
         })
       }
     }
   }
+  console.log('changeValue-----update:modelValue前')
   emits('update:modelValue', val)
-  emits('cellEvent', 'change', val)
+  console.log('changeValue-----update:modelValue后')
+  console.log('changeValue-----setCellValue前222')
+  emits('setCellValue', props.prop, val, 'change')
+  console.log('changeValue-----setCellValue后222')
 }
 
 /**
@@ -308,15 +324,24 @@ function selectChange(arr, selectedItem) {
     // console.log('multiselectChange3---innerValue.value=', innerValue.value)
     const val = innerValue.value && innerValue.value.length > 0 ? innerValue.value.join(',') : null
     if (isSaveAll) {
+  console.log('selectChange-----input前')
       emits('cellEvent','input', val)
+  console.log('selectChange-----input后')
     }
+  console.log('selectChange-----update:modelValue前')
     emits('update:modelValue', val)
-    emits('cellEvent','change', val)
+  console.log('selectChange-----update:modelValue后')
+  // console.log('selectChange-----cellEvent change前')
+  //   emits('cellEvent','change', val)
+  // console.log('selectChange-----cellEvent change后')
+  console.log('selectChange-----setCellValue前')
     emits('setCellValue', props.prop, val, 'change')
+  console.log('selectChange-----setCellValue后')
     // this.setCellValue(this.column.prop, val, 'change')
   } else {
+  console.log('selectChange-----22222')
     emits('update:modelValue', arr)
-    emits('cellEvent','change', arr)
+    // emits('cellEvent','change', arr)
     emits('setCellValue', props.prop, arr, 'change')
   }
 }
@@ -324,7 +349,7 @@ function selectChange(arr, selectedItem) {
 // 非动态数据源时映射字段设值
 function autoSetOtherFieldsWhenMulti() {
   console.log('autoSetOtherFields----innerValue.value=', innerValue.value)
-  if (valueSetOptionsObj.type && valueSetOptionsObj.type === 'dataTable' && props.valueSetOptions && props.valueSetOptions.length > 0) {
+  if (valueSetOptionsObj?.type && valueSetOptionsObj.type === 'dataTable' && props.valueSetOptions && props.valueSetOptions.length > 0) {
     if(!isDynamicDataSource.value){
       if(!innerValue.value || innerValue.value.length === 0){
         clearValue()
@@ -351,11 +376,19 @@ function autoSetOtherFieldsWhenMulti() {
           const valueArr = autoSets[valueField]
           if(valueArr){
             const valueStr = valueArr.join(',')
-            emits('setCellValue', valueField, valueStr, 'change')
-            emits('cellEvent','change', valueStr)
+  console.log('autoSetOtherFieldsWhenMulti-----setCellValue前')
+            emits('setCellValueWithProp', valueField, valueStr)
+  console.log('autoSetOtherFieldsWhenMulti-----setCellValue后')
+  // console.log('autoSetOtherFieldsWhenMulti-----cellEvent前')
+  //           emits('cellEvent','change', valueStr)
+  // console.log('autoSetOtherFieldsWhenMulti-----cellEvent后')
           } else {
-            emits('setCellValue', valueField, null, 'change')
-            emits('cellEvent','change', null)
+  console.log('autoSetOtherFieldsWhenMulti-----setCellValue前222')
+            emits('setCellValueWithProp', valueField, null)
+  console.log('autoSetOtherFieldsWhenMulti-----setCellValue后222')
+  // console.log('autoSetOtherFieldsWhenMulti-----cellEvent前222')
+  //           emits('cellEvent','change', null)
+  // console.log('autoSetOtherFieldsWhenMulti-----cellEvent后222')
           }
         }
       }
@@ -364,16 +397,23 @@ function autoSetOtherFieldsWhenMulti() {
 }
 
 function setDynamicSourceSelectValue({ value, sourceColumnName, targetColumnName, options, selectedItem }) {
+  console.log('setDynamicSourceSelectValue------params=', value, sourceColumnName, targetColumnName, options, selectedItem)
   if (targetColumnName) {
-    emits('setCellValue', targetColumnName, value, 'input')
-    // this.setCellValue(targetColumnName, value, 'input')
-    emits('callCustomEventWithParam', 'input', {
-      value,
-      extendParams: selectedItem,
-      row: props.entity,
-      column: props.column,
-      targetColumnName
-    })
+    if(targetColumnName === props.prop){
+      // 表示是当前下拉选字段时，需要赋值并执行事件
+      emits('setCellValue', targetColumnName, value, 'input')
+      // setCellValue中有执行事件callCustomEventWithParam的代码
+      // emits('callCustomEventWithParam', 'input', {
+      //   value,
+      //   extendParams: selectedItem,
+      //   row: props.entity,
+      //   column: props.column,
+      //   targetColumnName
+      // })
+    } else {
+      // 当时映射字段时，只需要赋值，不需要事件
+      emits('setCellValueWithProp', targetColumnName, value)
+    }
   }
 }
 
@@ -431,7 +471,7 @@ function remoteMethod(searchText, isInit) {
       if (!dataSourceObj.props) {
         dataSourceObj.props = {}
       }
-      dataSourceObj.props.tableName = valueSetOptionsObj.props?.tableName
+      dataSourceObj.props.tableName = valueSetOptionsObj?.props?.tableName
       dataSourceObj.props.prop = props.prop
 
       const param:any = {
@@ -466,13 +506,15 @@ function remoteMethod(searchText, isInit) {
 }
 
 function clearValue() {
-  props.valueSetOptions.forEach((item: any) => {
-    if (item.valueField !== props.prop) {
-      // 映射字段值清空
-      emits('setCellValue', item.valueField, null, 'change')
-      emits('cellEvent','change', null)
-    }
-  })
+  if(props.valueSetOptions){
+    props.valueSetOptions.forEach((item: any) => {
+      if (item.valueField !== props.prop) {
+        // 映射字段值清空
+        emits('setCellValueWithProp', item.valueField, null)
+        // emits('cellEvent','change', null)
+      }
+    })
+  }
 }
 
 </script>

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

@@ -356,7 +356,6 @@
     <SelectInput
       v-else-if="type === 'multiselect' || type === 'select'"
       v-model="innerValue"
-      @update:modelValue="innerValue = $event"
       :disabled="disabled"
       :options="options"
       :value-set-options="valueSetOptions"
@@ -372,9 +371,11 @@
       :isSql="isSql"
       :parentFormData="parentFormData"
       :tableName="tableName"
+      @update:modelValue="innerValue = $event"
       @cellEvent="cellEvent"
       @extendParams="setExtendParams"
       @setCellValue="setCellValue"
+      @setCellValueWithProp="setCellValueWithProp"
       @callCustomEventWithParam="callCustomEventWithParam"
     />
     <el-input-number
@@ -1347,13 +1348,18 @@ export default {
     // eventNames 事件名称值为input或clear，input表示值改变时触发的事件，clear表示值清空时触发的事件
     setCellValue(prop, value, eventNames) {
       console.log('setCellValue---', prop, value, eventNames)
-      this.row[prop] = value
+      this.setCellValueWithProp(prop, value)
       if (eventNames) {
         eventNames.split(',').forEach((eventName) => {
           this.callCustomEventWithParam(eventName, { value, row: this.row, column: this.column, prop })
         })
       }
     },
+    // 设置指定字段的值，不需要走事件
+    setCellValueWithProp(prop, value) {
+      console.log('setCellValueWithProp---', prop, value)
+      this.row[prop] = value
+    },
     // 单选上传完成后存储
     radioStorageFile(fileSetObj, responseFile) {
       if (fileSetObj.showNameData) {

package/lib/architecture-O4VJ6CD3-ZoZ2IAk2-4071a604.js

@@ -1,11 +0,0 @@
-import { A as a, e as s } from "./mermaid-parser.core-CH9ryA1K-02f37cfa.js";
-import "./index-f28c8390.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-857883cc.js";
-import "./_baseUniq-BXtq6_NW-4c8da3e7.js";
-import "./min-BngCxx8g-e02eeaa5.js";
-import "./clone-CEJtuQzg-e23a7ac2.js";
-export {
-  a as ArchitectureModule,
-  s as createArchitectureServices
-};

package/lib/gitGraph-ZV4HHKMB-BSmtVGRu-b1445ba9.js

@@ -1,11 +0,0 @@
-import { G, f as s } from "./mermaid-parser.core-CH9ryA1K-02f37cfa.js";
-import "./index-f28c8390.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-857883cc.js";
-import "./_baseUniq-BXtq6_NW-4c8da3e7.js";
-import "./min-BngCxx8g-e02eeaa5.js";
-import "./clone-CEJtuQzg-e23a7ac2.js";
-export {
-  G as GitGraphModule,
-  s as createGitGraphServices
-};

package/lib/info-63CPKGFF-C8sYWczU-f6b636b0.js

@@ -1,11 +0,0 @@
-import { I as c, c as f } from "./mermaid-parser.core-CH9ryA1K-02f37cfa.js";
-import "./index-f28c8390.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-857883cc.js";
-import "./_baseUniq-BXtq6_NW-4c8da3e7.js";
-import "./min-BngCxx8g-e02eeaa5.js";
-import "./clone-CEJtuQzg-e23a7ac2.js";
-export {
-  c as InfoModule,
-  f as createInfoServices
-};

package/lib/packet-HUATNLJX-bfFWFja0-7b03abaf.js

@@ -1,11 +0,0 @@
-import { P as c, a as s } from "./mermaid-parser.core-CH9ryA1K-02f37cfa.js";
-import "./index-f28c8390.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-857883cc.js";
-import "./_baseUniq-BXtq6_NW-4c8da3e7.js";
-import "./min-BngCxx8g-e02eeaa5.js";
-import "./clone-CEJtuQzg-e23a7ac2.js";
-export {
-  c as PacketModule,
-  s as createPacketServices
-};

package/lib/pie-WTHONI2E-QPrWs3SR-8636db61.js

@@ -1,11 +0,0 @@
-import { b as s, d as c } from "./mermaid-parser.core-CH9ryA1K-02f37cfa.js";
-import "./index-f28c8390.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-857883cc.js";
-import "./_baseUniq-BXtq6_NW-4c8da3e7.js";
-import "./min-BngCxx8g-e02eeaa5.js";
-import "./clone-CEJtuQzg-e23a7ac2.js";
-export {
-  s as PieModule,
-  c as createPieServices
-};

package/lib/radar-NJJJXTRR-BnUCJhQL-3864d94f.js

@@ -1,11 +0,0 @@
-import { R as d, g as s } from "./mermaid-parser.core-CH9ryA1K-02f37cfa.js";
-import "./index-f28c8390.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-857883cc.js";
-import "./_baseUniq-BXtq6_NW-4c8da3e7.js";
-import "./min-BngCxx8g-e02eeaa5.js";
-import "./clone-CEJtuQzg-e23a7ac2.js";
-export {
-  d as RadarModule,
-  s as createRadarServices
-};

package/lib/treemap-75Q7IDZK-B2atdfMH-c5d83a00.js

@@ -1,11 +0,0 @@
-import { T as s, h as T } from "./mermaid-parser.core-CH9ryA1K-02f37cfa.js";
-import "./index-f28c8390.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-857883cc.js";
-import "./_baseUniq-BXtq6_NW-4c8da3e7.js";
-import "./min-BngCxx8g-e02eeaa5.js";
-import "./clone-CEJtuQzg-e23a7ac2.js";
-export {
-  s as TreemapModule,
-  T as createTreemapServices
-};