vue2-client 1.16.59 → 1.16.61

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

@@ -18,7 +18,8 @@
           <div class="group-item" :ref="`group-${index}`" :key="index" v-for="(item, index) in groups">
             <a-row :style="{ marginTop: index === 0 ? '' : '8px' }" v-if="formShow[`show${item.groupName}`] || formShow[`show${item.slotName}`]">
               <a-col :span="5">
-                <span class="xFormGroupTitle">{{ item.describe }}</span>
+                <x-title v-if="showDot === true || showDot === 'true'" :title="item.describe" :dot="true" />
+                <span v-else class="xFormGroupTitle">{{ item.describe }}</span>
               </a-col>
             </a-row>
             <div v-show="formShow[`show${item.slotName}`]">
@@ -41,11 +42,19 @@
 
 <script>
 import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import XTitle from '@vue2-client/base-client/components/his/XTitle/XTitle.vue'
 
 export default {
   name: 'XFormGroup',
   components: {
-    XAddNativeForm
+    XAddNativeForm,
+    XTitle
+  },
+  props: {
+    showDot: {
+      type: Boolean,
+      default: false
+    }
   },
   data () {
     return {

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

@@ -2,8 +2,14 @@
   <a-card :bordered="false">
     <x-form-table
       title="示例表单"
-      queryParamsName="ceshiCRUD"
-      serviceName="af-linepatrol"
+      :queryParamsName="queryParamsName"
+      :fixedAddForm="fixedAddForm"
+      :x-tree-config-name="xTreeConfigName"
+      :externalSelectedRowKeys="selectedKeys"
+      @action="action"
+      @selectRow="selectRow"
+      @columnClick="columnClick"
+      serviceName="af-revenue"
       ref="xFormTable">
     </x-form-table>
   </a-card>
@@ -11,6 +17,7 @@
 
 <script>
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
+import { microDispatch } from '@vue2-client/utils/microAppUtils'
 
 export default {
   name: 'Demo',
@@ -20,9 +27,9 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'ceshiCRUD',
+      queryParamsName: 'address_management',
       // 查询配置左侧tree
-      xTreeConfigName: '',
+      xTreeConfigName: 'addressType',
       // 新增表单固定值
       fixedAddForm: {},
       // 是否显示详情抽屉
@@ -38,6 +45,41 @@ export default {
     }
   },
   methods: {
+    test () {
+      this.$refs.xFormTable.setTableData([])
+    },
+    defaultF () {
+      this.$refs.xFormTable.setTableSize('default')
+    },
+    middleF () {
+      this.$refs.xFormTable.setTableSize('middle')
+    },
+    smallF () {
+      this.$refs.xFormTable.setTableSize('small')
+    },
+    columnClick (key, value, record) {
+      microDispatch({
+        type: 'v3route',
+        path: '/bingliguanli/dianzibingliluru',
+        props: { selected: arguments[0].his_f_admission_id }
+      })
+    },
+    action (record, id, actionType) {
+      this.detailVisible = true
+      console.log('触发了详情操作', record, id, actionType)
+    },
+    onClose () {
+      this.detailVisible = false
+      // 关闭详情之后重新查询表单
+      this.$refs.xFormTable.refreshTable(true)
+    },
+    selectRow (selectedRowKeys, selectedRows) {
+      this.selected = {
+        keys: selectedRowKeys,
+        rows: selectedRows
+      }
+      console.log('selectedDemo', this.selected)
+    },
   },
   computed: {},
 }

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

@@ -1,147 +1,147 @@
-<template>
-  <div class="x-input-wrapper" :class="wrapperClassObject">
-    <div class="input-container">
-      <span v-if="config?.label" class="input-label">{{ config.label }}</span>
-      <div class="input-wrapper">
-        <a-input
-          v-model="innerValue"
-          v-bind="$attrs"
-          :placeholder="config?.placeholder"
-          :size="config?.size"
-          :maxLength="config?.maxLength"
-          :disabled="config?.disabled"
-          :allowClear="config?.allowClear"
-          @change="handleInput"
-          @pressEnter="handleSearch"
-        >
-          <template v-if="config?.prefix" #prefix>
-            <a-icon :type="config.prefix" @click="handleSearch" class="clickable-icon" />
-          </template>
-          <template v-if="config?.suffix" #suffix>
-            <a-icon :type="config.suffix" @click="handleSearch" class="clickable-icon" />
-          </template>
-        </a-input>
-      </div>
-      <span v-if="config?.tail" class="input-tail">{{ config.tail }}</span>
-    </div>
-  </div>
-</template>
-
-<script>
-import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XInput',
-  inheritAttrs: false,
-  props: {
-    value: {
-      type: [String, Number],
-      default: ''
-    },
-    queryParamsName: {
-      type: String,
-      default: ''
-    }
-  },
-  data () {
-    return {
-      innerValue: this.value || '',
-      config: null
-    }
-  },
-  computed: {
-    // 动态样式开关：布尔开关 + size 派生类
-    wrapperClassObject () {
-      const attrs = this.$attrs || {}
-      const classes = {}
-      const booleanStyleKeys = [
-
-      ]
-      booleanStyleKeys.forEach(key => {
-        const val = attrs[key]
-        const truthy = val === true || val === '' || val === 'true'
-        if (truthy) classes[`xinput-${key}`] = true
-      })
-      const size = attrs.size
-      if (size && typeof size === 'string') classes[`xinput-size-${size}`] = true
-      return classes
-    }
-  },
-  created () {
-    this.getData(this.queryParamsName)
-  },
-  emits: ['search'],
-  methods: {
-    runLogic,
-    async getData (data) {
-      getConfigByName(data, 'af-his', res => {
-        this.config = res
-        if (res.defaultValue !== undefined) {
-          this.innerValue = res.defaultValue
-        }
-      })
-    },
-    handleInput (e) {
-      const value = e.target.value
-      this.innerValue = value
-      this.$emit('search', value)
-    },
-    handleSearch () {
-      // 统一的搜索事件：将当前输入值发送给父组件
-      this.$emit('search', this.innerValue)
-    }
-  },
-  watch: {
-    value: {
-      handler (newValue) {
-        this.innerValue = newValue
-      },
-      immediate: true
-    },
-    queryParamsName: {
-      handler (newValue) {
-        this.getData(newValue)
-      },
-      deep: true
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-.x-input-wrapper {
-  position: relative;
-  display: inline-block;
-  width: 100%;
-}
-
-.input-container {
-  display: flex;
-  align-items: center;
-}
-
-.input-label {
-  white-space: nowrap;
-  color: rgba(0, 0, 0, 0.85);
-  padding-right: 8px; /* 标签右侧固定间距 */
-}
-
-.input-label {
-  white-space: nowrap;
-  color: rgba(0, 0, 0, 0.85);
-  padding-left: 4px; /* 标签左侧固定间距 */
-}
-
-.input-wrapper {
-  flex: 1; /* 输入框占据剩余空间 */
-}
-
-:deep(.clickable-icon) {
-  cursor: pointer;
-}
-
-:deep(.clickable-icon:hover) {
-  color: #1890ff;
-}
-
-</style>
+<template>
+  <div class="x-input-wrapper" :class="wrapperClassObject">
+    <div class="input-container">
+      <span v-if="config?.label" class="input-label">{{ config.label }}</span>
+      <div class="input-wrapper">
+        <a-input
+          v-model="innerValue"
+          v-bind="$attrs"
+          :placeholder="config?.placeholder"
+          :size="config?.size"
+          :maxLength="config?.maxLength"
+          :disabled="config?.disabled"
+          :allowClear="config?.allowClear"
+          @change="handleInput"
+          @pressEnter="handleSearch"
+        >
+          <template v-if="config?.prefix" #prefix>
+            <a-icon :type="config.prefix" @click="handleSearch" class="clickable-icon" />
+          </template>
+          <template v-if="config?.suffix" #suffix>
+            <a-icon :type="config.suffix" @click="handleSearch" class="clickable-icon" />
+          </template>
+        </a-input>
+      </div>
+      <span v-if="config?.tail" class="input-tail">{{ config.tail }}</span>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XInput',
+  inheritAttrs: false,
+  props: {
+    value: {
+      type: [String, Number],
+      default: ''
+    },
+    queryParamsName: {
+      type: String,
+      default: ''
+    }
+  },
+  data () {
+    return {
+      innerValue: this.value || '',
+      config: null
+    }
+  },
+  computed: {
+    // 动态样式开关：布尔开关 + size 派生类
+    wrapperClassObject () {
+      const attrs = this.$attrs || {}
+      const classes = {}
+      const booleanStyleKeys = [
+
+      ]
+      booleanStyleKeys.forEach(key => {
+        const val = attrs[key]
+        const truthy = val === true || val === '' || val === 'true'
+        if (truthy) classes[`xinput-${key}`] = true
+      })
+      const size = attrs.size
+      if (size && typeof size === 'string') classes[`xinput-size-${size}`] = true
+      return classes
+    }
+  },
+  created () {
+    this.getData(this.queryParamsName)
+  },
+  emits: ['search'],
+  methods: {
+    runLogic,
+    async getData (data) {
+      getConfigByName(data, 'af-his', res => {
+        this.config = res
+        if (res.defaultValue !== undefined) {
+          this.innerValue = res.defaultValue
+        }
+      })
+    },
+    handleInput (e) {
+      const value = e.target.value
+      this.innerValue = value
+      this.$emit('search', value)
+    },
+    handleSearch () {
+      // 统一的搜索事件：将当前输入值发送给父组件
+      this.$emit('search', this.innerValue)
+    }
+  },
+  watch: {
+    value: {
+      handler (newValue) {
+        this.innerValue = newValue
+      },
+      immediate: true
+    },
+    queryParamsName: {
+      handler (newValue) {
+        this.getData(newValue)
+      },
+      deep: true
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.x-input-wrapper {
+  position: relative;
+  display: inline-block;
+  width: 100%;
+}
+
+.input-container {
+  display: flex;
+  align-items: center;
+}
+
+.input-label {
+  white-space: nowrap;
+  color: rgba(0, 0, 0, 0.85);
+  padding-right: 8px; /* 标签右侧固定间距 */
+}
+
+.input-label {
+  white-space: nowrap;
+  color: rgba(0, 0, 0, 0.85);
+  padding-left: 4px; /* 标签左侧固定间距 */
+}
+
+.input-wrapper {
+  flex: 1; /* 输入框占据剩余空间 */
+}
+
+:deep(.clickable-icon) {
+  cursor: pointer;
+}
+
+:deep(.clickable-icon:hover) {
+  color: #1890ff;
+}
+
+</style>