vue2-client 1.19.78 → 1.19.80

package/docs//345/211/215/347/253/257/344/270/232/345/212/241/351/200/273/350/276/221/344/275/277/347/224/250/350/257/264/346/230/216.md

@@ -6,10 +6,25 @@
 
 ## 一、运行方式
 
-### 1. 按配置名执行：`LogicRunner.run(logicName, param)`
+### 1. 全局调用：`this.$runFrontLogic(logicName, param)`（推荐在配置脚本中使用）
+
+通过 Vue 插件注册，**任意组件**及**配置中的可执行脚本**（如报表的 `dataProcessScript`、按钮的 `customFunction`）内均可使用，无需 import。
+
+- 返回 **Promise**，可 `.then()` / `.catch()` 处理结果或错误。
+- 插件在 base-client 中注册，使用 `Vue.use(Plugins)` 的应用自动具备该能力。
+
+```javascript
+// 例如在 dataProcessScript、customFunction 等配置脚本中（this 为当前组件）
+var c = (data && data.patientComplaint != null) ? data.patientComplaint : ''
+this.$runFrontLogic('aiDiagnosesCoverDataProcess', { patientComplaint: c, proxy: this }).catch(function (e) {
+  if (this.$message && this.$message.warn) this.$message.warn('执行失败，请稍后重试')
+})
+```
+
+### 2. 按配置名执行：`LogicRunner.run(logicName, param)`
 
 - 从后端/配置中心按 `logicName` 拉取逻辑内容（与后端 Logic 同源的配置），在前端执行。
-- 执行时自动注入插件：`data`（即本次传入的 `param`）、`log`、`ENV`、`logic`、`dateTools`、`vueTools`。
+- 执行时自动注入插件：`data`（即本次传入的 `param`）、`log`、`ENV`、`logic`、`dateTools`、`vueTools`、`http`。
 - 适合逻辑内容放在配置里、由界面传入「当前组件 / 响应式数据」的场景。
 
 ```javascript
@@ -22,7 +37,7 @@ const result = await LogicRunner.run('testVueLogic', {
 })
 ```
 
-### 2. 直接执行表达式字符串：`LogicRunner.runExpression(source, params)`
+### 3. 直接执行表达式字符串：`LogicRunner.runExpression(source, params)`
 
 - 不拉取配置，直接执行一段表达式字符串。
 - `params` 即脚本内的入参（通常包含 `data` 等），无默认插件，需调用方自己构造。
@@ -50,6 +65,7 @@ const result = await LogicRunner.runExpression(expression, {
 | `logic` | LogicRunner 自身，可再调 `logic.run(其他逻辑名, 参数)`（会再拉配置执行）。 |
 | `dateTools` | 日期工具，与后端 dateTools 用法一致。 |
 | `vueTools` | 前端专用：`vueTools.getComponent(vueRef, componentName)`，等价于 `vueRef.$refs[componentName]`，用于按 ref 名取子组件。 |
+| `http` | 请求插件（返回 Promise）：`http.post(url, body)`、`http.get(url, params)`。返回值为响应体（response.data），执行器会自动等待 Promise 完成后再继续，可在 Logic 中直接写 `res = http.post('/api/xxx', { key: value })` 再使用 `res.xxx`。 |
 
 在**直接执行表达式**（`runExpression`）时，没有默认插件，完全由第二个参数 `params` 提供，例如把当前表单数据放进 `params.WF_FORM`，脚本里用 `data.WF_FORM` 访问（若 params 里 key 为 `data` 且值为该对象）。
 
@@ -62,8 +78,9 @@ const result = await LogicRunner.runExpression(expression, {
 - **条件**：`条件 : 结果 , 默认值`，无 if/else，用逗号接默认值。
 - **循环**：用数组的 `each`，例如 `data.xxx.each( row = row + 1 )`，其中 `row` 表示当前项。
 - **JSON**：支持 `{ key: value }`、`[ a, b ]`。
-- **字符串插值**：字符串内用 `"现在是{dateTools.getNow2()}"` 形式嵌入表达式。
+- **字符串插值**：仅支持双引号字符串，字符串内用 `"现在是{dateTools.getNow2()}"` 形式嵌入表达式（不再支持 `$...$` 形式的字符串）。`$` 可作为标识符的一部分使用，与普通字母一致，例如 `data.$runFrontLogic(...)`。
 - 其他：`return`、`try/catch/finally`、`validate { ... }`、`assert`、lambda `=> { }` 等，与后端一致。
+- **异步请求**：表达式语法不支持 `await`，需使用返回 Promise 的插件方法。`http.post(url, body)`、`http.get(url, params)` 返回 Promise，执行器会在调用处自动等待完成并把结果赋给左侧变量，例如：`res = http.post('/hai-api/suggest-by-complaint', { chief_complaint: data.c }), sug = res.suggestions, ...`。
 
 更完整的语法见 `src/expression/core/Program.js`（解析）和 `src/expression/TestExpression.js`（大量表达式示例）。
 
@@ -128,9 +145,10 @@ const result = await LogicRunner.runExpression(expression, {
 
 | 内容 | 路径 |
 |------|------|
+| **前端 Logic Vue 插件** | `src/base-client/plugins/FrontLogicPlugin.js`（注册 `$runFrontLogic`） |
 | 运行器 | `src/logic/LogicRunner.js` |
 | 表达式解析与执行 | `src/expression/ExpressionRunner.js`、`src/expression/core/Program.js`、`src/expression/core/Expression.js` |
-| 前端插件 | `src/logic/plugins/index.js`、`src/logic/plugins/common/VueTools.js`、`src/logic/plugins/common/DateTools.js` |
+| 前端插件 | `src/logic/plugins/index.js`、`src/logic/plugins/common/VueTools.js`、`src/logic/plugins/common/DateTools.js`、`src/logic/plugins/common/HttpTools.js` |
 | 页面示例 | `src/pages/LogicCallExample/index.vue` |
 | 工作流表达式示例 | `src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue`（`evaluateExpression`） |
 | 表达式语法用例 | `src/expression/TestExpression.js` |

package/package.json

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

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

@@ -1135,6 +1135,28 @@ export default {
      */
     handleProgressUpdated (data, record, dataIndex) {
       this.$emit('progressUpdated', data, record, dataIndex)
+    },
+    async beforeExportSetHeaders() {
+      const hasListener = !!this.$listeners?.beforeExportSetHeaders
+
+      if (!hasListener) return []
+
+      const result = await new Promise(resolve => {
+        this.$emit('beforeExport', resolve)
+      })
+
+      // 字符串 → 包装成数组
+      if (typeof result === 'string') {
+        return [result]
+      }
+
+      // 数组 → 原样返回
+      if (Array.isArray(result)) {
+        return result
+      }
+
+      // 其他情况 → 兜底为空数组
+      return []
     }
   },
   action: {

package/src/base-client/components/common/XFormTable/demo.vue

@@ -3,15 +3,7 @@
     <x-form-table
       title="示例表单"
       :queryParamsName="queryParamsName"
-      :fixedAddForm="fixedAddForm"
-      :externalSelectedRowKeys="selectedKeys"
-      @action="action"
-      @selectRow="selectRow"
-      @columnClick="columnClick"
-      @ceshi="ceshi"
-      @rowDblClick="rowDblClick"
-      :defaultPageSize="5"
-      serviceName="af-revenue"
+      serviceName="af-linepatrol"
       ref="xFormTable"
     ></x-form-table>
   </a-card>
@@ -28,7 +20,7 @@ export default {
   data() {
     return {
       // 查询配置文件名
-      queryParamsName: 'address_management',
+      queryParamsName: 't_subhighpressure_pipelineCRUD',
       // 查询配置左侧tree
       xTreeConfigName: 'addressType',
       // 新增表单固定值

package/src/base-client/components/common/XReport/print.js

@@ -1,186 +1,186 @@
-// print.js
-
-export function printElement (elementToPrint) {
-  // 创建一个新的浏览器窗口
-  const printWindow = window.open('', '_blank', 'height=1024,width=768')
-  // 设置新窗口的文档内容
-  printWindow.document.write(`
-    <html>
-      <head>
-        <title>Print</title>
-        <style>
-          @page {
-            size: auto;
-            margin: 0mm;
-          }
-          html, body {
-            margin: 0;
-            padding: 0;
-            width: 100%;
-            height: 100%;
-          }
-          #print-container {
-            display: none
-          }
-          .img{
-            width: 95%;
-            height: 180px;
-            object-fit: cover;
-          }
-          .reportMain {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            padding: 15px;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-              margin-bottom: 1%;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-              text-align: center;
-            }
-          }
-          .reportMainForDisplay {
-            text-align: center;
-            margin: 10% auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            padding: 15px;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-around;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .reportMainNoPadding {
-            text-align: center;
-            margin: 0 auto;
-            font-size: 16px;
-            color: #000;
-            background-color: #fff;
-            border-radius: 8px;
-
-            .reportTitle {
-              font-weight: bold;
-            }
-
-            .subTitle {
-              display: flex;
-              justify-content: space-between;
-
-              .subTitleItems {
-                max-width: 30%;
-              }
-            }
-
-            .inputsDiv {
-              display: flex;
-              justify-content: space-between;
-              .inputsDivItem {
-                display: flex;
-                align-items: center;
-                padding: 0 4px;
-                white-space: nowrap;
-                .inputsDivItemLabel {
-                  padding: 0 4px;
-                }
-              }
-            }
-
-            .reportTable {
-              width: 100%;
-              border-collapse: collapse;
-              table-layout:fixed;
-              word-break:break-all;
-            }
-          }
-          .tools{
-            position: fixed;
-            right: 2%;
-            text-align: right;
-            width: 60%;
-            cursor: pointer;
-            .toolsItem{
-              width: 15%;
-              margin-right: 3%;
-              display: inline-block;
-            }
-          }
-        </style>
-      </head>
-      <body>
-        <!-- 将需要打印的元素内容复制到新窗口中 -->
-        ${elementToPrint.innerHTML}
-      </body>
-    </html>
-  `)
-  // 延迟执行打印，以确保新窗口的内容已加载完成
-  printWindow.document.close() // 关闭文档流，确保内容完全加载
-  setTimeout(() => {
-    printWindow.print() // 调用打印方法
-    printWindow.close()
-  }, 500) // 延迟500毫秒后执行打印
-}
+// print.js
+
+export function printElement (elementToPrint) {
+  // 创建一个新的浏览器窗口
+  const printWindow = window.open('', '_blank', 'height=1024,width=768')
+  // 设置新窗口的文档内容
+  printWindow.document.write(`
+    <html>
+      <head>
+        <title>Print</title>
+        <style>
+          @page {
+            size: auto;
+            margin: 0mm;
+          }
+          html, body {
+            margin: 0;
+            padding: 0;
+            width: 100%;
+            height: 100%;
+          }
+          #print-container {
+            display: none
+          }
+          .img{
+            width: 95%;
+            height: 180px;
+            object-fit: cover;
+          }
+          .reportMain {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            padding: 15px;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+              margin-bottom: 1%;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+              text-align: center;
+            }
+          }
+          .reportMainForDisplay {
+            text-align: center;
+            margin: 10% auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            padding: 15px;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-around;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .reportMainNoPadding {
+            text-align: center;
+            margin: 0 auto;
+            font-size: 16px;
+            color: #000;
+            background-color: #fff;
+            border-radius: 8px;
+
+            .reportTitle {
+              font-weight: bold;
+            }
+
+            .subTitle {
+              display: flex;
+              justify-content: space-between;
+
+              .subTitleItems {
+                max-width: 30%;
+              }
+            }
+
+            .inputsDiv {
+              display: flex;
+              justify-content: space-between;
+              .inputsDivItem {
+                display: flex;
+                align-items: center;
+                padding: 0 4px;
+                white-space: nowrap;
+                .inputsDivItemLabel {
+                  padding: 0 4px;
+                }
+              }
+            }
+
+            .reportTable {
+              width: 100%;
+              border-collapse: collapse;
+              table-layout:fixed;
+              word-break:break-all;
+            }
+          }
+          .tools{
+            position: fixed;
+            right: 2%;
+            text-align: right;
+            width: 60%;
+            cursor: pointer;
+            .toolsItem{
+              width: 15%;
+              margin-right: 3%;
+              display: inline-block;
+            }
+          }
+        </style>
+      </head>
+      <body>
+        <!-- 将需要打印的元素内容复制到新窗口中 -->
+        ${elementToPrint.innerHTML}
+      </body>
+    </html>
+  `)
+  // 延迟执行打印，以确保新窗口的内容已加载完成
+  printWindow.document.close() // 关闭文档流，确保内容完全加载
+  setTimeout(() => {
+    printWindow.print() // 调用打印方法
+    printWindow.close()
+  }, 500) // 延迟500毫秒后执行打印
+}

package/src/base-client/components/common/XTable/ExportExcel.vue

@@ -27,7 +27,9 @@ export default {
       // 选中的查询条件字段名
       selectedQueryConditions: [],
       // 查询条件的 labelData 数据
-      queryLabelData: null
+      queryLabelData: null,
+      // 自定义表头行数据
+      customHeaders: [],
     }
   },
   inject: ['tableContext', 'getFormLabelData'],
@@ -63,10 +65,11 @@ export default {
   },
   methods: {
     // 导出选中或本页数据
-    handleExport (type, title) {
+    handleExport (type, title, customHeaders = []) {
       this.modalTitle = '选择导出列'
       this.exportFileName = title || '查询导出'
       this.type = 'export'
+      this.customHeaders = customHeaders
       this.handle(type)
     },
     // 打印选中或本页数据
@@ -74,6 +77,7 @@ export default {
       this.modalTitle = '选择打印数据列'
       this.type = 'print'
       this.printData = printData
+      this.customHeaders = []
       this.handle(type)
     },
     handle (type) {
@@ -88,7 +92,6 @@ export default {
       // 获取查询条件的 labelData，并默认全部选中
       if (this.getFormLabelData) {
         this.queryLabelData = this.getFormLabelData()
-        console.log('>>>> this.queryLabelData: ', JSON.stringify(this.queryLabelData))
         // 默认全部选中所有查询条件字段（根据 labels 数组的索引）
         if (this.queryLabelData && this.queryLabelData.labels && this.queryLabelData.labels.length > 0) {
           this.selectedQueryConditions = this.queryLabelData.labels.map((_, index) => index)
@@ -225,6 +228,7 @@ export default {
       const fileNamePrefix = this.exportFileName || '查询导出'
       const name = `${fileNamePrefix}_${dateTime}`
       const queryData = this.buildDisplayText(this.queryLabelData?.labelData, this.queryLabelData?.labels, this.selectedQueryConditions)
+      this.customHeaders.push(queryData)
       const param = {
         queryParamsName: this.tableContext.queryParamsName,
         queryParams: this.tableContext.queryParams,
@@ -233,7 +237,7 @@ export default {
         form: conditionParams,
         userId: this.tableContext.currUser.id,
         fileName: name,
-        queryData: queryData
+        headerData: this.customHeaders
       }
       exportData(param, this.tableContext.serviceName).then(res => {
         this.closeModal()

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

@@ -1397,8 +1397,13 @@ export default {
       const indexColumn = this.tableColumns.find(i => i?.slotType === 'index')
       return indexColumn ? indexColumn.dataIndex : this.tableColumns[0].dataIndex
     },
-    handleExport (type) {
-      this.$refs.exportExcel.handleExport(type, this.title)
+    async handleExport(type) {
+      const formTable = this.getSelf && this.getSelf()
+      let customHeaders = []
+      if (formTable && typeof formTable.beforeExportSetHeaders === 'function') {
+        customHeaders = await formTable.beforeExportSetHeaders()
+      }
+      this.$refs.exportExcel.handleExport(type, this.title, customHeaders)
     },
     handlePrint (type) {
       const printData = {

package/src/base-client/plugins/FrontLogicPlugin.js

@@ -0,0 +1,19 @@
+/**
+ * 前端业务逻辑插件
+ * 将「运行前端 Logic 表达式」注册为 Vue 全局方法，可在任意组件或配置脚本中调用。
+ * 使用方式：
+ *   - 在组件中：this.$runFrontLogic('logicName', { key: value })
+ *   - 返回 Promise，可 .then() / .catch()
+ */
+import LogicRunner from '@vue2-client/logic/LogicRunner'
+
+const runFrontLogic = (logicName, param) => LogicRunner.run(logicName, param)
+
+const FrontLogicPlugin = {
+  install (Vue) {
+    Vue.$runFrontLogic = runFrontLogic
+    Vue.prototype.$runFrontLogic = runFrontLogic
+  }
+}
+
+export default FrontLogicPlugin

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

@@ -4,6 +4,7 @@ import getConfig from '@vue2-client/base-client/plugins/Config'
 import moment from '@vue2-client/base-client/plugins/moment'
 import recording from '@vue2-client/base-client/plugins/Recording'
 import ComponentRegistryPlugin from '@vue2-client/base-client/plugins/ComponentRegistryPlugin'
+import FrontLogicPlugin from '@vue2-client/base-client/plugins/FrontLogicPlugin'
 
 import VueI18nPlugin from './i18n-extend'
 import AuthorityPlugin from './authority-plugin'
@@ -20,6 +21,7 @@ const Plugins = {
     Vue.use(TabsPagePlugin)
     Vue.use(recording)
     Vue.use(ComponentRegistryPlugin)
+    Vue.use(FrontLogicPlugin)
   }
 }
 export default Plugins

package/src/expression/core/Program.js

@@ -16,7 +16,7 @@ export default class Program {
    */
   tokens = []
   /**
-   * 字符串处理环节堆栈，$进入字符串处理环节，“{}”中间部分脱离字符串处理环节
+   * 字符串处理环节堆栈，双引号进入字符串处理环节，“{}”中间部分脱离字符串处理环节
    */
   inStrings = []
 
@@ -340,7 +340,7 @@ export default class Program {
     } else if (t.getType() === TokenType.Oper && t.getValue() === '[') {
       // JSON array
       return this.JsonArray()
-    } else if (t.getType() === TokenType.Oper && (t.getValue() === '$' || t.getValue() === '"')) {
+    } else if (t.getType() === TokenType.Oper && t.getValue() === '"') {
       // String concatenation sequence
       return this.StringUnion()
     } else if (t.getType() === TokenType.Int || t.getType() === TokenType.Double || t.getType() === TokenType.Bool) {
@@ -559,7 +559,7 @@ export default class Program {
     let value
     if (name.getType() === TokenType.Identy) {
       value = name.getValue()
-    } else if (name.getType() === TokenType.Oper && (name.getValue() === '$' || name.getValue() === '"')) {
+    } else if (name.getType() === TokenType.Oper && name.getValue() === '"') {
       const expression = this.StringUnion().children[1]
       value = expression.value
     } else {
@@ -772,10 +772,10 @@ export default class Program {
     // If in string state, process the string
     if (this.inString) {
       const startPos = this.pos
-      while (hasKeyword && value !== '{' && value !== '}' && value !== '$' && value !== '"') {
+      while (hasKeyword && value !== '{' && value !== '}' && value !== '"') {
         if (value === '\\') {
           const nextStrValue = this.SOURCE.charAt(this.pos + 1)
-          if (this.pos + 1 < this.SOURCE_LENGTH && ['{', '}', '"', '$', '\\'].includes(nextStrValue)) {
+          if (this.pos + 1 < this.SOURCE_LENGTH && ['{', '}', '"', '\\'].includes(nextStrValue)) {
             this.pos++
           } else {
             break
@@ -798,7 +798,7 @@ export default class Program {
         .replace(/\\"/g, '"')
         .replace('\\\\', '\\'), sPos)
 
-      if (hasKeyword && (value === '$' || value === '"')) {
+      if (hasKeyword && value === '"') {
         this.pos++
       }
       return t
@@ -863,9 +863,9 @@ export default class Program {
           const str = this.SOURCE.substring(oldPos, this.pos)
           return new Token(TokenType.Int, parseInt(str, 10), sPos)
         }
-      } else if ((value >= 'a' && value <= 'z') || (value >= 'A' && value <= 'Z') || value === '_' || /[\u4e00-\u9fa5]/.test(value)) {
+      } else if ((value >= 'a' && value <= 'z') || (value >= 'A' && value <= 'Z') || value === '_' || value === '$' || /[\u4e00-\u9fa5]/.test(value)) {
         const oldPos = this.pos
-        while (hasKeyword && ((value >= 'a' && value <= 'z') || (value >= 'A' && value <= 'Z') || (value >= '0' && value <= '9') || value === '_' || /[\u4e00-\u9fa5]/.test(value))) {
+        while (hasKeyword && ((value >= 'a' && value <= 'z') || (value >= 'A' && value <= 'Z') || (value >= '0' && value <= '9') || value === '_' || value === '$' || /[\u4e00-\u9fa5]/.test(value))) {
           this.pos++
           if (this.pos < this.SOURCE_LENGTH) {
             value = this.SOURCE.charAt(this.pos)
@@ -907,8 +907,8 @@ export default class Program {
           this.pos += 1
         }
         return new Token(TokenType.Oper, str, sPos)
-      } else if ('()[],;.:@{}"$'.includes(value)) {
-        if (value === '$' || value === '"') {
+      } else if ('()[],;.:@{}"'.includes(value)) {
+        if (value === '"') {
           this.inStrings.push(false)
           this.inString = true
         } else if ((value === '{' || value === '}') && this.inStrings.length) {

package/src/expression/instances/LogicConsole.js

@@ -1,5 +1,7 @@
 // 自定义 Console 类
+// 与 Vue 实例的 logger 对齐：支持按路径配置开关、输出前缀；业务逻辑中 log.xx 使用 Expression 序列化
 import Expression from '../core/Expression'
+import { isLogEnabled } from '@vue2-client/utils/logger'
 
 export default class LogicConsole {
   constructor () {
@@ -16,6 +18,20 @@ export default class LogicConsole {
     return LogicConsole.instance
   }
 
+  /**
+   * 带路径与配置检查的输出（供 createLogger 使用）
+   * @param {string} level - 'log' | 'debug' | 'info' | 'warn' | 'error'
+   * @param {string} logPath - 日志路径，如 'logic.xxx'
+   * @param {*[]} args - 参数，会经 convert 序列化
+   */
+  _output (level, logPath, ...args) {
+    if (!isLogEnabled(logPath)) return
+    const prefix = `log[${logPath}]:`
+    const newArgs = this.convert(args)
+    const consoleMethod = console[level] || console.log
+    consoleMethod(prefix, ...newArgs)
+  }
+
   debug (...args) {
     const newArgs = this.convert(args)
     console.debug(...newArgs)
@@ -36,6 +52,31 @@ export default class LogicConsole {
     console.error(...newArgs)
   }
 
+  /** 与 Vue logger 一致：log 对应 console.log */
+  log (...args) {
+    const newArgs = this.convert(args)
+    console.log(...newArgs)
+  }
+
+  /**
+   * 创建带路径的 logger，与 Vue 实例的 logger 行为一致：
+   * 从 logger.config.js / config.js 读取配置按路径开关，输出带 log[path]: 前缀，参数经 Expression 序列化。
+   * 业务逻辑中应使用此方法传入 logicName，便于按 logic 控制日志。
+   * @param {string} logPath - 日志路径，如 'logic.aiDiagnosis' 或 'logic.xxx'
+   * @returns {{ log: Function, debug: Function, info: Function, warn: Function, error: Function }}
+   */
+  static createLogger (logPath) {
+    const path = typeof logPath === 'string' && logPath ? logPath : 'logic'
+    const instance = LogicConsole.getInstance()
+    return {
+      log: (...args) => instance._output('log', path, ...args),
+      debug: (...args) => instance._output('debug', path, ...args),
+      info: (...args) => instance._output('info', path, ...args),
+      warn: (...args) => instance._output('warn', path, ...args),
+      error: (...args) => instance._output('error', path, ...args),
+    }
+  }
+
   convert (args) {
     return args.map(obj => {
       return Expression.toJSONString(obj)

package/src/expression/ts/core/Program.ts

@@ -17,7 +17,7 @@ export default class Program {
    */
   private readonly tokens: Token[] = [];
   /**
-   * 字符串处理环节堆栈，$进入字符串处理环节，“{}”中间部分脱离字符串处理环节
+   * 字符串处理环节堆栈，双引号进入字符串处理环节，“{}”中间部分脱离字符串处理环节
    */
   private readonly inStrings: boolean[] = [];
 
@@ -343,7 +343,7 @@ export default class Program {
     } else if (t.getType() === TokenType.Oper && t.getValue() === "[") {
       // JSON array
       return this.JsonArray();
-    } else if (t.getType() === TokenType.Oper && (t.getValue() === "$" || t.getValue() === "\"")) {
+    } else if (t.getType() === TokenType.Oper && t.getValue() === "\"") {
       // String concatenation sequence
       return this.StringUnion();
     } else if (t.getType() === TokenType.Int || t.getType() === TokenType.Double || t.getType() === TokenType.Bool) {
@@ -562,7 +562,7 @@ export default class Program {
     let value: string;
     if (name.getType() === TokenType.Identy) {
       value = <string>name.getValue();
-    } else if (name.getType() === TokenType.Oper && (name.getValue() === "$" || name.getValue() === "\"")) {
+    } else if (name.getType() === TokenType.Oper && name.getValue() === "\"") {
       let expression: Expression = this.StringUnion().children[1] as Expression;
       value = <string>expression.value;
     } else {
@@ -775,10 +775,10 @@ export default class Program {
     // If in string state, process the string
     if (this.inString) {
       let startPos = this.pos;
-      while (hasKeyword && value !== '{' && value !== '}' && value !== '$' && value !== '\"') {
+      while (hasKeyword && value !== '{' && value !== '}' && value !== '\"') {
         if (value === '\\') {
           const nextStrValue = this.SOURCE.charAt(this.pos + 1);
-          if (this.pos + 1 < this.SOURCE_LENGTH && ['{', '}', '\"', '$', '\\'].includes(nextStrValue)) {
+          if (this.pos + 1 < this.SOURCE_LENGTH && ['{', '}', '\"', '\\'].includes(nextStrValue)) {
             this.pos++;
           } else {
             break;
@@ -801,7 +801,7 @@ export default class Program {
         .replace(/\\"/g, '"')
         .replace("\\\\", "\\"), sPos);
 
-      if (hasKeyword && (value === '$' || value === '\"')) {
+      if (hasKeyword && value === '\"') {
         this.pos++;
       }
       return t;
@@ -868,10 +868,10 @@ export default class Program {
         }
       }
 
-      // Handle identifier tokens
-      else if ((value >= 'a' && value <= 'z') || (value >= 'A' && value <= 'Z') || value === '_' || /[\u4e00-\u9fa5]/.test(value)) {
+      // Handle identifier tokens (including $ as in $runFrontLogic)
+      else if ((value >= 'a' && value <= 'z') || (value >= 'A' && value <= 'Z') || value === '_' || value === '$' || /[\u4e00-\u9fa5]/.test(value)) {
         const oldPos = this.pos;
-        while (hasKeyword && ((value >= 'a' && value <= 'z') || (value >= 'A' && value <= 'Z') || (value >= '0' && value <= '9') || value === '_' || /[\u4e00-\u9fa5]/.test(value))) {
+        while (hasKeyword && ((value >= 'a' && value <= 'z') || (value >= 'A' && value <= 'Z') || (value >= '0' && value <= '9') || value === '_' || value === '$' || /[\u4e00-\u9fa5]/.test(value))) {
           this.pos++;
           if (this.pos < this.SOURCE_LENGTH) {
             value = this.SOURCE.charAt(this.pos);
@@ -925,8 +925,8 @@ export default class Program {
       }
 
       // Single character operators like parentheses, commas, etc.
-      else if ('()[],;.:@{}"$'.includes(value)) {
-        if (value === '$' || value === '\"') {
+      else if ('()[],;.:@{}"'.includes(value)) {
+        if (value === '\"') {
           this.inStrings.push(false);
           this.inString = true;
         } else if ((value === '{' || value === '}') && this.inStrings.length) {

package/src/expression/ts/instances/LogicConsole.ts

@@ -1,4 +1,12 @@
-// 自定义 Console 类
+// 自定义 Console 类（与 Vue 实例 logger 对齐：支持按路径配置、前缀；业务逻辑中 log.xx 使用 Expression 序列化）
+export interface ILogicLogger {
+  log: (...args: any[]) => void
+  debug: (...args: any[]) => void
+  info: (...args: any[]) => void
+  warn: (...args: any[]) => void
+  error: (...args: any[]) => void
+}
+
 export default class LogicConsole {
 
   public debug(...args: any[]): void {
@@ -21,6 +29,15 @@ export default class LogicConsole {
     console.error(...newArgs);
   }
 
+  /**
+   * 创建带路径的 logger，与 Vue 实例的 logger 行为一致（配置开关、前缀）。
+   * 实际实现见 LogicConsole.js；此处仅为类型声明与兜底。
+   */
+  public static createLogger(logPath: string): ILogicLogger {
+    const noop = () => {}
+    return { log: noop, debug: noop, info: noop, warn: noop, error: noop }
+  }
+
   private convert(args: any[]): any[] {
     return args.map(arg => {
       if (typeof arg === 'object' && arg !== null && typeof arg.toString === 'function') {

package/src/logic/LogicRunner.js

@@ -34,11 +34,12 @@ export default class LogicRunner {
       throw new ServiceException('Logic资源' + logicName + '未找到', 400)
     }
     const paramStr = Expression.toJSONString(param)
-    LogicRunner.logicConsoleInstance.info(`执行Logic[${logicName}]，params: ${paramStr}`)
+    const logicLog = LogicConsole.createLogger('logic.' + logicName)
+    logicLog.info(`执行Logic[${logicName}]，params: ${paramStr}`)
     // 附加用户注册的对象到业务逻辑中
     const plugins = {}
     plugins.data = param
-    plugins.log = LogicRunner.logicConsoleInstance
+    plugins.log = logicLog
     plugins.ENV = result.$globalProp
     plugins.logic = this
     Object.assign(plugins, Plugins.default)

package/src/logic/plugins/common/HttpTools.js

@@ -0,0 +1,48 @@
+/**
+ * 前端 Logic 用 HTTP 请求插件。
+ * 提供 post、get 方法，均返回 Promise，供表达式执行器在调用处自动等待。
+ * 使用项目统一的 request/restTools，走 axios 拦截器与认证。
+ */
+import { post as postRequest, get as getRequest } from '@vue2-client/services/api/restTools'
+
+export default class HttpTools {
+  static instance
+
+  constructor () {
+    if (HttpTools.instance) {
+      return HttpTools.instance
+    }
+    HttpTools.instance = this
+  }
+
+  static getInstance () {
+    if (!HttpTools.instance) {
+      HttpTools.instance = new HttpTools()
+    }
+    return HttpTools.instance
+  }
+
+  /**
+   * POST 请求，返回 Promise<响应体>（即 response.data）
+   * @param {string} url 请求地址，如 '/hai-api/suggest-by-complaint' 或 '/api/af-his/logic/xxx'
+   * @param {Object} body 请求体（JSON），会作为 request body 发送
+   * @param {Object} [config] 可选，axios 配置，如 { dedupe: false }
+   * @returns {Promise<*>} 解析为响应体（通常为 JSON 对象）
+   */
+  post (url, body, config) {
+    return postRequest(url, body || {}, config)
+      .then(res => res && res.data !== undefined ? res.data : res)
+  }
+
+  /**
+   * GET 请求，返回 Promise<响应体>（即 response.data）
+   * @param {string} url 请求地址
+   * @param {Object} [params] 查询参数
+   * @param {Object} [config] 可选，axios 配置
+   * @returns {Promise<*>} 解析为响应体
+   */
+  get (url, params, config) {
+    return getRequest(url, params, config)
+      .then(res => res && res.data !== undefined ? res.data : res)
+  }
+}

package/src/logic/plugins/index.js

@@ -1,7 +1,9 @@
 import DateTools from '@vue2-client/logic/plugins/common/DateTools'
 import VueTools from '@vue2-client/logic/plugins/common/VueTools'
+import HttpTools from '@vue2-client/logic/plugins/common/HttpTools'
 
 export default {
   dateTools: DateTools.getInstance(),
-  vueTools: VueTools.getInstance()
+  vueTools: VueTools.getInstance(),
+  http: HttpTools.getInstance()
 }

package/src/logic/ts/LogicRunner.ts

@@ -35,11 +35,12 @@ export default class LogicRunner {
     if (source == null) {
       throw new ServiceException("Logic资源" + logicName + "未找到", 400)
     }
-    LogicRunner.logicConsoleInstance.info("执行Logic[{}]，params: {}", logicName, param)
+    const logicLog = LogicConsole.createLogger('logic.' + logicName)
+    logicLog.info("执行Logic[{}]，params: {}", logicName, param)
     // 附加用户注册的对象到业务逻辑中
     const plugins = new JSONObject();
     plugins.put("data", param);
-    plugins.put("log", LogicRunner.logicConsoleInstance);
+    plugins.put("log", logicLog);
     plugins.put("logic", LogicRunner.prototype);
     return LogicRunner.runExpression(source, plugins);
   }

package/src/router/async/router.map.js

@@ -95,7 +95,7 @@ routerResource.XReportView = () => import('@vue2-client/pages/XReportView')
 
 routerResource.XReportGrid = () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo')
 
-routerResource.XTab = () => import('@vue2-client/base-client/components/common/AfMap/demo.vue')
+routerResource.XTab = () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
 routerResource.addressManage = () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
 // 大屏界面, 放行登录
 routerResource.bigDashboard = () => import('@vue2-client/pages/dashboard/index.vue')

package/src/utils/logger.js

@@ -98,6 +98,8 @@ function isLogEnabled(logPath) {
         const prefix = pattern.slice(0, -2)
         return logPath.startsWith(prefix + '.') || logPath === prefix
       }
+      // 全局通配
+      if (pattern === '*') return true
       return false
     })
   }
@@ -152,3 +154,4 @@ function logger(logPath) {
 }
 
 export default logger
+export { isLogEnabled }

package/src/utils/map-utils.js

@@ -1,47 +1,47 @@
-import AMapLoader from '@amap/amap-jsapi-loader'
-let Amap
-async function GetGDMap (secretKey, key) {
-  if (!Amap) {
-    window._AMapSecurityConfig = {
-      securityJsCode: secretKey
-    }
-    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
-    AMapLoader.reset()
-    Amap = await AMapLoader.load({
-      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
-      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
-        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
-        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-      AMapUI: {
-        version: '1.1', // AMapUI 缺省 1.1
-        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
-      }
-    })
-  }
-  return Amap
-}
-
-async function getGDMap (address) {
-  new (await GetGDMap()).Geocoder({
-    radius: 500 // 范围，默认：500
-  }).getLocation(address, function (status, result) {
-    if (status === 'complete' && result.geocodes.length) {
-      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
-    } else {
-      // eslint-disable-next-line prefer-promise-reject-errors
-      throw new Error('根据经纬度查询地址失败')
-    }
-  })
-}
-
-async function GetLocation (address) {
-  return new Promise((resolve, reject) => {
-    try {
-      resolve(getGDMap(address))
-    } catch (e) {
-      reject(e)
-    }
-  })
-}
-export { GetGDMap, GetLocation }
+import AMapLoader from '@amap/amap-jsapi-loader'
+let Amap
+async function GetGDMap (secretKey, key) {
+  if (!Amap) {
+    window._AMapSecurityConfig = {
+      securityJsCode: secretKey
+    }
+    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
+    AMapLoader.reset()
+    Amap = await AMapLoader.load({
+      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
+      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
+        'AMap.ToolBar', 'AMap.Geolocation', 'AMap.MouseTool',
+        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+      AMapUI: {
+        version: '1.1', // AMapUI 缺省 1.1
+        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
+      }
+    })
+  }
+  return Amap
+}
+
+async function getGDMap (address) {
+  new (await GetGDMap()).Geocoder({
+    radius: 500 // 范围，默认：500
+  }).getLocation(address, function (status, result) {
+    if (status === 'complete' && result.geocodes.length) {
+      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
+    } else {
+      // eslint-disable-next-line prefer-promise-reject-errors
+      throw new Error('根据经纬度查询地址失败')
+    }
+  })
+}
+
+async function GetLocation (address) {
+  return new Promise((resolve, reject) => {
+    try {
+      resolve(getGDMap(address))
+    } catch (e) {
+      reject(e)
+    }
+  })
+}
+export { GetGDMap, GetLocation }