vue2-client 1.14.94 → 1.14.95

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.94",
+  "version": "1.14.95",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

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

@@ -1,6 +1,12 @@
 <template>
   <a-card :bordered="false" :body-style="bodyStyle">
-    <a-tabs :tabBarGutter="tabBarGutter" :activeKey="activeKey" @change="tabPaneChange" :hideAdd="true" :tabBarStyle="{ display: showTabBar ? 'block' : 'none' }">
+    <a-tabs
+      :tabBarGutter="tabBarGutter"
+      :activeKey="activeKey"
+      @change="tabPaneChange"
+      :hideAdd="true"
+      :tabBarStyle="{ display: showTabBar ? 'block' : 'none' }"
+    >
       <slot name="extraBeforeTabs"></slot>
       <a-tab-pane
         :forceRender="true"
@@ -79,21 +85,40 @@ export default {
       }
       const oldKey = this.activeKey
       if (this.config.changeFunc) {
+        let oldRef
+        let oldTabName
+        let newRef
+        let newTabName
+        if (!this.config.data[oldKey]) {
+          oldTabName = `tab_com_${oldKey}`
+          oldRef = this.$refs[oldTabName]
+        } else {
+          const oldTabSlotType = this.config.data[oldKey].slotType
+          oldTabName = `tab_com_${oldTabSlotType}_${oldKey}`
+          oldRef = this.$refs[oldTabName]
+        }
+        if (!this.config.data[newKey]) {
+          newTabName = `tab_com_${newKey}`
+          newRef = this.$refs[newTabName]
+        } else {
+          const newTabSlotType = this.config.data[newKey].slotType
+          newTabName = `tab_com_${newTabSlotType}_${newKey}`
+          newRef = this.$refs[newTabName]
+        }
         const args = [
           oldKey,
           newKey,
           this.config.data[oldKey],
           this.config.data[newKey],
-          `tab_com_${this.config.data[oldKey].slotType}_${oldKey}`,
-          `tab_com_${this.config.data[newKey].slotType}_${newKey}`,
-          this.$refs[`tab_com_${this.config.data[oldKey].slotType}_${oldKey}`][0]
+          oldRef ? oldRef[0] : undefined,
         ]
-        if (!this.$refs[`tab_com_${this.config.data[newKey].slotType}_${newKey}`]) {
+        if (!newRef) {
           args.push(null)
           console.warn('新页签示例切换页签时暂未初始化，仅调用该页签初始化方法不调用切换函数')
         } else {
-          args.push(this.$refs[`tab_com_${this.config.data[newKey].slotType}_${newKey}`][0])
+          args.push(newRef[0])
         }
+        args.push(this.extraData)
         result = executeStrFunctionByContext(this, this.config.changeFunc, args)
         if (result && result.noChange) {
           console.info('不切换页签作为按钮使用')
@@ -102,12 +127,12 @@ export default {
           if (result && result.callback && typeof result.callback === 'function') {
             // 使用 $nextTick 等待 DOM 更新完成后再获取组件实例
             this.$nextTick(() => {
-              const newComponent = this.$refs[`tab_com_${this.config.data[newKey].slotType}_${newKey}`]
+              const newComponent = newRef
               if (!newComponent || !newComponent[0]) {
                 console.warn('组件实例尚未创建，等待组件mounted事件')
                 // 使用 MutationObserver 监听DOM变化
                 const observer = new MutationObserver((mutations, obs) => {
-                  const newComp = this.$refs[`tab_com_${this.config.data[newKey].slotType}_${newKey}`]
+                  const newComp = newRef
                   if (newComp && newComp[0]) {
                     obs.disconnect()
                     console.log('组件已创建，执行回调')
@@ -236,6 +261,13 @@ export default {
       default: () => {
         return {}
       }
+    },
+    // 额外数据
+    extraData: {
+      type: Object,
+      default: () => {
+        return {}
+      }
     }
   },
   watch: {

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

@@ -930,29 +930,31 @@ export default {
               this.innerSelectedRowKeys = currentPageSelectedRows.map(row => row[primaryKeyName])
               this.innerSelectedRows = currentPageSelectedRows
               // 更新表格显示
-              this.$refs.table.updateSelect(this.innerSelectedRowKeys, this.innerSelectedRows)
-              // 更新总选中状态
-              if (currentPageSelectedRows.length > 0) {
-                // 保留不在当前页面的已选中行
-                const otherPageSelectedRows = this.selectedRows.filter(row =>
-                  !currentPageSelectedRows.some(currentRow =>
-                    currentRow[primaryKeyName] === row[primaryKeyName]
+              if (this.$refs.table) {
+                this.$refs.table.updateSelect(this.innerSelectedRowKeys, this.innerSelectedRows)
+                // 更新总选中状态
+                if (currentPageSelectedRows.length > 0) {
+                  // 保留不在当前页面的已选中行
+                  const otherPageSelectedRows = this.selectedRows.filter(row =>
+                    !currentPageSelectedRows.some(currentRow =>
+                      currentRow[primaryKeyName] === row[primaryKeyName]
+                    )
                   )
-                )
-                // 合并当前页面和其他页面的选中行
-                const rowsMap = new Map()
-                // 先添加其他页面的行
-                otherPageSelectedRows.forEach(row => {
-                  rowsMap.set(row[primaryKeyName], row)
-                })
-                // 再添加当前页面的行（会覆盖重复的）
-                currentPageSelectedRows.forEach(row => {
-                  rowsMap.set(row[primaryKeyName], row)
-                })
-                this.selectedRows = Array.from(rowsMap.values())
+                  // 合并当前页面和其他页面的选中行
+                  const rowsMap = new Map()
+                  // 先添加其他页面的行
+                  otherPageSelectedRows.forEach(row => {
+                    rowsMap.set(row[primaryKeyName], row)
+                  })
+                  // 再添加当前页面的行（会覆盖重复的）
+                  currentPageSelectedRows.forEach(row => {
+                    rowsMap.set(row[primaryKeyName], row)
+                  })
+                  this.selectedRows = Array.from(rowsMap.values())
+                }
+                // 触发选择事件
+                this.$emit('selectRow', this.selectedRowKeys, this.selectedRows)
               }
-              // 触发选择事件
-              this.$emit('selectRow', this.selectedRowKeys, this.selectedRows)
             })
           }
         })

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

@@ -10,46 +10,46 @@
         @mouseleave="handleMouseLeave"
         :class="{ 'hover-active': enableHoverOptions && hoveredIndex === index }"
       >
-          <i
-            v-if="icon"
-            class="icon-menu"
-            :style="getIconStyle(item)"
-          ></i>
-          <span
-            class="item-text">
-            {{ item.number }} {{ item.name }}
-          </span>
+        <i
+          v-if="icon"
+          class="icon-menu"
+          :style="getIconStyle(item)"
+        ></i>
+        <span
+          class="item-text">
+          {{ item.number }} {{ item.name }}
+        </span>
 
-          <div v-if="button" class="button-group">
-            <a-button
-              v-for="(name, idx) in buttonNames"
+        <div v-if="button" class="button-group">
+          <a-button
+            v-for="(name, idx) in buttonNames"
+            :key="idx"
+            type="link"
+            :class="['confirm-btn', buttonMode ? 'hover-btn' : '']"
+            @click.stop="click(index, idx)"
+          >
+            <span :class="{ 'hover-active': enableHoverOptions && hoveredIndex === index }">{{ name }}</span>
+          </a-button>
+        </div>
+
+        <!-- 悬浮选项框 -->
+        <div
+          v-show="enableHoverOptions && hoveredIndex === index"
+          class="hover-options"
+          @mouseenter="handleOptionsEnter"
+          @mouseleave="handleOptionsLeave"
+        >
+          <div class="hover-options-content">
+            <div
+              v-for="(item, idx) in select_options"
               :key="idx"
-              type="link"
-              :class="['confirm-btn', buttonMode ? 'hover-btn' : '']"
-              @click.stop="click(index, idx)"
+              class="option-item"
+              @click="handleOptionClick(index, item)"
             >
-              <span :class="{ 'hover-active': enableHoverOptions && hoveredIndex === index }">{{ name }}</span>
-            </a-button>
-          </div>
-
-          <!-- 悬浮选项框 -->
-          <div
-            v-show="enableHoverOptions && hoveredIndex === index"
-            class="hover-options"
-            @mouseenter="handleOptionsEnter"
-            @mouseleave="handleOptionsLeave"
-          >
-            <div class="hover-options-content">
-              <div
-                v-for="(item, idx) in select_options"
-                :key="idx"
-                class="option-item"
-                @click="handleOptionClick(index, item)"
-              >
-                {{ item }}
-              </div>
+              {{ item }}
             </div>
           </div>
+        </div>
       </a-list-item>
     </a-list>
   </div>

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

@@ -1,11 +1,12 @@
 <template>
   <div class="list-wrapper">
-    <a-list size="large"
-            :data-source="data"
-            itemLayout="horizontal"
-            class="list-container"
-            ref="listRef"
-            split="config.split"
+    <a-list
+      size="large"
+      :data-source="data"
+      itemLayout="horizontal"
+      class="list-container"
+      ref="listRef"
+      split="config.split"
     >
       <template v-if="config.header" #header>
         <div >{{ config.header }}</div>

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

@@ -10,7 +10,7 @@
     <div v-for="(item, index) in weekDays" :key="index" :slot="item.key" class="week_last_next_btn">
       <a-button slot="lastWeek" icon="left" size="large" @click="handleLastWeek" v-if="item.title == '周一'" />
       <div class="time-title">
-        <span>{{item.title}}</span>
+        <span>{{ item.title }}</span>
         <span>{{ currentWeekDates[index].toLocaleDateString() }}</span>
       </div>
       <a-button slot="nextWeek" icon="right" size="large" @click="handleNextWeek" v-if="item.title == '周日'"/>