vue2-client 1.15.26 → 1.15.28

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

@@ -1051,39 +1051,34 @@ export default {
         formCompletedDataPreview = JSON.parse(JSON.stringify(this.formCompletedData))
         // 使用字段定义中内容，将回显数据的列名，替换为定义的中文名
         // 调整逻辑：formData中只显示流程配置表单中定义过的显示列，多余冗余的存储列不进行页面展示
-        const formData = {}
+        const formDataArr = []
+        const dataObj = formCompletedDataPreview.data || {}
         const currentStepDefine = this.stepsDefine.find(item => item.id === stepId)
         const isKeyHandle = currentStepDefine?.properties?.form?.isKeyHandle || false
-        for (const key in formCompletedDataPreview.data) {
-          for (let i = 0; i < this.targetStepDefine.length; i++) {
-            const stepDefine = this.targetStepDefine[i]
-            // 兼容下旧代码，这里是否处理key根据表单配置中的isKeyHandle来决定，也有另一种情况如果处理完的key在表单中已经重复会将未处理的key直接存进去（新增表单的逻辑）
-            // 所以两种都判断下命中任意一个都算
-            if (key === this.getRealKey(stepDefine.model, isKeyHandle) || key === stepDefine.model) {
-              if (!['FilesId', 'Images'].includes(key)) {
-                // 读取字典值
-                if (stepDefine.formType === 'select' && stepDefine.selectType === 'key') {
-                  for (const item of this.$appdata.getDictionaryList(stepDefine.selectKey)) {
-                    if (item.value === formData[key]) {
-                      formData[stepDefine.name] = item.label
-                      break
-                    }
-                  }
-                } else {
-                  formData[stepDefine.name] = formCompletedDataPreview.data[key]
-                }
-              }
-              // if (key !== stepDefine.name) {
-              //   delete formData[key]
-              // }
-              break
+        for (let i = 0; i < this.targetStepDefine.length; i++) {
+          const stepDefine = this.targetStepDefine[i]
+          const key = this.getRealKey(stepDefine.model, isKeyHandle)
+          if (Object.prototype.hasOwnProperty.call(dataObj, key)) {
+            let value = dataObj[key]
+            // 字典值处理
+            if (stepDefine.formType === 'select' && stepDefine.selectType === 'key') {
+              const dictList = this.$appdata.getDictionaryList(stepDefine.selectKey)
+              const dictItem = dictList.find(item => item.value === value)
+              value = dictItem ? dictItem.label : value
             }
+            formDataArr.push({ label: stepDefine.name, value })
           }
         }
-        if (Object.keys(formData).length > 0) {
-          formCompletedDataPreview.data = formData
+        // 如果一个都没匹配上，兼容旧逻辑：把原对象转成数组
+        if (formDataArr.length === 0 && dataObj && typeof dataObj === 'object') {
+          for (const key in dataObj) {
+            if (Object.prototype.hasOwnProperty.call(dataObj, key)) {
+              formDataArr.push({ label: key, value: dataObj[key] })
+            }
+          }
         }
-        if (!Object.keys(formCompletedDataPreview.data).length) {
+        formCompletedDataPreview.data = formDataArr.length > 0 ? formDataArr : null
+        if (!formCompletedDataPreview.data) {
           formCompletedDataPreview.data = null
         }
         // 备注

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

@@ -11,12 +11,12 @@
           填写历史
         </p>
         <a-descriptions-item
-          v-for="(value, key) in formCompletedDataPreview.data"
-          :key="key"
-          v-show="key !== '附件上传' && key !== '__expressionRs'"
+          v-for="(item, idx) in formCompletedDataPreview.data"
+          :key="item.label || idx"
+          v-show="item.label !== '附件上传' && item.label !== '__expressionRs'"
         >
-          <span slot="label" style="color: #000">{{ key }}</span>
-          <div style="white-space: pre-wrap">{{ value }}</div>
+          <span slot="label" style="color: #000">{{ item.label }}</span>
+          <div style="white-space: pre-wrap">{{ item.value }}</div>
         </a-descriptions-item>
       </a-descriptions>
       <a-descriptions

package/src/router/async/router.map.js

@@ -50,12 +50,9 @@ routerResource.dynamicStatistics = () => import('@vue2-client/pages/DynamicStati
 // 数据检索(新)
 routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynamicStatistics')
 // 示例页面
-routerResource.example = {
-path: 'example',
+routerResource.businessAudit = {
+  path: 'businessAudit',
   name: '示例主页面',
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.vue'),
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
@@ -66,10 +63,9 @@ path: 'example',
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  // component: () => import('@vue2-client/pages/XPageViewExample/index.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),
+  component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonexampleDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelectDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XCheckList/XCheckList.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XPrint/Demo.vue'),
@@ -98,8 +94,7 @@ const routerMap = {
   root: {
     path: '/',
     name: '首页',
-    // 只有在非微前端环境下才进行重定向，或者通过环境变量控制
-    redirect: window.__MICRO_APP_ENVIRONMENT__ ? undefined : homePage,
+    redirect: homePage,
     component: process.env.VUE_APP_SINGLE_PAPER === 'TRUE' ? view.blank : view.tabs,
   },
   exp403: {
@@ -113,7 +108,7 @@ const routerMap = {
     name: 'exp404',
     path: '404',
     component: () =>
-      import('@vue2-client/pages/exception/404')
+      import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2')
   },
   exp500: {
     name: 'exp500',

package/vue.config.js

@@ -11,12 +11,12 @@ const productionGzipExtensions = ['js', 'css']
 const isProd = process.env.NODE_ENV === 'production'
 
 // v4 产品演示
-const v3Server = 'http://aote-office.8866.org:31567'
+const v3Server = 'http://218.93.226.210:31467'
 // const gateway = 'http://192.168.50.67:31467'
 // const testUpload = 'http://123.60.214.109:8406'
-const OSSServerDev = 'http://192.168.50.67:30351'
+const OSSServerDev = 'http://218.93.226.210:31467'
 // const revenue = 'http://aote-office.8866.org:31567'
-const revenue = 'http://aote-office.8866.org:31567'
+const revenue = 'http://218.93.226.210:31467'
 // const OSSServerProd = 'http://192.168.50.67:31351'
 // const testUploadLocal = 'http://127.0.0.1:9001'
 // v3 铜川
@@ -53,7 +53,6 @@ module.exports = {
         changeOrigin: true
       },
       '/api/af-apply': {
-        // pathRewrite: { '^/api/af-apply': '/' },
         target: revenue,
         changeOrigin: true
       },

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>