vue2-client 1.9.112 → 1.9.113

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

@@ -34,6 +34,7 @@ this.openDialog('xxx', 5, {}, {}, {})
 - getTableData() 获取全部数据
 - setTableData(data) 设置表格内数据
 - Object.assign(this.fixedQueryForm, data) 给查询条件传值
+- Object.assign(this.fixedAddForm, data) 给新增时赋固定内容
 - getPrimaryData (rows) 返回主表不带别名的数据
 - pushPrimaryData (rows) 把不带主表别名的数据放到数据区
 - setFixedQueryForm (data) 设置固定条件，主表别名不用加

package/package.json

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

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

@@ -0,0 +1,106 @@
+<template>
+  <div>
+    <a-row :gutter="[16, 16]">
+      <a-col
+        v-for="(item, index) in items"
+        :key="index"
+        :span="8"
+        style="display: flex; align-items: center;"
+      >
+        <a-checkbox
+          v-model="item.checked"
+          @change="updateSelection(item)"
+        >
+          {{ item.label }}  <!-- 显示 label -->
+        </a-checkbox>
+      </a-col>
+    </a-row>
+    <div style="margin-top: 20px;">
+      <a-button type="primary" @click="logSelection">打印选中结果</a-button>
+    </div>
+    <div v-if="selectedItems.length">
+      <h3>选中的项目：</h3>
+      <ul>
+        <li v-for="(item, index) in selectedItems" :key="index">
+          {{ item.label }} <!-- 显示选中的 label -->
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'CheckboxGrid',
+  data () {
+    return {
+      serviceName: undefined,
+      // 每个选项包含 label 和 value
+      items: [
+        { label: '选项 1', value: 'Value 1', checked: false },
+        { label: '选项 2', value: 'Value 2', checked: false },
+        { label: '选项 3', value: 'Value 3', checked: false },
+        { label: '选项 4', value: 'Value 4', checked: false },
+        { label: '选项 5', value: 'Value 5', checked: false },
+        { label: '选项 6', value: 'Value 6', checked: false },
+        { label: '选项 7', value: 'Value 7', checked: false },
+        { label: '选项 8', value: 'Value 8', checked: false },
+        { label: '选项 9', value: 'Value 9', checked: false },
+      ],
+      // 存储选中的项的 value
+      selectedItems: [],
+    }
+  },
+  methods: {
+    init (params) {
+      const {
+        serviceName,
+        // 可选内容
+        options
+      } = params
+      this.serviceName = serviceName
+      // 给options的每一项添加checked：false
+      this.items = options.map(option => ({
+        ...option,
+        checked: false
+      }))
+    },
+    // 更新选中的项
+    updateSelection (item) {
+      if (item.checked) {
+        // 如果勾选，存储 item (包括 label 和 value)
+        this.selectedItems.push(item)
+      } else {
+        // 如果取消勾选，移除 item
+        const index = this.selectedItems.findIndex(i => i.value === item.value)
+        if (index > -1) {
+          this.selectedItems.splice(index, 1)
+        }
+      }
+    },
+    // 打印选中项的 label
+    logSelection () {
+      // 打印选中项的 label
+      console.log(this.selectedItems.map(item => item.value))
+    },
+  },
+}
+</script>
+
+<style scoped>
+.two-column-checklist {
+  display: flex;
+  justify-content: space-between; /* 自动调整两列间距 */
+}
+
+.column {
+  display: flex;
+  flex-direction: column;
+  gap: 5px; /* 控制每一项的间距 */
+  width: 48%; /* 使两列宽度适中，留出间距 */
+}
+
+.item {
+  margin-bottom: 0; /* 避免额外的间距 */
+}
+</style>

package/src/base-client/components/common/XCheckList/XCheckListDemo.vue

@@ -0,0 +1,41 @@
+<template>
+  <div>
+    <x-check-list ref="xCheckList"></x-check-list>
+  </div>
+</template>
+
+<script>
+  import XCheckList from './XCheckList.vue'
+
+  export default {
+    name: 'XCheckListDemo',
+    components: {
+        XCheckList
+    },
+    data () {
+      return {}
+    },
+    mounted () {
+        // 模拟接口返回的配置数据
+        const mockResponse = {
+            leftItems: [
+            { value: 'left1', label: '左项1' },
+            { value: 'left2', label: '左项2' },
+            { value: 'left3', label: '左项3' }
+            ],
+            rightItems: [
+            { value: 'right1', label: '右项1' },
+            { value: 'right2', label: '右项2' },
+            { value: 'right3', label: '右项3' }
+            ]
+        }
+
+        // 模拟接口回调
+        this.$refs.xCheckList.init({
+            leftItems: mockResponse.leftItems,
+            rightItems: mockResponse.rightItems
+        })
+    },
+    methods: {}
+  }
+</script>

package/src/base-client/components/common/XReportGrid/XReportDemo.vue

@@ -37,7 +37,8 @@ export default {
   data () {
     return {
       // configName: 'medicalRecordCover'
-      configName: 'medOrderManaActCover'
+      configName: 'physicianOrderEntryCover'
+      // configName: 'medOrderManaActCover'
     }
   },
   methods: {

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -33,7 +33,7 @@
             </template>
             <template v-else-if="cell.type === 'slot'">
               <template
-                v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation'].includes(cell.slotType)">
+                v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list'].includes(cell.slotType)">
                 <component
                   :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                   :key="cellIndex"
@@ -73,7 +73,7 @@
             </template>
             <template v-else-if="cell.type === 'slot'">
               <template
-                v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation'].includes(cell.slotType)">
+                v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons', 'x-label-select', 'x-conversation', 'x-check-list'].includes(cell.slotType)">
                 <component
                   :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                   :key="cellIndex"
@@ -477,6 +477,7 @@ export default {
     XButtons: () => import('@vue2-client/base-client/components/common/XButtons/XButtons.vue'),
     XLabelSelect: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelect.vue'),
     XConversation: () => import('@vue2-client/base-client/components/common/XConversation/XConversation.vue'),
+    XCheckList: () => import('@vue2-client/base-client/components/common/XCheckList/XCheckList.vue'),
   },
   props: {
     // 每一行的配置
@@ -661,6 +662,14 @@ export default {
           })
         }, this.env === 'dev')
       }
+      if (cell.slotType === 'x-check-list') {
+        getConfigByName(cell.slotConfig, cell.serviceName, (res) => {
+          this.$refs[`dynamicComponent_${cell.slotRef || cellIndex}`][0].init({
+            serviceName: cell.serviceName,
+            ...res,
+          })
+        }, this.env === 'dev')
+      }
     },
 
     // 对于嵌套情况，对colSpan重新分配

package/src/components/STable/index.js

@@ -335,7 +335,7 @@ export default {
     props.pagination = false
     // 自定义底部汇总插槽组件
     const pagination = (
-      <a-row type={'flex'} justify={'start'} style={{ marginTop: '8px', overflowX: 'auto', overflowY: 'hidden' }}>
+      <a-row type={'flex'} justify={'start'} style={{ marginTop: '8px' }}>
         <a-col flex="1" style={{
           alignItems: 'center',
           display: 'flex',

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

@@ -94,6 +94,7 @@ routerResource.example = {
           // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelectDemo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XCheckList/XCheckList.vue'),
           meta: {
               // 菜单中不显示
               invisible: true,