vue2-client 1.14.94 → 1.14.97

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -38,7 +38,13 @@
             <a-card :bordered="false" :loading="loadingHistory" :body-style="{ paddingTop: 0 }">
               <!--   当前步骤历史记录   -->
               <template v-if="showTab">
-                <x-tab :compProp="{ buttonState: { add: false, edit: false, delete: false, import: false }}" :local-config="tabDesigner" :body-style="{ padding: 0 }" :tabBarGutter="24" default-active-key="workFlowTab">
+                <x-tab
+                  :compProp="{ buttonState: { add: false, edit: false, delete: false, import: false }, disableAction: true }"
+                  :local-config="tabDesigner"
+                  :body-style="{ padding: 0 }"
+                  :tabBarGutter="24"
+                  :extra-data="{ workflowId: workflowId }"
+                  default-active-key="workFlowTab">
                   <a-tab-pane
                     :forceRender="true"
                     v-if="formCompletedDataPreview"
@@ -64,7 +70,7 @@
           <a-tab-pane key="1" tab="业务操作">
             <a-card :bordered="false" :loading="loadingHistory" :body-style="{ paddingTop: 0 }">
               <template v-if="showTab">
-                <x-tab :local-config="tabDesigner" :body-style="{ padding: 0 }" :tabBarGutter="24" default-active-key="workFlowTab">
+                <x-tab :local-config="tabDesigner" :extra-data="{ workflowId:workflowId }" :body-style="{ padding: 0 }" :tabBarGutter="24" default-active-key="workFlowTab">
                   <a-tab-pane
                     :forceRender="true"
                     v-if="showForm"
@@ -257,7 +263,7 @@ export default {
     ...mapState('account', { currUser: 'user' }),
     canSubmit () {
       // 对于超级管理员直接认为可以提交
-      if (this.currUser.ename === '1') {
+      if (this.currUser.rolesnames.indexOf('超级管理员') > -1) {
         return true
       }
       // currentStepId可能还没初始化，此处拿不到先返回false
@@ -413,7 +419,7 @@ export default {
   },
   props: {
     workflowId: {
-      type: String,
+      type: [String, Number],
       required: true
     },
     visible: {

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowTimeline.vue

@@ -45,7 +45,7 @@ export default {
   name: 'WorkFlowTimeline',
   props: {
     workflowId: {
-      type: String,
+      type: [String, Number],
       required: true
     },
     currentStepId: {

package/src/pages/XPageViewExample/index.vue

@@ -1,71 +1,149 @@
-<script setup>
-import { onMounted, ref } from 'vue'
-import XPageView from '@vue2-client/base-client/components/layout/XPageView'
-
-const xPageViewRef = ref(null)
-
-onMounted(() => {
-  xPageViewRef.value.init({
-    configValue: `{
-        "type": "page",
-        "onMounted": "function (data) {}",
-        "gutter": [16, 16],
-        "children": [
-            {
-                "id": "row1",
-                "type": "row",
-                "gutter": 16,
-                "children": [
-                  {
-                    "id": "xFormTable2",
-                    "span": "12",
-                    "type": "XFormTable",
-                    "event": {
-                    },
-                    "props": {
-                      "serviceName": "af-system",
-                      "queryParamsName": "crud_dictionary_manage"
-                    },
-                    "children": [
-                    ]
-                  },
-                  {
-                    "id": "xFormTable3",
-                    "span": "12",
-                    "type": "XFormTable",
-                    "event": {
-                    },
-                    "props": {
-                      "serviceName": "af-system",
-                      "queryParamsName": "crud_dictionary_manage"
-                    },
-                    "children": [
-                    ]
-                  }
-                ]
-            },
-            {
-                "id": "xFormTable",
-                "type": "XFormTable",
-                "event": {
-                },
-                "props": {
-                  "serviceName": "af-system",
-                  "queryParamsName": "crud_dictionary_manage"
-                },
-                "children": [
-                ]
-            }
-        ]
-    }`,
-    // configName: 'templateManageConfig',
-    serviceName: 'af-his'
-  })
-})
-</script>
-
-<template>
-  <div>
-    <x-page-view ref="xPageViewRef"></x-page-view>
-  </div>
-</template>
+<script setup>
+import { onMounted, ref } from 'vue'
+import XPageView from '@vue2-client/base-client/components/layout/XPageView'
+
+const xPageViewRef = ref(null)
+
+onMounted(() => {
+  xPageViewRef.value.init({
+    configValue: {
+      type: 'page',
+      onMounted: function (curr) {
+          console.warn(curr.data)
+          // 设置Tab配置数据
+          curr.data.tabData = {
+            index: 0,
+            items: [
+              // 第一组配置
+              {
+                tabConfigs: [
+                  { title: '表单列表', type: 'XFormTable', props: { serviceName: 'af-system', queryParamsName: 'crud_dictionary_manage' } },
+                  { title: '新增表单', type: 'XAddNativeForm', props: { serviceName: 'af-system', configName: 'crud_dictionary_manage_add_form' } }
+                ]
+              },
+              // 第二组配置
+              {
+                tabConfigs: [
+                  { title: '数据列表', type: 'XFormTable', props: { serviceName: 'af-system', queryParamsName: 'crud_dictionary_manage' } },
+                  { title: '编辑表单', type: 'XAddNativeForm', props: { serviceName: 'af-system', configName: 'crud_dictionary_manage_add_form' } },
+                  { title: '查看记录', type: 'XFormTable', props: { serviceName: 'af-system', queryParamsName: 'crud_dictionary_manage' } }
+                ]
+              }
+            ]
+          }
+          console.log('页面初始化完成，全局数据上下文已创建')
+      },
+      gutter: [16, 16],
+      children: [
+        {
+          id: 'controlRow',
+          type: 'row',
+          gutter: 16,
+          template: 'card',
+          children: [
+            {
+              id: 'buttonContainer',
+              span: '24',
+              type: 'row',
+              gutter: 8,
+              children: [
+                {
+                  id: 'reloadButton',
+                  span: '6',
+                  type: 'a-button',
+                  props: {
+                    type: 'primary',
+                    value: '切换Tab配置'
+                  },
+                  children: [
+                    {
+                      type: 'text',
+                      text: '切换Tab配置'
+                    }
+                  ],
+                  event: {
+                    click: function (e, context) {
+                      // 切换Tab配置
+                      const tabData = context.data.tabData
+                      tabData.index = tabData.index === 0 ? 1 : 0
+
+                      // 获取当前配置和Tab组件
+                      const currentConfig = tabData.items[tabData.index]
+                      const tabComponent = context.comps.pageTab
+
+                      if (tabComponent) {
+                        // 更新Tab组件配置
+                        tabComponent.$props.data = currentConfig.tabConfigs
+                        console.log('Tab配置已更新，当前配置索引:', tabData.index)
+
+                        // 更新状态文本
+                        const statusText = context.comps.statusText
+                        if (statusText && statusText.$el) {
+                          statusText.message = `点击按钮切换不同的Tab配置，当前是第${tabData.index + 1}组配置`
+                        }
+                      }
+                    }
+                  }
+                },
+                {
+                  id: 'statusText',
+                  span: '18',
+                  type: 'a-alert',
+                  props: {
+                    message: '点击按钮切换不同的Tab配置，当前是第1组配置',
+                    type: 'success'
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          id: 'row2',
+          type: 'row',
+          gutter: 16,
+          template: 'none',
+          children: [
+            {
+              id: 'pageTab',
+              span: '24',
+              type: 'XTab',
+              props: {
+                showTabBar: true,
+                data: [
+                  {
+                    title: '表单列表',
+                    type: 'XFormTable',
+                    props: {
+                      serviceName: 'af-system',
+                      queryParamsName: 'crud_dictionary_manage'
+                    }
+                  },
+                  {
+                    title: '新增表单',
+                    type: 'XAddNativeForm',
+                    props: {
+                      serviceName: 'af-system',
+                      configName: 'crud_dictionary_manage_add_form'
+                    }
+                  }
+                ],
+                onChange: function (oldKey, newKey, oldTab, newTab) {
+                  console.log('Tab changed:', oldKey, newKey)
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    serviceName: 'af-his'
+  })
+})
+</script>
+
+<template>
+  <div>
+    <x-page-view ref="xPageViewRef"></x-page-view>
+  </div>
+</template>

package/.history/public/his/editor/editor_20250606134713.html

@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf-8"/>
-        <link rel="shortcut icon" href="./favicon.svg" type="image/svg+xml"/>
-        <link rel="stylesheet" href="./vender/jquery/zTreeStyle/zTreeStyle.css" type="text/css">
-        <script src = "./vender/jquery/jquery.js"></script>
-        <script src = "./vender/date97/WdatePicker.js"></script>
-        <script src = "./vender/jquery/jquery.ztree.core.min.js"></script>
-        <script src = "./vender/jquery/jquery.ztree.exedit.min.js"></script>
-        <script src = "./vender/jquery/jquery.ztree.exhide.min.js"></script>
-        <script src = "./vender/codemirror.js"></script>
-        <script src = "./vender/fabric.js"></script>
-        <script src="./vender/editor.js"></script>
-        <script>
-          $(function() {
-            //配置项可以不设置，会使用默认设置
-            let option = {
-                license:'QO1pepfLYwDNqGvW21ensj0psE9CxBxf5MSRD1q2sCvclYGGtk6clTZEIth12i4SvvvDC04ZNcHe3uQuNtBUFcAk7sHUwAdYvffM2aZis/jpZqrm1rDGk1NHYsheD6DroF+m3jZ5Izh/LxRjzZJfaHHejfrn5InFoSqErfPm4gY=',
-                mode:'form',  //默认模式 form:表单模式，design:设计模式
-                pdfUrl:'https://www.x-emr.cn/pdf/post',  //pdf生成服务
-                dictionary: [  //知识库
-                    {name: '体征', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=20', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '症状', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=20', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '卫生信息数据元', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=40', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '电子病历数据集', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=50', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '国家医保标准', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=80', itemUrl:'https://www.x-emr.cn/dictitem'},
-                    {name: '省数据平台标准', isParent:true, treeUrl:'https://www.x-emr.cn/dict?category=90', itemUrl:'https://www.x-emr.cn/dictitem'},
-                ]
-            }
-
-            //从模块的Editor组件中获取mode，doc，lang属性 (该段代码可删除)
-            let mode = window.frameElement.getAttribute('mode')
-            let doc = window.frameElement.getAttribute('doc')
-            let lang = window.frameElement.getAttribute('lang')
-            mode? option.mode = mode: null
-            lang? option.lang = lang: null
-
-            //初始化编辑器（初始化代码可以放入组件的load事件中）
-            editor.init(option).then(()=>{
-                doc? editor.loadUrl(doc) : null
-            })
-
-          })
-      </script>
-    </head>
-    <body>
-        <!-- 默认id 为editor -->
-        <div id="editor" style="width:100%; height:100%;"></div>
-    </body>
-</html>