vue2-client 1.13.10 → 1.13.12

package/src/base-client/components/common/richTextModal/richDemo.vue

@@ -1,48 +1,48 @@
-<template>
-  <div>
-    <h1>Canvas Editor 示例</h1>
-    <x-add-native-form ref="nativeForm" />
-  </div>
-</template>
-
-<script>
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { getConfigByName } from '../../../../services/api/common'
-
-export default {
-  components: {
-    XAddNativeForm
-  },
-  mounted () {
-    this.$nextTick(() => {
-      getConfigByName('表单测试Form', 'af-his', (res) => {
-        const modifyModelData = {
-          data: {
-            t_f_file_id: 1,
-            t_f_path: '/usr/local/tomcat/files/af-his/txt/f7c758f6d5f14c53bb5246f82a25c0c4.txt'
-          },
-          images: [],
-          files: []
-        }
-        this.$refs.nativeForm.init({
-          serviceName: 'af-his',
-          formItems: res.formJson,
-          title: '收费',
-          businessType: '新增',
-          layout: 'inline',
-          modifyModelData: modifyModelData
-        })
-      })
-    })
-  },
-  methods: {
-    submit () {
-
-    }
-  }
-}
-</script>
-
-<style>
-/* 在这里添加您的样式 */
-</style>
+<template>
+  <div>
+    <h1>Canvas Editor 示例</h1>
+    <x-add-native-form ref="nativeForm" />
+  </div>
+</template>
+
+<script>
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByName } from '../../../../services/api/common'
+
+export default {
+  components: {
+    XAddNativeForm
+  },
+  mounted () {
+    this.$nextTick(() => {
+      getConfigByName('表单测试Form', 'af-his', (res) => {
+        const modifyModelData = {
+          data: {
+            t_f_file_id: 1,
+            t_f_path: '/usr/local/tomcat/files/af-his/txt/f7c758f6d5f14c53bb5246f82a25c0c4.txt'
+          },
+          images: [],
+          files: []
+        }
+        this.$refs.nativeForm.init({
+          serviceName: 'af-his',
+          formItems: res.formJson,
+          title: '收费',
+          businessType: '新增',
+          layout: 'inline',
+          modifyModelData: modifyModelData
+        })
+      })
+    })
+  },
+  methods: {
+    submit () {
+
+    }
+  }
+}
+</script>
+
+<style>
+/* 在这里添加您的样式 */
+</style>

package/src/base-client/components/his/XHDescriptions/XHDescriptions.vue

@@ -25,6 +25,7 @@
               v-for="(item) in visibleItems"
               :key="item.field"
               :colon="item.colon !== false"
+              :class="{ 'with-divider': item.isLine }"
               v-if="data[item.field] !== null && data[item.field] !== undefined && (!showAllItems || showAllItems && !hiddenItems.some(i => i.field === item.field))">
               <template #label>
                 <div :class="['label-wrapper', { 'with-avatar': item.showAvatar }]">
@@ -77,7 +78,7 @@
             <div
               v-for="(item) in visibleItems"
               :key="item.field"
-              class="description-item"
+              :class="['description-item', { 'with-divider': item.isLine }]"
               v-if="data[item.field] !== null && data[item.field] !== undefined"
             >
               <div :class="['label-wrapper', { 'with-avatar': item.showAvatar }]">
@@ -181,16 +182,16 @@ export default {
     }
   },
   created () {
-    this.getData(this.queryParamsName)
+    this.getData(this.queryParamsName, {})
   },
   methods: {
-    async getData (data) {
+    async getData (data, parameterData) {
       this.data = null
       this.showAllItems = false
       getConfigByName(data, 'af-his', res => {
         this.config = res
         console.log(this.config)
-        const parameter = { ...res.parameter, ...this.parameter }
+        const parameter = { ...parameterData, ...res.parameter, ...this.parameter }
         runLogic(res.logicName, parameter, 'af-his').then(result => {
           this.data = result
         })
@@ -204,7 +205,7 @@ export default {
     queryParamsName: {
       handler (newValue) {
         console.log(newValue)
-        this.getData(newValue)
+        this.getData(newValue, {})
       },
       deep: true
     }
@@ -371,4 +372,36 @@ export default {
     gap: 4px 12px;
   }
 }
+
+/* 添加虚线样式 */
+.with-divider {
+  position: relative;
+  margin-bottom: 16px !important;
+}
+
+.with-divider::after {
+  content: '';
+  position: absolute;
+  left: 0;
+  bottom: -8px;
+  width: 100%;
+  height: 0;
+  border-bottom: 1px dashed rgba(0, 0, 0, 0.15);
+}
+
+/* 对于 Ant Design 描述列表的特殊处理 */
+:deep(.ant-descriptions-item.with-divider) {
+  position: relative;
+  margin-bottom: 16px !important;
+}
+
+:deep(.ant-descriptions-item.with-divider::after) {
+  content: '';
+  position: absolute;
+  left: 0;
+  bottom: -8px;
+  width: 100%;
+  height: 0;
+  border-bottom: 1px dashed rgba(0, 0, 0, 0.15);
+}
 </style>

package/src/base-client/components/his/XHisEditor/XHisEditor.vue

@@ -162,6 +162,8 @@ export default {
       }
     }
   },
+  //      初始化    保存后        加载文件后
+  emits: ['init', 'saveafter', 'afterLoadFile'],
   methods: {
     runLogic,
     async initDiagnosisAutocomplete (dropDownBoxParams) {
@@ -363,6 +365,7 @@ export default {
         runLogic(this.saveDataLogicName, data, this.serviceName).then(res => {
           this.$message.success('保存成功')
           this.changeRes(res.currResData.id)
+          this.$emit('saveafter', {})
         }).finally(() => {
           this.resDataModalVisible = false
         })

package/src/base-client/components/his/XHisEditor/index.js

@@ -1,3 +1,3 @@
-import XHisEditor from './XHisEditor.vue'
-
-export default XHisEditor
+import XHisEditor from './XHisEditor.vue'
+
+export default XHisEditor

package/src/base-client/components/his/XSelect/XSelect.vue

@@ -1,72 +1,72 @@
-<template>
-  <div>
-    <a-select
-      v-model="selectedValue"
-      :placeholder="placeholder"
-      class="x-select"
-      :allowClear="true"
-      :showSearch="true"
-      :filter-option="filterOption"
-      @change="handleChange"
-    >
-      <a-select-option v-for="(item, index) in data" :key="index" :value="item.value">
-        {{ item.label }}
-      </a-select-option>
-    </a-select>
-  </div>
-</template>
-
-<script>
-import { runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XSelect',
-  props: {
-    queryParamsName: {
-      type: Object,
-      default: null
-    }
-  },
-  data () {
-    return {
-      data: [],
-      selectedValue: undefined,
-      placeholder: ''
-    }
-  },
-  created () {
-    this.getData(this.queryParamsName)
-  },
-  methods: {
-    async getData (config) {
-      try {
-        const res = await runLogic(config, {}, 'af-his')
-        this.data = res.data || []
-        if (res.placeholder) {
-          this.placeholder = res.placeholder
-        }
-        this.selectedValue = undefined
-      } catch (error) {
-        console.error('获取数据失败：', error)
-      }
-    },
-    handleChange (value) {
-      this.selectedValue = value === '' ? undefined : value
-      this.$emit('change', this.selectedValue)
-    },
-    filterOption (input, option) {
-      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-    }
-  },
-  watch: {
-    selectedValue (val) {
-    }
-  }
-}
-</script>
-
-<style scoped>
-.x-select {
-  min-width: 150px;
-}
-</style>
+<template>
+  <div>
+    <a-select
+      v-model="selectedValue"
+      :placeholder="placeholder"
+      class="x-select"
+      :allowClear="true"
+      :showSearch="true"
+      :filter-option="filterOption"
+      @change="handleChange"
+    >
+      <a-select-option v-for="(item, index) in data" :key="index" :value="item.value">
+        {{ item.label }}
+      </a-select-option>
+    </a-select>
+  </div>
+</template>
+
+<script>
+import { runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XSelect',
+  props: {
+    queryParamsName: {
+      type: Object,
+      default: null
+    }
+  },
+  data () {
+    return {
+      data: [],
+      selectedValue: undefined,
+      placeholder: ''
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  methods: {
+    async getData (config) {
+      try {
+        const res = await runLogic(config, {}, 'af-his')
+        this.data = res.data || []
+        if (res.placeholder) {
+          this.placeholder = res.placeholder
+        }
+        this.selectedValue = undefined
+      } catch (error) {
+        console.error('获取数据失败：', error)
+      }
+    },
+    handleChange (value) {
+      this.selectedValue = value === '' ? undefined : value
+      this.$emit('change', this.selectedValue)
+    },
+    filterOption (input, option) {
+      return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    }
+  },
+  watch: {
+    selectedValue (val) {
+    }
+  }
+}
+</script>
+
+<style scoped>
+.x-select {
+  min-width: 150px;
+}
+</style>

package/src/base-client/components/his/XTitle/XTitle.vue

@@ -1,39 +1,39 @@
-<template>
-    <div class="x-title">{{ title }}</div>
-</template>
-
-<script>
-export default {
-    name: 'XTitle',
-    props: {
-      queryParamsName: {
-        type: String,
-        default: null
-      }
-    },
-    data () {
-      return {
-        title: ''
-      }
-    },
-    created () {
-      this.getData(this.queryParamsName)
-    },
-    methods: {
-        getData (data) {
-            this.title = data
-        }
-    }
-  }
-</script>
-<style scoped>
-.x-title {
-    font-size: 18px;
-    font-weight: bold;
-    height: 26px;
-    width: 100%;
-    text-align: left;
-    font-family: "Source Han Sans", sans-serif;
-    color: #5D5C5C;
-}
-</style>
+<template>
+    <div class="x-title">{{ title }}</div>
+</template>
+
+<script>
+export default {
+    name: 'XTitle',
+    props: {
+      queryParamsName: {
+        type: String,
+        default: null
+      }
+    },
+    data () {
+      return {
+        title: ''
+      }
+    },
+    created () {
+      this.getData(this.queryParamsName)
+    },
+    methods: {
+        getData (data) {
+            this.title = data
+        }
+    }
+  }
+</script>
+<style scoped>
+.x-title {
+    font-size: 18px;
+    font-weight: bold;
+    height: 26px;
+    width: 100%;
+    text-align: left;
+    font-family: "Source Han Sans", sans-serif;
+    color: #5D5C5C;
+}
+</style>

package/src/base-client/components/index.js

@@ -1,51 +1,51 @@
-import XForm from './common/XForm'
-import XAddForm from './common/XAddForm'
-import XAddNativeForm from './common/XAddNativeForm'
-import XFormCol from './common/XFormCol'
-import XTable from './common/XTable'
-import XTreeOne from './common/XTreeOne'
-import XImportExcel from './common/XImportExcel'
-import XDataDrawer from './common/XDataDrawer'
-import XCard from './common/XCard'
-import XBadge from './common/XBadge'
-import Upload from './common/Upload'
-import JSONToTree from './common/JSONToTree'
-import FormGroupEdit from './common/FormGroupEdit'
-import FormGroupQuery from './common/FormGroupQuery'
-import AddressSearchCombobox from './common/AddressSearchCombobox'
-import AmapMarker from './common/AmapMarker'
-import PersonSetting from './common/PersonSetting'
-import XFormTable from './common/XFormTable'
-import XStepView from './common/XStepView'
-import Tree from './common/Tree'
-import CreateQuery from './common/CreateQuery'
-import CreateSimpleFormQuery from './common/CreateSimpleFormQuery'
-import XFormGroup from './common/XFormGroup'
-import XDescriptionsGroup from './common/XDescriptions/XDescriptionsGroup.vue'
-
-export default {
-  AddressSearchCombobox,
-  AmapMarker,
-  CreateQuery,
-  CreateSimpleFormQuery,
-  FormGroupEdit,
-  FormGroupQuery,
-  JSONToTree,
-  PersonSetting,
-  Tree,
-  Upload,
-  XAddForm,
-  XAddNativeForm,
-  XBadge,
-  XCard,
-  XDataDrawer,
-  XDescriptionsGroup,
-  XForm,
-  XFormCol,
-  XFormGroup,
-  XFormTable,
-  XImportExcel,
-  XStepView,
-  XTable,
-  XTreeOne
-}
+import XForm from './common/XForm'
+import XAddForm from './common/XAddForm'
+import XAddNativeForm from './common/XAddNativeForm'
+import XFormCol from './common/XFormCol'
+import XTable from './common/XTable'
+import XTreeOne from './common/XTreeOne'
+import XImportExcel from './common/XImportExcel'
+import XDataDrawer from './common/XDataDrawer'
+import XCard from './common/XCard'
+import XBadge from './common/XBadge'
+import Upload from './common/Upload'
+import JSONToTree from './common/JSONToTree'
+import FormGroupEdit from './common/FormGroupEdit'
+import FormGroupQuery from './common/FormGroupQuery'
+import AddressSearchCombobox from './common/AddressSearchCombobox'
+import AmapMarker from './common/AmapMarker'
+import PersonSetting from './common/PersonSetting'
+import XFormTable from './common/XFormTable'
+import XStepView from './common/XStepView'
+import Tree from './common/Tree'
+import CreateQuery from './common/CreateQuery'
+import CreateSimpleFormQuery from './common/CreateSimpleFormQuery'
+import XFormGroup from './common/XFormGroup'
+import XDescriptionsGroup from './common/XDescriptions/XDescriptionsGroup.vue'
+
+export default {
+  AddressSearchCombobox,
+  AmapMarker,
+  CreateQuery,
+  CreateSimpleFormQuery,
+  FormGroupEdit,
+  FormGroupQuery,
+  JSONToTree,
+  PersonSetting,
+  Tree,
+  Upload,
+  XAddForm,
+  XAddNativeForm,
+  XBadge,
+  XCard,
+  XDataDrawer,
+  XDescriptionsGroup,
+  XForm,
+  XFormCol,
+  XFormGroup,
+  XFormTable,
+  XImportExcel,
+  XStepView,
+  XTable,
+  XTreeOne
+}

package/src/base-client/components/layout/XPageView/XErrorView.vue

@@ -1,11 +1,11 @@
-<script setup>
-
-</script>
-
-<template>
-  <div>渲染失败</div>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script setup>
+
+</script>
+
+<template>
+  <div>渲染失败</div>
+</template>
+
+<style scoped lang="less">
+
+</style>