vue2-client 1.16.90 → 1.16.93

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/XCharge/XChargeDemo.vue

@@ -1,145 +1,145 @@
-<script>
-import XCharge from './XCharge.vue'
-
-export default {
-  name: 'XChargeSimpleDemo',
-  components: { XCharge },
-  data () {
-    return {
-      queryParamsName: 'chargeConfig',
-      methods: [],
-      total: 0,
-      lastAmountChange: null,
-      lastAction: null,
-      currentMode: 'manual' // 当前模式：manual, auto, single
-    }
-  },
-  methods: {
-    onMethod (value) { console.log('【事件】单选支付方式(method)：', value) },
-    onMethods (values) {
-      console.log('【事件】多选支付方式(methods)：', values)
-      this.methods = values
-      // 在自动模式下，由外部决定金额分配
-      if (this.currentMode === 'auto') {
-        this.autoDistributeAmounts(values)
-      }
-    },
-    onTotal (total) { console.log('【事件】合计金额变更(totalPaymentAmount)：', total); this.total = total },
-    onAmountChange (payload) { console.log('【事件】单个方式金额变更(paymentAmountChange)：', payload, '→ 方式：', payload.method, ' 金额：', payload.amount); this.lastAmountChange = payload },
-    onAction (payload) { console.log('【事件】操作(action)：', payload); this.lastAction = payload },
-    switchMode (mode) {
-      this.currentMode = mode
-      // 根据模式切换配置
-      switch (mode) {
-        case 'manual':
-          this.queryParamsName = 'testChargeConfig'
-          break
-        case 'auto':
-          this.queryParamsName = 'testAutoMixedChargeConfig'
-          break
-        case 'single':
-          this.queryParamsName = 'testSingleChargeConfig'
-          break
-      }
-    },
-    getModeText (mode) {
-      const modeMap = {
-        manual: '混合支付-手动模式',
-        auto: '混合支付-自动模式',
-        single: '单选模式'
-      }
-      return modeMap[mode] || mode
-    },
-    // 外部金额分配逻辑（示例：平均分配）
-    autoDistributeAmounts (selectedMethods) {
-      if (!selectedMethods || selectedMethods.length === 0) return
-
-      // 示例：假设总金额为100，平均分配
-      const totalAmount = 100
-      const amountPerMethod = totalAmount / selectedMethods.length
-
-      const amounts = {}
-      selectedMethods.forEach(method => {
-        amounts[method] = amountPerMethod
-      })
-
-      // 调用组件的setPaymentAmounts方法
-      this.$refs.xCharge.setPaymentAmounts(amounts)
-    }
-  }
-}
-</script>
-
-<template>
-  <div class="demo">
-    <!-- 模式切换按钮 -->
-    <div class="mode-switcher">
-      <h3>XCharge 组件测试 - 混合支付模式切换</h3>
-      <div class="mode-buttons">
-        <a-button
-          :type="currentMode === 'manual' ? 'primary' : 'default'"
-          @click="switchMode('manual')"
-        >
-          混合支付-手动模式
-        </a-button>
-        <a-button
-          :type="currentMode === 'auto' ? 'primary' : 'default'"
-          @click="switchMode('auto')"
-        >
-          混合支付-自动模式
-        </a-button>
-        <a-button
-          :type="currentMode === 'single' ? 'primary' : 'default'"
-          @click="switchMode('single')"
-        >
-          单选模式
-        </a-button>
-      </div>
-      <p class="current-mode">当前模式：{{ getModeText(currentMode) }}</p>
-    </div>
-
-    <x-charge
-      ref="xCharge"
-      :queryParamsName="queryParamsName"
-      @method="onMethod"
-      @methods="onMethods"
-      @totalPaymentAmount="onTotal"
-      @paymentAmountChange="onAmountChange"
-      @action="onAction"
-    />
-
-    <div class="info">
-      <p>已选方式：{{ methods.join('、') || '无' }}</p>
-      <p>合计金额：{{ total }}</p>
-      <p v-if="lastAmountChange">最近金额变更：{{ lastAmountChange.method }} -> {{ lastAmountChange.amount }}</p>
-    </div>
-  </div>
-</template>
-
-<style scoped>
-.demo { padding: 16px; }
-.mode-switcher {
-  margin-bottom: 24px;
-  padding: 16px;
-  background: #f8f9fa;
-  border-radius: 8px;
-  border: 1px solid #e9ecef;
-}
-.mode-switcher h3 {
-  margin: 0 0 16px 0;
-  color: #333;
-  font-size: 18px;
-}
-.mode-buttons {
-  display: flex;
-  gap: 12px;
-  margin-bottom: 12px;
-}
-.current-mode {
-  margin: 0;
-  color: #666;
-  font-weight: 500;
-}
-.info { margin-top: 16px; color: #333; }
-.info p { margin: 6px 0; }
-</style>
+<script>
+import XCharge from './XCharge.vue'
+
+export default {
+  name: 'XChargeSimpleDemo',
+  components: { XCharge },
+  data () {
+    return {
+      queryParamsName: 'chargeConfig',
+      methods: [],
+      total: 0,
+      lastAmountChange: null,
+      lastAction: null,
+      currentMode: 'manual' // 当前模式：manual, auto, single
+    }
+  },
+  methods: {
+    onMethod (value) { console.log('【事件】单选支付方式(method)：', value) },
+    onMethods (values) {
+      console.log('【事件】多选支付方式(methods)：', values)
+      this.methods = values
+      // 在自动模式下，由外部决定金额分配
+      if (this.currentMode === 'auto') {
+        this.autoDistributeAmounts(values)
+      }
+    },
+    onTotal (total) { console.log('【事件】合计金额变更(totalPaymentAmount)：', total); this.total = total },
+    onAmountChange (payload) { console.log('【事件】单个方式金额变更(paymentAmountChange)：', payload, '→ 方式：', payload.method, ' 金额：', payload.amount); this.lastAmountChange = payload },
+    onAction (payload) { console.log('【事件】操作(action)：', payload); this.lastAction = payload },
+    switchMode (mode) {
+      this.currentMode = mode
+      // 根据模式切换配置
+      switch (mode) {
+        case 'manual':
+          this.queryParamsName = 'testChargeConfig'
+          break
+        case 'auto':
+          this.queryParamsName = 'testAutoMixedChargeConfig'
+          break
+        case 'single':
+          this.queryParamsName = 'testSingleChargeConfig'
+          break
+      }
+    },
+    getModeText (mode) {
+      const modeMap = {
+        manual: '混合支付-手动模式',
+        auto: '混合支付-自动模式',
+        single: '单选模式'
+      }
+      return modeMap[mode] || mode
+    },
+    // 外部金额分配逻辑（示例：平均分配）
+    autoDistributeAmounts (selectedMethods) {
+      if (!selectedMethods || selectedMethods.length === 0) return
+
+      // 示例：假设总金额为100，平均分配
+      const totalAmount = 100
+      const amountPerMethod = totalAmount / selectedMethods.length
+
+      const amounts = {}
+      selectedMethods.forEach(method => {
+        amounts[method] = amountPerMethod
+      })
+
+      // 调用组件的setPaymentAmounts方法
+      this.$refs.xCharge.setPaymentAmounts(amounts)
+    }
+  }
+}
+</script>
+
+<template>
+  <div class="demo">
+    <!-- 模式切换按钮 -->
+    <div class="mode-switcher">
+      <h3>XCharge 组件测试 - 混合支付模式切换</h3>
+      <div class="mode-buttons">
+        <a-button
+          :type="currentMode === 'manual' ? 'primary' : 'default'"
+          @click="switchMode('manual')"
+        >
+          混合支付-手动模式
+        </a-button>
+        <a-button
+          :type="currentMode === 'auto' ? 'primary' : 'default'"
+          @click="switchMode('auto')"
+        >
+          混合支付-自动模式
+        </a-button>
+        <a-button
+          :type="currentMode === 'single' ? 'primary' : 'default'"
+          @click="switchMode('single')"
+        >
+          单选模式
+        </a-button>
+      </div>
+      <p class="current-mode">当前模式：{{ getModeText(currentMode) }}</p>
+    </div>
+
+    <x-charge
+      ref="xCharge"
+      :queryParamsName="queryParamsName"
+      @method="onMethod"
+      @methods="onMethods"
+      @totalPaymentAmount="onTotal"
+      @paymentAmountChange="onAmountChange"
+      @action="onAction"
+    />
+
+    <div class="info">
+      <p>已选方式：{{ methods.join('、') || '无' }}</p>
+      <p>合计金额：{{ total }}</p>
+      <p v-if="lastAmountChange">最近金额变更：{{ lastAmountChange.method }} -> {{ lastAmountChange.amount }}</p>
+    </div>
+  </div>
+</template>
+
+<style scoped>
+.demo { padding: 16px; }
+.mode-switcher {
+  margin-bottom: 24px;
+  padding: 16px;
+  background: #f8f9fa;
+  border-radius: 8px;
+  border: 1px solid #e9ecef;
+}
+.mode-switcher h3 {
+  margin: 0 0 16px 0;
+  color: #333;
+  font-size: 18px;
+}
+.mode-buttons {
+  display: flex;
+  gap: 12px;
+  margin-bottom: 12px;
+}
+.current-mode {
+  margin: 0;
+  color: #666;
+  font-weight: 500;
+}
+.info { margin-top: 16px; color: #333; }
+.info p { margin: 6px 0; }
+</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/XImportExcelButton/XFrontImportExcel.vue

@@ -50,7 +50,7 @@
 
 <script>
 
-import { importData, downloadImportExcel, getNativeConfig } from '@vue2-client/services/api/common'
+import { importData, downloadImportExcel, getConfigByName } from '@vue2-client/services/api/common'
 import { excleParseArrays } from '@vue2-client/utils/excel/Export2Excel'
 import { mapState } from 'vuex'
 
@@ -135,18 +135,43 @@ export default {
         this.readTemplateConfig()
       }
     },
-    /** 读取excle导入模板 */
-   async readTemplateConfig () {
+    /** 读取Excel导入模板配置 */
+    async readTemplateConfig () {
       try {
-        const isProd = process.env.NODE_ENV === 'production'
-        const config = await getNativeConfig(this.queryParamsName, 'af-his', !isProd)
-        if (config != null && config != undefined) {
-          this.excelImportTemplate = config.column.filter(item =>
-            item.dataModeArray && item.dataModeArray.includes('excelImportItem')
-          ).map(item => item.key.replace('.', '_'))
+        // const isProd = process.env.NODE_ENV === 'production'
+        await getConfigByName(
+          this.queryParamsName,
+          'af-his',
+          (config) => {
+            // 更严格的空值检查
+            if (config?.tableAliasName && config?.excelImportTemplate?.[0]?.column) {
+              const { tableAliasName } = config
+              const columns = config.excelImportTemplate[0].column
+              // 生成Excel导入模板列
+              this.excelImportTemplate = columns.map(item =>
+                `${tableAliasName}_${item}`
+              )
+              console.log('Excel模板列配置加载成功', this.excelImportTemplate)
+              // 可以将中文字段名称也拿出来，解析数据的时候可以和表头对比
+            } else {
+              console.warn('配置信息不完整，无法生成Excel模板列')
+              this.excelImportTemplate = []
+            }
+          }
+        )
+      } catch (error) {
+        // 更完善的错误处理
+        console.error('读取Excel模板配置失败：', error.message || error.msg || error)
+        // 可以根据错误类型进行不同的处理
+        if (error.code === 'CONFIG_NOT_FOUND') {
+          // 处理配置不存在的情况
+          this.excelImportTemplate = []
+        } else if (error.code === 'NETWORK_ERROR') {
+          // 处理网络错误
+          console.error('网络连接失败，请检查网络设置')
         }
-      } catch (e) {
-        console.error('读取excle模板列报错：', e.msg)
+        // 可以选择抛出错误或返回默认值
+        throw new Error(`读取Excel模板配置失败: ${error.message}`)
       }
     },
     beforeUpload (file) {

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
+}