vue2-client 1.17.36 → 1.17.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.17.36",
+  "version": "1.17.38",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -259,6 +259,17 @@
               :value="item.value">{{ item.label }}
             </a-select-option>
           </template>
+          <template
+            v-else-if="attr.keyName.indexOf('async ') !== -1 || attr.keyName.indexOf('function ') !== -1">
+            <a-select-option
+              v-for="(item,index) in optionForFunc"
+              :key="index.value"
+              :value="item.value + ''">
+              <template>
+                {{ item.label }}
+              </template>
+            </a-select-option>
+          </template>
           <template v-else>
             <a-select-option
               v-for="item in $appdata.getDictionaryList(attr.keyName)"

package/src/base-client/components/common/XTab/XTab.vue

@@ -72,7 +72,7 @@ export default {
   },
   data () {
     return {
-      activeKey: 0,
+      activeKey: -1,
       // 配置
       config: undefined,
       tabBarExtraContent: undefined,
@@ -85,10 +85,10 @@ export default {
     ...mapState('account', { currUser: 'user' })
   },
   mounted () {
-    this.activeKey = this.defaultActiveKey
+    // this.activeKey = this.defaultActiveKey
     // 标记默认激活的页签为已加载
-    this.markTabAsLoaded(this.defaultActiveKey)
-    this.tabPaneChange('initTabLoading', true)
+    // this.markTabAsLoaded(this.defaultActiveKey)
+    this.tabPaneChange(this.defaultActiveKey, true)
   },
   methods: {
     // 自定义函数中调用的方法  这个不能删
@@ -113,7 +113,7 @@ export default {
         this.markTabAsLoaded(newKey)
       }
 
-      if (this.config && this.config.changeFunc) {
+      if (this.config && this.config.changeFunc && this.config.data[newKey] !== undefined) {
         let oldRef
         let oldTabName
         let newRef
@@ -148,7 +148,6 @@ export default {
 
         // 关键修改：确保新组件实例存在
         if (!newRef || !newRef[0]) {
-          console.log('等待新页签组件初始化...')
           // 等待组件挂载完成
           await this.waitForComponentReady(newKey)
           newRef = this.$refs[newTabName]
@@ -158,7 +157,7 @@ export default {
           args.push(newRef[0])
         } else {
           args.push(null)
-          console.warn('新页签组件实例获取失败')
+          console.error('新页签组件实例获取失败')
         }
 
         args.push(this.extraData)
@@ -203,7 +202,7 @@ export default {
       }
     },
 
-// 新增：等待组件就绪的方法
+    // 新增：等待组件就绪的方法
     waitForComponentReady (index) {
       return new Promise((resolve) => {
         const checkComponent = () => {

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -6,7 +6,7 @@ export default {
   components: { WorkflowDetail },
   mounted () {
     this.$refs.workFlow.init({
-      workflowId: '4476'
+      workflowId: 4640
     })
   },
   methods: {