vue2-client 1.14.84 → 1.14.86

package/src/base-client/components/layout/XPageView/index.md

@@ -1,38 +1,77 @@
 # XPageView
 
-JSON配置构建页面的根容器组件
+基于 JSON 配置动态构建页面的容器组件，具有高度的灵活性和可扩展性。
 
-引用方式：
+## 使用方法
 
 ```vue
 <template>
-  <x-page-view ref="xPageView"></x-page-view>
+  <x-page-view ref="pageView" />
 </template>
-<script>
-  import XPageView from '@vue2-client/base-client/components/layout/XPageView'
-
-  export default {
-    components: {
-      XPageView
-    },
-    mounted () {
-      this.initView()
-    },
-    methods: {
-      // 初始化组件
-      initView () {
-        this.$refs.xPageView.init({
-          configName: 'templateTreeConfig',
-          serviceName: 'af-his'
-        })
-      }
-    }
-  }
+
+<script setup>
+import { ref, onMounted } from 'vue'
+import XPageView from '@vue2-client/base-client/components/layout/XPageView'
+
+const pageView = ref(null)
+
+onMounted(() => {
+  initView()
+})
+
+const initView = () => {
+  pageView.value.init({
+    configName: 'templateTreeConfig',
+    serviceName: 'af-his'
+  })
+}
 </script>
 ```
 
 ## API
 
-| 参数           | 说明      | 类型       | 默认值 |
-|--------------|---------|----------|-----|
-| init(params) | 初始化组件   | function | -   |
+### 属性
+
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| - | - | - | - |
+
+### 方法
+
+| 方法名 | 说明 | 参数 |
+| --- | --- | --- |
+| init | 初始化页面组件 | `{ configName, configValue, serviceName }` |
+
+### 参数说明
+
+| 参数名 | 说明 | 类型 | 必填 |
+| --- | --- | --- | --- |
+| configName | 配置名称，用于从服务端获取配置 | String | 二选一 |
+| configValue | 配置的JSON数据，可以是字符串或对象 | String/Object | 二选一 |
+| serviceName | 服务名称 | String | 是 |
+
+## 结构化配置项
+
+```json
+{
+  "children": [
+    {
+      "type": "row",
+      "id": "row1",
+      "gutter": 16,
+      "children": [
+        {
+          "type": "XFormTable",
+          "id": "table1",
+          "span": 24,
+          "props": { ... },
+          "event": {
+            "change": "function(val, data) { console.log(val) }"
+          }
+        }
+      ]
+    }
+  ],
+  "onMounted": "function(data) { console.log('页面已加载') }"
+}
+```

package/src/pages/WorkflowDetail/WorkFlowDemo2.vue

@@ -0,0 +1,90 @@
+<template>
+  <a-card :bordered="false">
+    <x-form-table
+      title="示例页面"
+      :queryParamsName="queryParamsName"
+      :fixed-query-form="{
+        users_f_handler_id: currUser.id,
+      }"
+      @action="toDetail">
+      <template slot="button">
+        <a-button @click="add">
+          <a-icon type="plus"/>
+          发起报建
+        </a-button>
+      </template>
+    </x-form-table>
+    <a-modal
+      v-model="applyAddFlag"
+      :footer="null"
+      :dialog-style="{ top: '5rem' }"
+      :z-index="1001"
+      title="发起报建"
+      :destroyOnClose="true">
+      <x-add-native-form ref="xForm" @onSubmit="applySubmit"/>
+    </a-modal>
+    <WorkflowDetail ref="workFlow" @success="success"></WorkflowDetail>
+  </a-card>
+</template>
+
+<script>
+import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+import { mapState } from 'vuex'
+
+export default {
+  name: 'Apply',
+  components: {
+    XFormTable,
+    XAddNativeForm,
+    WorkflowDetail
+  },
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'applyCRUD',
+      // 发起报建弹框控制
+      applyAddFlag: false
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+  },
+  methods: {
+    add () {
+      this.applyAddFlag = true
+      this.$nextTick(
+        () => {
+          getConfigByName('addApplyForm', 'af-apply', (res) => {
+            this.$refs.xForm.init({
+              businessType: '新增',
+              title: '发起报建',
+              ...res
+            })
+          })
+        }
+      )
+    },
+    applySubmit (formData) {
+      runLogic('addApply', formData).then(
+        res => {
+          this.$message.success('发起报建成功')
+          this.applyAddFlag = false
+        }
+      ).catch(() => {
+        this.applyAddFlag = false
+      })
+    },
+    success () {
+      console.log('完工')
+    },
+    toDetail (record, id) {
+      this.$refs.workFlow.init({
+        workflowId: record.twf_id
+      })
+    }
+  }
+}
+</script>

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

@@ -82,6 +82,7 @@
                 <template v-if="showForm">
                   <x-add-native-form
                     ref="xAddForm"
+                    @x-form-item-emit-func="formItemEmitFunc"
                     @onSubmit="submitForm"/>
                 </template>
               </template>
@@ -214,6 +215,7 @@
         </a-tab-pane>
       </a-tabs>
     </template>
+    <address-select ref="addressSelect" @selAddress="setFormValue"></address-select>
   </div>
 </template>
 
@@ -237,6 +239,7 @@ import * as util from '@vue2-client/utils/util'
 import { getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
 import XTab from '@vue2-client/base-client/components/common/XTab/XTab.vue'
 import WorkFlowPreview from './WorkFlowPreview'
+import AddressSelect from '@/pages/addressSelect/index.vue'
 
 export default {
   name: 'WorkFlowHandle',
@@ -250,7 +253,8 @@ export default {
     FilePreview,
     FileItem,
     ImageItem,
-    WorkFlowPreview
+    WorkFlowPreview,
+    AddressSelect
   },
   computed: {
     ...mapState('account', { currUser: 'user' }),
@@ -1035,6 +1039,14 @@ export default {
         console.error('执行按钮显示函数失败:', error)
         return false
       }
+    },
+    formItemEmitFunc (func) {
+      if (func === 'selectAddress') {
+        this.$refs.addressSelect.setFormShow()
+      }
+    },
+    setFormValue (record) {
+      this.$refs.xAddForm.setForm({ address: record.f_address })
     }
   },
   watch: {}

package/src/pages/XPageViewExample/index.vue

@@ -8,19 +8,52 @@ onMounted(() => {
   xPageViewRef.value.init({
     configValue: `{
         "type": "page",
-        "onMounted": "function (data) {data.comps['xTreeView1'].init({configName: 'templateTreeConfig',serviceName: 'af-his',env: 'dev'})}",
+        "onMounted": "function (data) {}",
+        "gutter": [16, 16],
         "children": [
             {
-                "id": "xTreeView1",
-                "type": "XTreeView",
+                "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": {
-                    "itemChecked": "function itemChecked (node, data) { if (node.type === 'all' || node.type === 'folder') { data.comps['xTreeViewAddNativeForm1'].close();return} data.func.getConfigByName('编辑模板数据Form', 'af-his', (res) => { data.comps['xTreeViewAddNativeForm1'].init({serviceName: 'af-his',formItems: res.formJson,showSubmitBtn: false,title: '收费',businessType: '新增',getDataParams: { content: {pms_patient_id: 1,template_id: node.id}}})})}"
+                },
+                "props": {
+                  "serviceName": "af-system",
+                  "queryParamsName": "crud_dictionary_manage"
                 },
                 "children": [
-                    {
-                        "id": "xTreeViewAddNativeForm1",
-                        "type": "XAddNativeForm"
-                    }
                 ]
             }
         ]

package/src/pages/addressSelect/addressDemo.vue

@@ -1,24 +1,24 @@
-<template>
-  <!--  测试界面——测试地址选择新增组件-->
-  <div>
-    <a-button @click="open">打开选择地址弹窗</a-button>
-    <address-select :addressShow="showDialog"/>
-  </div>
-</template>
-
-  <script>
-  import AddressSelect from '@/pages/addressSelect'
-
-  export default {
-    components: { AddressSelect },
-    data: () => ({
-      showDialog: false
-    }),
-    methods: {
-      open () {
-        console.log('打开选择地址弹窗')
-        this.showDialog = true
-      }
-    }
-  }
-  </script>
+<template>
+  <!--  测试界面——测试地址选择新增组件-->
+  <div>
+    <a-button @click="open">打开选择地址弹窗</a-button>
+    <address-select :addressShow="showDialog"/>
+  </div>
+</template>
+
+  <script>
+  import AddressSelect from '@/pages/addressSelect'
+
+  export default {
+    components: { AddressSelect },
+    data: () => ({
+      showDialog: false
+    }),
+    methods: {
+      open () {
+        console.log('打开选择地址弹窗')
+        this.showDialog = true
+      }
+    }
+  }
+  </script>

package/src/pages/addressSelect/index.vue

@@ -6,17 +6,8 @@ export default {
   components: {
     XFormTable
   },
-  props: {
-    addressShow: {
-      required: true,
-      type: Boolean,
-      default: false
-    }
-  },
+  expose: ['setFormShow'],
   watch: {
-    addressShow (val) {
-      this.selectAddressVisible = val
-    },
     'form.f_address_type' (newVal, oldVal) {
       this.onAddressTypeChange(newVal, oldVal)
     }
@@ -56,6 +47,9 @@ export default {
     }
   },
   methods: {
+    setFormShow () {
+      this.selectAddressVisible = true
+    },
     selAddress (record) {
       // 给表单赋值
       const form = {
@@ -105,7 +99,7 @@ export default {
       this.getAreaList(value)
     },
     getAreaList (value) {
-      console.log('搜索小区', this.currUser.orgid)
+      console.log('搜索小区', this.currUser)
       runLogic('getAreaListByName', {
         orgId: this.currUser.orgid,
         name: value
@@ -187,7 +181,7 @@ export default {
     <a-modal
       v-model="selectAddressVisible"
       :dialog-style="{ top: '30px' }"
-      :bodyStyle="{height:'70vh',overflowY:'scroll'}"
+      :bodyStyle="{height:'80vh',overflowY:'scroll'}"
       :destroy-on-close="true"
       :z-index="1002"
       title="选择地址"

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

@@ -55,6 +55,8 @@ routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynami
 routerResource.example = {
   path: 'example',
   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'),
@@ -66,9 +68,9 @@ routerResource.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/base-client/components/his/XQuestionnaire/XQuestionnaireDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.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/base-client/components/common/XLabelSelect/XLabelSelectDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XCheckList/XCheckList.vue'),

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>