vue2-client 1.14.84 → 1.14.86

package/docs/Logic/345/207/275/346/225/260/344/275/277/347/224/250/347/233/270/345/205/263.md

@@ -11,7 +11,6 @@
 - ENV 对应 一个 org.json.JSONObject {tenantName:"租户名称",orgName:"分公司名称",applicationName:"应用名称",dbType:"数据库类型"}
 - logic 对应 LogicService 类，其中有方法
   * logic.run(logicName,param) 执行logic / logicName 执行的业务逻辑名称，param 参数 返回 org.json.JSONObject
-  * logic.remoteRun("服务名","logicName", "param")
 - sql 对应 [SqlService]() 类，其中有方法
   * sql.query(sql别名 string，sql参数 string) 执行已经注册的sql  返回 org.json.JSONArray
   * sql.query(sql别名 string，sql参数 string，页数 int，每页行数 int) 执行已经注册的sql 返回 org.json.JSONArray

package/docs//345/207/275/346/225/260/344/275/277/347/224/250/347/233/270/345/205/263.md

@@ -10,12 +10,11 @@
 - openDialog(configName, selectedId, mixinData, outEnv, attr)：打开一个对话框：
 - setColSpanByName(slotRef, colSpan)：设置栅格的宽度
 - openDrawer(configName, selectedId, mixinData)：打开一个对话框，例如：this.openDialog('xxx', 5, {})
-- openDrawer(configName, selectedId, mixinData, outEnv, attr, showButton)：打开一个对话框：
+- openDrawer(configName, selectedId, mixinData, outEnv, attr)：打开一个对话框：
   - selectId：id号，formtable选择时，用selectId过滤数据 可以传递 json {a_id: 1} 或者 传递 1  ，传递数值会默认拼接查询条件 {selected_id:1}
   - mixinData: form表单需要的数据
   - outEnv: 传递给打开的界面的数据，在打开界面的js中通过this.outEnv可以访问
   - attr: 用于传递参数绑定到 modal 弹框上
-  - showButton: true/false 是否显示提交按钮 默认：true
 - getOutEnv 获取获取 outEnv
 - this.getRealKeyData(obj) 获取真实的数据 传递 {a_a:"1"} 返回 {a:"1"}
 - this.currUser.operaInfo 获取当前用户信息
@@ -61,8 +60,7 @@ this.openDialog('xxx', 5, {}, {}, {})
     afterDelete( res (删除接口返回数据)) 删除后触发
     action(record (当前记录), id （当前记录主键）, actionType （操作类型）) 操作按钮触发
   - expandedGrid:"栅格名"
-- json配置相关
-  - "pageMaxSize": (int) num,
+
 # x-report 插槽 使用说明
 
 - init(configName,configData) 配置名称 / 报表数据

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.14.84",
+  "version": "1.14.86",
   "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

@@ -361,6 +361,13 @@ export default {
     extraHeight: {
       type: Number,
       default: 80
+    },
+    // 额外参数，用于控制组件行为
+    extraParams: {
+      type: Object,
+      default: () => {
+        return {}
+      }
     }
   },
   watch: {

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

@@ -1,7 +1,7 @@
 <template>
   <div class="list-container" style="display: flex;">
     <template v-for="(config, index) in configs">
-      <x-questionnaire-item :queryParamsName="config" :ref="el => setItemRef(el, index)" :key="`questionnaire-${index}`"></x-questionnaire-item>
+      <x-questionnaire-item :fixedQueryForm="conditions[index]" :queryParamsName="config" :ref="el => setItemRef(el, index)" :key="`questionnaire-${index}`"></x-questionnaire-item>
     </template>
   </div>
 </template>
@@ -26,24 +26,37 @@ export default {
   data () {
     return {
       configs: [],
-      questionnaireItemRefs: [] // 存储子组件实例
+      questionnaireItemRefs: [], // 存储子组件实例
+      conditions: []
     }
   },
-  created () {
-    this.getData(this.queryParamsName)
-  },
   methods: {
     // 获取配置
-    async getData (queryParamsName) {
+    async getData (queryParamsName, conditions) {
       const that = this
       getConfigByName(queryParamsName, 'af-his', res => {
-        that.configs = res.configs || []
+        if (res.configs) {
+          that.configs = []
+        }
+        for (let i = 0; i < res.configs.length; i++) {
+          const condition = i < conditions.length ? conditions[i] : {}
+          that.configs.push(res.configs[i])
+          that.conditions.push(condition)
+        }
       })
     },
     setItemRef (el, index) {
       if (el) {
         this.questionnaireItemRefs[index] = el // 保存实例
       }
+    },
+    init (conditions) {
+      this.getData(this.queryParamsName, conditions)
+    },
+    refreshList (index, condition) {
+      if (index < this.conditions.length) {
+        this.conditions[index] = condition
+      }
     }
   },
 }

package/src/base-client/components/his/XQuestionnaire/XQuestionnaireDemo.vue

@@ -9,14 +9,23 @@ export default {
     return {
       queryParamsName: 'surgeryRiskAssessConfig'
     }
+  },
+  methods: {
+    init () {
+      console.log(this)
+      this.$refs.questionnaireRef.init([{ id: 10 }, { id: 20 }, { id: 10 }])
+    }
   }
 }
 </script>
 
 <template>
   <div style="display: flex">
-    <x-questionnaire :queryParamsName="queryParamsName">
+    <x-questionnaire ref="questionnaireRef" :queryParamsName="queryParamsName">
     </x-questionnaire>
+    <a-button type="primary" @click="init">
+      初始化
+    </a-button>
   </div>
 </template>
 

package/src/base-client/components/his/XQuestionnaire/XQuestionnaireItem.vue

@@ -195,9 +195,6 @@ export default {
         this.refreshList(val)
       }
     }
-  },
-  beforeDestroy () {
-    this.clearAllTimers()
   }
 }
 </script>

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

@@ -1,207 +1,207 @@
-<template>
-  <div>
-    <div class="text-card">
-      <div
-        v-for="(item, index) in displayItems"
-        :key="index"
-        class="text-item"
-        @click="handleItemClick(index, item.id)"
-        @contextmenu.prevent="handleContextMenu(index, item.id)">
-        <div class="text-content" :class="{ 'is-empty': !item.content }">
-          {{ item.content || '+' }}
-        </div>
-      </div>
-      <!-- 编辑弹出框 -->
-      <div
-        v-if="showEdit"
-        class="edit-overlay"
-        @click.self="handleOverlayClick">
-        <div class="edit-card">
-          <a-textarea
-            v-model="editingContent"
-            :autoSize="{ minRows: 3 }"
-            @keyup.enter="handleSave"
-            ref="textarea"/>
-        </div>
-      </div>
-      <!-- 删除确认弹框 -->
-      <a-modal
-        v-model="showDeleteModal"
-        title="确认删除"
-        okText="确认"
-        cancelText="取消"
-        @ok="handleDeleteConfirm">
-        <p>确定要删除这条内容吗？</p>
-      </a-modal>
-    </div>
-  </div>
-</template>
-
-<script>
-import { runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XTextCard',
-  props: {
-    // logic配置名,要求返回一个数组[{ id: , content: }]
-    queryParamsName: {
-      type: String,
-      default: 'memorandumLOGIC'
-    },
-    queryParams: {
-      type: Object,
-      default: () => { return {} }
-    },
-    // 请求参数
-    parameter: {
-      type: Object,
-      default: () => { return {} }
-    }
-  },
-  data () {
-    return {
-      localItems: [], // 本地数据
-      showEdit: false, // 是否显示编辑框
-      editingIndex: -1, // 当前编辑的索引
-      editingContent: '', // 编辑框的内容
-      showDeleteModal: false, // 是否显示删除确认框
-      deleteIndex: -1, // 要删除的项目索引
-      ID: 0
-    }
-  },
-  computed: {
-    // 显示的列表，始终保持一个空行
-    displayItems () {
-      const items = [...this.localItems]
-      // 如果最后一项不是空的，添加一个空项
-      if (!items.length || items[items.length - 1].content) {
-        items.push({ content: '' })
-      }
-      return items
-    }
-  },
-  methods: {
-    // 点击项目
-    handleItemClick (index, id) {
-      this.ID = id
-      this.editingIndex = index
-      this.editingContent = this.displayItems[index].content
-      this.showEdit = true
-      this.$nextTick(() => {
-        this.$refs.textarea?.focus()
-      })
-    },
-    // 点击遮罩层保存
-    handleOverlayClick () {
-      this.handleSave()
-    },
-    // 保存内容
-    handleSave () {
-      if (this.editingContent.trim()) {
-        if (this.editingIndex === this.localItems.length) {
-          // 如果是在最后一个空行添加，push新内容
-          this.localItems.push({ content: this.editingContent.trim() })
-        } else {
-          // 否则更新现有内容
-          this.localItems[this.editingIndex].content = this.editingContent.trim()
-        }
-        const addData = { data: this.editingContent.trim(), ID: this.ID }
-        // 触发更新事件
-        this.$emit('add', addData)
-      }
-      this.showEdit = false
-      this.editingIndex = -1
-      this.editingContent = ''
-    },
-    // 初始化数据
-    async initData (data, parameter) {
-      // 从配置中获取数据
-      const resData = await runLogic(data, parameter, 'af-his')
-      this.localItems = resData
-      return resData
-    },
-    // 处理右键菜单
-    handleContextMenu (index, id) {
-      // 如果是最后一个空行，不显示删除框
-      if (index === this.localItems.length) {
-        return
-      }
-      this.ID = id
-      this.deleteIndex = index
-      this.showDeleteModal = true
-    },
-    // 确认删除
-    handleDeleteConfirm () {
-      if (this.deleteIndex > -1) {
-        this.localItems.splice(this.deleteIndex, 1)
-        const deleteData = { data: [...this.localItems][this.deleteIndex], ID: this.ID }
-        this.$emit('deleteData', deleteData)
-        this.deleteIndex = -1
-      }
-      this.showDeleteModal = false
-    }
-  },
-  watch: {
-    queryParamsName: {
-      immediate: true,
-      handler (newVal) {
-        this.initData(newVal, this.parameter)
-      },
-      deep: true
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-.text-card {
-  position: relative;
-  width: 100%;
-  .text-item {
-    padding: 8px 12px;
-    border-bottom: 1px solid #f0f0f0;
-    cursor: pointer;
-    transition: all 0.3s;
-    user-select: none;
-
-    &:hover {
-      background-color: #f5f5f5;
-    }
-
-    .text-content {
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      line-height: 1.5;
-
-      &.is-empty {
-        color: #5D5C5C;
-        font-weight: 400;
-      }
-    }
-  }
-  .edit-overlay {
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-color: rgba(0, 0, 0, 0.45);
-    z-index: 1000;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    .edit-card {
-      background: white;
-      padding: 16px;
-      border-radius: 8px;
-      width: 90%;
-      max-width: 500px;
-      box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12);
-      .ant-input {
-        width: 100%;
-      }
-    }
-  }
-}
-</style>
+<template>
+  <div>
+    <div class="text-card">
+      <div
+        v-for="(item, index) in displayItems"
+        :key="index"
+        class="text-item"
+        @click="handleItemClick(index, item.id)"
+        @contextmenu.prevent="handleContextMenu(index, item.id)">
+        <div class="text-content" :class="{ 'is-empty': !item.content }">
+          {{ item.content || '+' }}
+        </div>
+      </div>
+      <!-- 编辑弹出框 -->
+      <div
+        v-if="showEdit"
+        class="edit-overlay"
+        @click.self="handleOverlayClick">
+        <div class="edit-card">
+          <a-textarea
+            v-model="editingContent"
+            :autoSize="{ minRows: 3 }"
+            @keyup.enter="handleSave"
+            ref="textarea"/>
+        </div>
+      </div>
+      <!-- 删除确认弹框 -->
+      <a-modal
+        v-model="showDeleteModal"
+        title="确认删除"
+        okText="确认"
+        cancelText="取消"
+        @ok="handleDeleteConfirm">
+        <p>确定要删除这条内容吗？</p>
+      </a-modal>
+    </div>
+  </div>
+</template>
+
+<script>
+import { runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XTextCard',
+  props: {
+    // logic配置名,要求返回一个数组[{ id: , content: }]
+    queryParamsName: {
+      type: String,
+      default: 'memorandumLOGIC'
+    },
+    queryParams: {
+      type: Object,
+      default: () => { return {} }
+    },
+    // 请求参数
+    parameter: {
+      type: Object,
+      default: () => { return {} }
+    }
+  },
+  data () {
+    return {
+      localItems: [], // 本地数据
+      showEdit: false, // 是否显示编辑框
+      editingIndex: -1, // 当前编辑的索引
+      editingContent: '', // 编辑框的内容
+      showDeleteModal: false, // 是否显示删除确认框
+      deleteIndex: -1, // 要删除的项目索引
+      ID: 0
+    }
+  },
+  computed: {
+    // 显示的列表，始终保持一个空行
+    displayItems () {
+      const items = [...this.localItems]
+      // 如果最后一项不是空的，添加一个空项
+      if (!items.length || items[items.length - 1].content) {
+        items.push({ content: '' })
+      }
+      return items
+    }
+  },
+  methods: {
+    // 点击项目
+    handleItemClick (index, id) {
+      this.ID = id
+      this.editingIndex = index
+      this.editingContent = this.displayItems[index].content
+      this.showEdit = true
+      this.$nextTick(() => {
+        this.$refs.textarea?.focus()
+      })
+    },
+    // 点击遮罩层保存
+    handleOverlayClick () {
+      this.handleSave()
+    },
+    // 保存内容
+    handleSave () {
+      if (this.editingContent.trim()) {
+        if (this.editingIndex === this.localItems.length) {
+          // 如果是在最后一个空行添加，push新内容
+          this.localItems.push({ content: this.editingContent.trim() })
+        } else {
+          // 否则更新现有内容
+          this.localItems[this.editingIndex].content = this.editingContent.trim()
+        }
+        const addData = { data: this.editingContent.trim(), ID: this.ID }
+        // 触发更新事件
+        this.$emit('add', addData)
+      }
+      this.showEdit = false
+      this.editingIndex = -1
+      this.editingContent = ''
+    },
+    // 初始化数据
+    async initData (data, parameter) {
+      // 从配置中获取数据
+      const resData = await runLogic(data, parameter, 'af-his')
+      this.localItems = resData
+      return resData
+    },
+    // 处理右键菜单
+    handleContextMenu (index, id) {
+      // 如果是最后一个空行，不显示删除框
+      if (index === this.localItems.length) {
+        return
+      }
+      this.ID = id
+      this.deleteIndex = index
+      this.showDeleteModal = true
+    },
+    // 确认删除
+    handleDeleteConfirm () {
+      if (this.deleteIndex > -1) {
+        this.localItems.splice(this.deleteIndex, 1)
+        const deleteData = { data: [...this.localItems][this.deleteIndex], ID: this.ID }
+        this.$emit('deleteData', deleteData)
+        this.deleteIndex = -1
+      }
+      this.showDeleteModal = false
+    }
+  },
+  watch: {
+    queryParamsName: {
+      immediate: true,
+      handler (newVal) {
+        this.initData(newVal, this.parameter)
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.text-card {
+  position: relative;
+  width: 100%;
+  .text-item {
+    padding: 8px 12px;
+    border-bottom: 1px solid #f0f0f0;
+    cursor: pointer;
+    transition: all 0.3s;
+    user-select: none;
+
+    &:hover {
+      background-color: #f5f5f5;
+    }
+
+    .text-content {
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      line-height: 1.5;
+
+      &.is-empty {
+        color: #5D5C5C;
+        font-weight: 400;
+      }
+    }
+  }
+  .edit-overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.45);
+    z-index: 1000;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .edit-card {
+      background: white;
+      padding: 16px;
+      border-radius: 8px;
+      width: 90%;
+      max-width: 500px;
+      box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12);
+      .ant-input {
+        width: 100%;
+      }
+    }
+  }
+}
+</style>