vue2-client 1.14.15 → 1.14.16

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

@@ -85,6 +85,7 @@
     </a-modal></div>
 </template>
 
+
 <script>
 
 import { runLogic } from '@vue2-client/services/api/common'

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

@@ -38,6 +38,10 @@ export default {
     queryParamsName: {
       type: Object,
       default: null
+    },
+    fixedQueryForm: {
+      type: Object,
+      default: { condition: '1=1' }
     }
   },
   inject: ['getComponentByName'],
@@ -51,17 +55,17 @@ export default {
     }
   },
   created () {
-    this.getData(this.queryParamsName)
+    this.getData(this.queryParamsName, this.fixedQueryForm)
   },
   methods: {
-    async getData (config) {
+    async getData (config, param) {
       const that = this
       getConfigByName(config, 'af-his', res => {
         that.button = res.button
         that.icon = res.icon
         that.buttonNames = res.buttonNames || []
         that.buttonMode = res.buttonMode || false
-        runLogic(res.data, {}, 'af-his').then(ress => {
+        runLogic(res.data, param, 'af-his').then(ress => {
           that.data = ress
         })
       })
@@ -69,8 +73,8 @@ export default {
     handleClick (index) {
       this.$emit('listClick', this.data[index])
     },
-    refreshList () {
-      this.getData(this.queryParamsName)
+    refreshList (param) {
+      this.getData(this.queryParamsName, param)
     },
     click (index, buttonIndex) {
       this.$emit('click', { data: this.data[index], name: this.buttonNames[buttonIndex] })
@@ -85,6 +89,11 @@ export default {
         this.data = res.data
       })
     }
+  },
+  watch: {
+    'fixedQueryForm' (val) {
+      this.refreshList(val)
+    }
   }
 }
 </script>

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

@@ -132,14 +132,14 @@ export default {
               currentCol = currentCol.parentNode
             }
             if (currentCol) {
-              // 更新当前列的宽度
+              //  更新当前列的宽度
               const drawerWidth = isOpen ? 33.3 : 2
               // 强制更新样式
               currentCol.style.cssText = `
             flex: 0 0 ${drawerWidth}% !important;
             max-width: ${drawerWidth}% !important;
             transition: all 0.3s;`
-              // 触发XTab组件重新计算宽度
+              //  触发XTab组件重新计算宽度
               this.$nextTick(() => {
                 const tabComponent = this.$el.querySelector('.ant-tabs')
                 if (tabComponent) {
@@ -147,7 +147,7 @@ export default {
                   window.dispatchEvent(new Event('resize'))
                 }
               })
-              // 更新其他列宽度
+              //  更新其他列宽度
               otherCols.forEach((col, index) => {
                 if (index < this.mainWithData.length) {
                   const widthValue = isOpen ? this.mainWithData[index].min : this.mainWithData[index].max

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>

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

@@ -1,155 +1,155 @@
-<script setup>
-import { getConfigByName } from '@vue2-client/services/api/common'
-import { reactive, ref, provide } from 'vue'
-import RenderRow from './RenderRow'
-import Exp500 from '@vue2-client/pages/exception/500.vue'
-
-const layout = ref(null)
-
-// 加载状态，0：加载中，1：已加载，2：出现错误
-const loaded = ref(0)
-
-// 声明组件总数
-const componentTotal = ref(0)
-
-// 注册组件总数
-const registerComponentTotal = ref(0)
-
-// 组件注册集
-const componentRefMap = reactive({})
-
-// 通用参数
-const data = {
-  comps: componentRefMap,
-  func: {
-    getConfigByName: getConfigByName
-  }
-}
-
-/**
- * 初始化构建页面组件
- * @param params
- */
-function init (params) {
-  const {
-    configName,
-    configValue,
-    serviceName
-  } = params
-  loaded.value = 0
-  const getConfigAfter = (res) => {
-    if (res == null) {
-      loaded.value = 2
-      return
-    }
-    layout.value = res
-    // 设置组件总量
-    setComponentTotal(layout.value.children)
-    loaded.value = 1
-  }
-  if (configName) {
-    getConfigByName(configName, serviceName, getConfigAfter)
-  } else {
-    getConfigAfter(JSON.parse(configValue))
-  }
-}
-
-/**
- * 注册组件
- * @param name 组件名称
- * @param vm 组件实例
- */
-function registerComponent (name, vm) {
-  componentRefMap[name] = vm
-  registerComponentTotal.value = registerComponentTotal.value + 1
-  console.info(`总组件数量：${componentTotal.value}，已注册数量：${registerComponentTotal.value}`)
-  // 初始化页面
-  initPage()
-  if (registerComponentTotal.value >= componentTotal.value) {
-    // 注册事件
-    registerEvents(layout.value.children)
-  }
-}
-provide('registerComponent', registerComponent)
-
-/**
- * 初始化页面
- */
-function initPage () {
-  if (layout.value.onMounted) {
-    // eslint-disable-next-line no-eval
-    const onMountedFun = eval('(' + layout.value.onMounted + ')')
-    onMountedFun(data)
-  }
-}
-
-/**
- * 设置需要注册的组件总数
- * @param children 组件集合
- */
-function setComponentTotal (children) {
-  children.forEach((child) => {
-    // 如果不是row类型，追加组件数量
-    if (child.type !== 'row') {
-      componentTotal.value = componentTotal.value + 1
-    }
-    // 递归追加子组件数量
-    if (child.children) {
-      setComponentTotal(child.children)
-    }
-  })
-}
-
-/**
- * 注册组件事件
- * @param children 组件集合
- */
-function registerEvents (children) {
-  children.forEach((child) => {
-    // 如果有事件，注册它们
-    if (child.event) {
-      Object.entries(child.event).forEach(([eventName, handler]) => {
-        // eslint-disable-next-line no-eval
-        const eventHandler = eval('(' + handler + ')')
-        const componentInstance = componentRefMap[child.id]
-        if (componentInstance) {
-          // 创建一个包装函数以传递额外参数
-          const wrappedHandler = function (...args) {
-            // 这里可以传递额外的参数，例如：
-            eventHandler.call(componentInstance, ...args, data)
-          }
-          componentInstance.$on(eventName, wrappedHandler)
-        }
-      })
-    }
-
-    // 递归注册子组件的事件
-    if (child.children) {
-      registerEvents(child.children)
-    }
-  })
-}
-
-defineExpose({
-  init
-})
-
-</script>
-
-<template>
-  <div class="liuli_page">
-    <div class="liuli_page_main" v-if="loaded === 1">
-      <render-row
-        v-for="row in layout.children"
-        :key="row.id"
-        :row="row"
-      />
-    </div>
-    <div class="liuli_page_error" v-else-if="loaded === 2">
-      <exp500></exp500>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="less">
-</style>
+<script setup>
+import { getConfigByName } from '@vue2-client/services/api/common'
+import { reactive, ref, provide } from 'vue'
+import RenderRow from './RenderRow'
+import Exp500 from '@vue2-client/pages/exception/500.vue'
+
+const layout = ref(null)
+
+// 加载状态，0：加载中，1：已加载，2：出现错误
+const loaded = ref(0)
+
+// 声明组件总数
+const componentTotal = ref(0)
+
+// 注册组件总数
+const registerComponentTotal = ref(0)
+
+// 组件注册集
+const componentRefMap = reactive({})
+
+// 通用参数
+const data = {
+  comps: componentRefMap,
+  func: {
+    getConfigByName: getConfigByName
+  }
+}
+
+/**
+ * 初始化构建页面组件
+ * @param params
+ */
+function init (params) {
+  const {
+    configName,
+    configValue,
+    serviceName
+  } = params
+  loaded.value = 0
+  const getConfigAfter = (res) => {
+    if (res == null) {
+      loaded.value = 2
+      return
+    }
+    layout.value = res
+    // 设置组件总量
+    setComponentTotal(layout.value.children)
+    loaded.value = 1
+  }
+  if (configName) {
+    getConfigByName(configName, serviceName, getConfigAfter)
+  } else {
+    getConfigAfter(JSON.parse(configValue))
+  }
+}
+
+/**
+ * 注册组件
+ * @param name 组件名称
+ * @param vm 组件实例
+ */
+function registerComponent (name, vm) {
+  componentRefMap[name] = vm
+  registerComponentTotal.value = registerComponentTotal.value + 1
+  console.info(`总组件数量：${componentTotal.value}，已注册数量：${registerComponentTotal.value}`)
+  // 初始化页面
+  initPage()
+  if (registerComponentTotal.value >= componentTotal.value) {
+    // 注册事件
+    registerEvents(layout.value.children)
+  }
+}
+provide('registerComponent', registerComponent)
+
+/**
+ * 初始化页面
+ */
+function initPage () {
+  if (layout.value.onMounted) {
+    // eslint-disable-next-line no-eval
+    const onMountedFun = eval('(' + layout.value.onMounted + ')')
+    onMountedFun(data)
+  }
+}
+
+/**
+ * 设置需要注册的组件总数
+ * @param children 组件集合
+ */
+function setComponentTotal (children) {
+  children.forEach((child) => {
+    // 如果不是row类型，追加组件数量
+    if (child.type !== 'row') {
+      componentTotal.value = componentTotal.value + 1
+    }
+    // 递归追加子组件数量
+    if (child.children) {
+      setComponentTotal(child.children)
+    }
+  })
+}
+
+/**
+ * 注册组件事件
+ * @param children 组件集合
+ */
+function registerEvents (children) {
+  children.forEach((child) => {
+    // 如果有事件，注册它们
+    if (child.event) {
+      Object.entries(child.event).forEach(([eventName, handler]) => {
+        // eslint-disable-next-line no-eval
+        const eventHandler = eval('(' + handler + ')')
+        const componentInstance = componentRefMap[child.id]
+        if (componentInstance) {
+          // 创建一个包装函数以传递额外参数
+          const wrappedHandler = function (...args) {
+            // 这里可以传递额外的参数，例如：
+            eventHandler.call(componentInstance, ...args, data)
+          }
+          componentInstance.$on(eventName, wrappedHandler)
+        }
+      })
+    }
+
+    // 递归注册子组件的事件
+    if (child.children) {
+      registerEvents(child.children)
+    }
+  })
+}
+
+defineExpose({
+  init
+})
+
+</script>
+
+<template>
+  <div class="liuli_page">
+    <div class="liuli_page_main" v-if="loaded === 1">
+      <render-row
+        v-for="row in layout.children"
+        :key="row.id"
+        :row="row"
+      />
+    </div>
+    <div class="liuli_page_error" v-else-if="loaded === 2">
+      <exp500></exp500>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="less">
+</style>

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

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