vue2-client 1.12.42 → 1.12.44

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/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/XSidebar/XSidebar.vue

@@ -0,0 +1,197 @@
+<template>
+  <div
+    class="drawer"
+    :class="{ 'drawer-collapsed': !isOpen }">
+    <div
+      class="drawer-toggle"
+      :class="{ 'toggle-collapsed': !isOpen }"
+      @click="toggleDrawer">
+      <div class="arrow">
+        {{ isOpen ? '›' : '‹' }}
+      </div>
+    </div>
+    <div class="drawer-content" v-if="isOpen">
+      <x-report
+        :configName="queryParamsName"
+        :server-name="serverName"
+        :show-img-in-cell="true"
+        :display-only="true"
+        :edit-mode="false"
+        :show-save-button="false"
+        :no-padding="true"
+        :dont-format="true">
+      </x-report>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import XReport from '@vue2-client/base-client/components/common/XReportGrid'
+
+export default {
+  components: {
+    XReport
+  },
+  name: 'XSidebar',
+  props: {
+    // 配置参数
+    queryParamsName: {
+      type: String,
+      default: ''
+    },
+    serverName: {
+      type: String,
+      default: 'af-his'
+    }
+  },
+  data () {
+    return {
+      isOpen: true,
+      // 定义主内容区域的最大和最小宽度百分比
+      mainWithData: [{ max: 36, min: 25 }, { max: 60, min: 47 }]
+    }
+  },
+  mounted () {
+    // 在挂载后调整父元素宽度
+    this.updateLayout(this.isOpen)
+  },
+  methods: {
+
+    toggleDrawer () {
+      this.isOpen = !this.isOpen
+      this.$emit('on-drawer-change', this.isOpen)
+      this.updateLayout(this.isOpen)
+    },
+    // 获取同级的其他所有a-col元素
+    getSiblingCols () {
+      try {
+        // 找到当前组件所在的a-col
+        let currentCol = this.$el.parentNode
+        while (currentCol && !currentCol.className.includes('ant-col')) {
+          currentCol = currentCol.parentNode
+        }
+        if (!currentCol) {
+          console.warn('当前组件不在a-col内')
+          return []
+        }
+        // 找到a-col的父元素(a-row)
+        const row = currentCol.parentNode
+        if (!row || !row.className.includes('ant-row')) {
+          console.warn('未找到父级a-row元素')
+          return []
+        }
+        // 获取a-row中的所有a-col
+        const allCol1 = Array.from(row.querySelectorAll('.ant-col-6'))
+        const allCol2 = Array.from(row.querySelectorAll('.ant-col-12'))
+        const allCols = [...allCol1, ...allCol2]
+        // 过滤掉当前a-col，返回其他所有a-col
+        return allCols.filter(col => col !== currentCol)
+      } catch (error) {
+        console.error('获取同级a-col时出错:', error)
+        return []
+      }
+    },
+    updateLayout (isOpen) {
+      this.$nextTick(() => {
+        try {
+          // 获取所有同级a-col
+          const otherCols = this.getSiblingCols()
+          console.log('otherCols =', otherCols)
+          // 如果找到同级列，调整它们的宽度
+          if (otherCols.length > 0) {
+            // 获取当前组件所在的a-col
+            let currentCol = this.$el.parentNode
+            while (currentCol && !currentCol.className.includes('ant-col')) {
+              currentCol = currentCol.parentNode
+            }
+            if (currentCol) {
+              // 更新当前列的宽度
+              const drawerWidth = isOpen ? 28 : 2
+              currentCol.style.flex = `0 0 ${drawerWidth}%`
+              currentCol.style.maxWidth = `${drawerWidth}%`
+              // 根据mainWithData设置其他列的宽度
+              otherCols.forEach((col, index) => {
+                // 确保不超出mainWithData数组范围
+                if (index < this.mainWithData.length) {
+                  // 抽屉打开用min值，关闭用max值
+                  const widthValue = isOpen ? this.mainWithData[index].min : this.mainWithData[index].max
+                  col.style.flex = `0 0 ${widthValue}%`
+                  col.style.maxWidth = `${widthValue}%`
+                }
+              })
+              // 触发重新计算
+              window.dispatchEvent(new Event('resize'))
+            }
+          }
+        } catch (error) {
+          console.error('布局更新失败:', error)
+        }
+      })
+    }
+  },
+  watch: {
+    configData: {
+      handler (newValue) {
+        console.log('configData changed:', newValue)
+        this.renderingComponent(newValue)
+      },
+      immediate: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+.drawer {
+  position: relative;
+  height: 88vh;
+  width: 100%;
+  background-color: #fff;
+  border-left: solid rgba(240, 242, 245) 2px;
+  transition: all 0.3s;
+  border-radius: 10px;
+}
+
+.drawer-collapsed {
+  width: 24px;
+  box-shadow: none;
+}
+.drawer-toggle {
+  position: absolute;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 24px;
+  height: 48px;
+  background-color: #fff;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1;
+  transition: all 0.3s;
+}
+/* 打开状态：箭头在抽屉内 */
+.drawer:not(.drawer-collapsed) .drawer-toggle {
+  left: 0;
+  border-radius: 0;
+  box-shadow: none;
+}
+/* 关闭状态：箭头在抽屉内 */
+.drawer-collapsed .drawer-toggle {
+  left: 0;
+  border-radius: 0;
+  box-shadow: none;
+}
+.arrow {
+  font-size: 20px;
+  line-height: 1;
+  color: rgba(24, 144, 245);
+}
+.drawer-content {
+  height: 100%;
+  overflow-y: auto;
+  padding: 20px;
+  padding-left: 44px; /* 为开关留出空间 */
+}
+</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>