vue2-client 1.18.68 → 1.19.0

package/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.19.0 -2026-01-05 @江超**
+- 移除对旧字典的支持（暂时保留方法）
+
 **1.16.72 -2024-12-19 @张振宇**
 - 修复代码检查发现的错误
 - 优化 XAddNativeFormOA 组件中的变量作用域问题

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.18.68",
+  "version": "1.19.0",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/HIS/HAddNativeForm/HAddNativeForm.vue

@@ -136,21 +136,7 @@ export default {
             console.warn(`Config '${configName}' did not return a valid 'value' array for options. Result:`, res)
           }
         } else {
-          // 全局字典
-          if (this.$appdata && typeof this.$appdata.getDictionaryList === 'function') {
-            const dictionaryList = this.$appdata.getDictionaryList(item.keyName)
-            if (Array.isArray(dictionaryList)) {
-              fetchedOptions = dictionaryList.map(opt => ({
-                label: opt.text,
-                value: opt.value + '',
-                ...opt // 将所有原始属性也添加到选项中
-              }))
-            } else {
-              console.warn(`Global dictionary '${item.keyName}' did not return an array. Result:`, dictionaryList)
-            }
-          } else {
-            console.error('$appdata.getDictionaryList is not available. Please ensure it\'s globally provided.')
-          }
+          // 移除对旧字典的解析
         }
       } catch (error) {
         console.error(`Error fetching options for item '${item.key}':`, error)

package/src/base-client/components/common/XBadge/XBadge.vue

@@ -73,15 +73,7 @@ export default {
   methods: {
     // todo 修改方式  想办法不使用回调方式
     async updateDictionary () {
-      const result = this.$appdata.getParam(this.badgeKey, this.value)
-      if (result) {
-        this.dictionary = result
-        return
-      }
       this.dictionary = await this.$appdata.getDictValue(this.badgeKey, this.value, undefined, this.env === 'dev', this.serviceName)
-    },
-    badgeFilter (key, value) {
-      return this.$appdata.getParam(key, value)
     }
   }
 }

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -144,22 +144,6 @@
               </template>
             </a-select-option>
           </template>
-          <template v-else>
-            <a-select-option
-              v-for="item in $appdata.getDictionaryList(attr.keyName)"
-              :key="item.value"
-              :value="item.value + ''"
-            >
-              <!-- 徽标(badge) -->
-              <x-badge
-                :badge-key="attr.keyName"
-                :replaceText="item.text"
-                :value="item.value"
-                :service-name="serviceName"
-                :env="env"
-              />
-            </a-select-option>
-          </template>
         </template>
       </a-select>
       <a-select
@@ -259,15 +243,6 @@
               </template>
             </a-select-option>
           </template>
-          <template v-else>
-            <a-select-option
-              v-for="item in $appdata.getDictionaryList(attr.keyName)"
-              :key="item.value"
-              :value="item.value + ''"
-            >
-              {{ item.text }}
-            </a-select-option>
-          </template>
         </template>
       </a-select>
       <a-select
@@ -333,11 +308,6 @@
               {{ item.label }}
             </a-radio>
           </template>
-          <template v-else>
-            <a-radio v-for="(item, index) in $appdata.getDictionaryList(attr.keyName)" :key="index" :value="item.value">
-              {{ item.text }}
-            </a-radio>
-          </template>
         </template>
       </a-radio-group>
     </a-form-model-item>

package/src/base-client/components/his/HChart/demo.vue

@@ -1,88 +1,88 @@
-<template>
-  <div class="h-chart-test-container">
-    <h2>HChart 组件测试案例</h2>
-
-    <section class="test-section">
-      <h3>测试1: 通过 queryParamsName 查询配置（从后端获取配置和数据）</h3>
-      <div class="chart-wrapper">
-        <HChart
-          ref="chart1"
-          query-params-name="accountsReceivableChart"
-          :fixed-query-form="{ condition: '1=1', dateRange: '2024-01' }"
-          service-name="af-his"
-          @init="handleChartInit"
-          @dataLoaded="handleDataLoaded"
-          @error="handleError"
-        />
-      </div>
-      <div class="test-actions">
-        <a-button @click="refreshChart1">刷新图表</a-button>
-        <a-button @click="reloadChart1">重新加载（更新查询条件）</a-button>
-      </div>
-    </section>
-
-    <section class="test-section">
-      <h3>测试日志</h3>
-      <div class="log-container">
-        <div v-for="(log, index) in logs" :key="index" class="log-item">
-          <span class="log-time">{{ log.time }}</span>
-          <span class="log-type" :class="log.type">{{ log.type }}</span>
-          <span class="log-message">{{ log.message }}</span>
-        </div>
-      </div>
-      <a-button @click="clearLogs">清空日志</a-button>
-    </section>
-  </div>
-</template>
-
-<script setup>
-import { ref } from 'vue'
-import { message } from 'ant-design-vue'
-import HChart from './HChart.vue'
-
-const chart1 = ref(null)
-
-const logs = ref([])
-
-const addLog = (type, messageText) => {
-  logs.value.unshift({
-    time: new Date().toLocaleTimeString(),
-    type,
-    message: typeof messageText === 'object' ? JSON.stringify(messageText, null, 2) : messageText
-  })
-  if (logs.value.length > 50) logs.value.pop()
-}
-
-const clearLogs = () => {
-  logs.value = []
-}
-
-const handleChartInit = (config) => {
-  addLog('init', `图表初始化: ${config?.title || '未知'}`)
-  message.success(`图表初始化成功: ${config?.title || '未知'}`)
-}
-
-const handleDataLoaded = (data) => {
-  addLog('dataLoaded', `数据加载完成，共 ${data?.length || 0} 条`)
-  console.log('数据加载完成:', data)
-}
-
-const handleError = (error) => {
-  addLog('error', `错误: ${error?.message || String(error)}`)
-  message.error(`图表加载错误: ${error?.message || String(error)}`)
-}
-
-const refreshChart1 = () => {
-  if (!chart1.value) return
-  chart1.value.refresh()
-  addLog('action', '刷新图表')
-  message.info('正在刷新图表...')
-}
-
-const reloadChart1 = () => {
-  if (!chart1.value) return
-  chart1.value.reload({ condition: '1=1', dateRange: '2024-02' })
-  addLog('action', '重新加载图表，更新查询条件')
-  message.info('正在重新加载图表...')
-}
-</script>
+<template>
+  <div class="h-chart-test-container">
+    <h2>HChart 组件测试案例</h2>
+
+    <section class="test-section">
+      <h3>测试1: 通过 queryParamsName 查询配置（从后端获取配置和数据）</h3>
+      <div class="chart-wrapper">
+        <HChart
+          ref="chart1"
+          query-params-name="accountsReceivableChart"
+          :fixed-query-form="{ condition: '1=1', dateRange: '2024-01' }"
+          service-name="af-his"
+          @init="handleChartInit"
+          @dataLoaded="handleDataLoaded"
+          @error="handleError"
+        />
+      </div>
+      <div class="test-actions">
+        <a-button @click="refreshChart1">刷新图表</a-button>
+        <a-button @click="reloadChart1">重新加载（更新查询条件）</a-button>
+      </div>
+    </section>
+
+    <section class="test-section">
+      <h3>测试日志</h3>
+      <div class="log-container">
+        <div v-for="(log, index) in logs" :key="index" class="log-item">
+          <span class="log-time">{{ log.time }}</span>
+          <span class="log-type" :class="log.type">{{ log.type }}</span>
+          <span class="log-message">{{ log.message }}</span>
+        </div>
+      </div>
+      <a-button @click="clearLogs">清空日志</a-button>
+    </section>
+  </div>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { message } from 'ant-design-vue'
+import HChart from './HChart.vue'
+
+const chart1 = ref(null)
+
+const logs = ref([])
+
+const addLog = (type, messageText) => {
+  logs.value.unshift({
+    time: new Date().toLocaleTimeString(),
+    type,
+    message: typeof messageText === 'object' ? JSON.stringify(messageText, null, 2) : messageText
+  })
+  if (logs.value.length > 50) logs.value.pop()
+}
+
+const clearLogs = () => {
+  logs.value = []
+}
+
+const handleChartInit = (config) => {
+  addLog('init', `图表初始化: ${config?.title || '未知'}`)
+  message.success(`图表初始化成功: ${config?.title || '未知'}`)
+}
+
+const handleDataLoaded = (data) => {
+  addLog('dataLoaded', `数据加载完成，共 ${data?.length || 0} 条`)
+  console.log('数据加载完成:', data)
+}
+
+const handleError = (error) => {
+  addLog('error', `错误: ${error?.message || String(error)}`)
+  message.error(`图表加载错误: ${error?.message || String(error)}`)
+}
+
+const refreshChart1 = () => {
+  if (!chart1.value) return
+  chart1.value.refresh()
+  addLog('action', '刷新图表')
+  message.info('正在刷新图表...')
+}
+
+const reloadChart1 = () => {
+  if (!chart1.value) return
+  chart1.value.reload({ condition: '1=1', dateRange: '2024-02' })
+  addLog('action', '重新加载图表，更新查询条件')
+  message.info('正在重新加载图表...')
+}
+</script>