From 22e325245e63e8197b6586706db299fdc6d65500 Mon Sep 17 00:00:00 2001
From: likunming <likunming@163.com>
Date: Mon, 28 Apr 2025 09:27:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=9F=BA=E7=A1=80=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/grid/css/separator.css         | 12 +++++++++++
 .../grid/ts/computed/ComputedManager.ts       |  7 +++++++
 .../src/platform/components/label/WLabel.vue  |  1 +
 .../platform/components/radio/WExtRadio.vue   | 15 +++++++++++---
 .../components/splitter/WSplitter.vue         | 20 ++++---------------
 5 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/css/separator.css b/io.sc.platform.core.frontend/src/platform/components/grid/css/separator.css
index 496b7e2d..8bb222e8 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/css/separator.css
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/css/separator.css
@@ -53,6 +53,12 @@
 .w-grid .q-table--vertical-separator th.no-right-border {
   border-right: 0;
 }
+.w-grid .q-table--vertical-separator.y-scroll tbody tr td:last-child {
+  border-right: 1px solid rgba(0, 0, 0, 0.12);
+}
+.w-grid .q-table--vertical-separator.y-scroll th.no-right-border {
+  border-right: 1px solid rgba(0, 0, 0, 0.12);
+}
 /*
 * vertical
 * 数据最后一行底部边框
@@ -87,6 +93,12 @@
 .w-grid .q-table--cell-separator th.no-right-border {
   border-right: 0;
 }
+.w-grid .q-table--cell-separator.y-scroll tbody tr td:last-child {
+  border-right: 1px solid rgba(0, 0, 0, 0.12);
+}
+.w-grid .q-table--cell-separator.y-scroll th.no-right-border {
+  border-right: 1px solid rgba(0, 0, 0, 0.12);
+}
 /*
 * cell
 * 数据最后一行底部边框
diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/ts/computed/ComputedManager.ts b/io.sc.platform.core.frontend/src/platform/components/grid/ts/computed/ComputedManager.ts
index 55b2ad8b..d7266d9e 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/ts/computed/ComputedManager.ts
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/ts/computed/ComputedManager.ts
@@ -206,6 +206,13 @@ export class ComputedManager extends Base {
         }
       }
     }
+    const tableElement = this.instance?.getHtmlElement();
+    if (tableElement) {
+      const tableHeight = tableElement.getElementsByClassName('q-table')[0]?.clientHeight;
+      if (tableHeight > this.table.store.location.middleHeight) {
+        classArr.push('y-scroll');
+      }
+    }
     return classArr;
   });
 
diff --git a/io.sc.platform.core.frontend/src/platform/components/label/WLabel.vue b/io.sc.platform.core.frontend/src/platform/components/label/WLabel.vue
index 875849ec..99b32839 100644
--- a/io.sc.platform.core.frontend/src/platform/components/label/WLabel.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/label/WLabel.vue
@@ -1,6 +1,7 @@
 <template>
   <span :style="styleComputed">
     <span v-if="props.required" style="color: red">*</span> {{ props.label }}
+    <slot name="addtion"></slot>
     <slot name="after"></slot>
   </span>
 </template>
diff --git a/io.sc.platform.core.frontend/src/platform/components/radio/WExtRadio.vue b/io.sc.platform.core.frontend/src/platform/components/radio/WExtRadio.vue
index 0d6bf762..20d961bf 100644
--- a/io.sc.platform.core.frontend/src/platform/components/radio/WExtRadio.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/radio/WExtRadio.vue
@@ -1,12 +1,16 @@
 <template>
   <div v-show="fieldMethodsClass.getShow(props, modelValue)" class="w-ext-radio">
     <w-label :required="fieldMethodsClass.getRequired(props, modelValue)" :label="attrs.label" :size="16" :light="lightLabelComputed">
+      <template v-if="fieldMethodsClass.slotNames.length > 0" #addtion>
+        <slot v-if="fieldMethodsClass.isTemplateSlot" name="addtion"></slot>
+        <FormElementSlot v-else slot-name="addtion" :slot-content="props['slot']['addtion']"></FormElementSlot>
+      </template>
       <template v-if="props.hideOptions" #after>
         <q-btn
           flat
           round
           color="primary"
-          :icon="expandOptionsModelValue ? 'vertical_align_center' : 'expand'"
+          :icon="expandOptionsModelValue ? 'remove' : 'add'"
           size="xs"
           @click="expandOptionsModelValue = !expandOptionsModelValue"
         />
@@ -21,6 +25,7 @@
           :dense="props.dense"
           :disable="fieldMethodsClass.getDisable(props, modelValue)"
           :color="modelValue === opt['value'] ? selectedColor : undefined"
+          :style="fieldMethodsClass.getReadOnly(props, modelValue) ? 'pointer-events: none;' : ''"
         >
           <template #default>
             <span v-if="modelValue === opt['value'] && selectedLabelColor" :style="'color:' + selectedLabelColor">{{ opt['label'] }}</span>
@@ -34,7 +39,7 @@
           class="desc"
           :rows="3"
           :required-if="opt['desc']['requiredIf']"
-          :read-only-if="fieldMethodsClass.getDisable(props, modelValue)"
+          :read-only-if="fieldMethodsClass.getReadOnly(props, modelValue)"
         >
         </w-textarea>
       </template>
@@ -42,12 +47,14 @@
   </div>
 </template>
 <script setup lang="ts">
-import { ref, useAttrs, computed, onMounted } from 'vue';
+import { ref, useAttrs, computed, useSlots } from 'vue';
 import { FormFieldProps } from '@/platform/components/form/FormField.ts';
 import { FormFieldMethods } from '../form/FormField';
+import FormElementSlot from '../form/FormElementSlot.vue';
 
 const radioRef = ref();
 const attrs = useAttrs();
+const slots = useSlots();
 const modelValue = defineModel<string | boolean | number>();
 const descModelValue = ref('');
 const expandOptionsModelValue = ref(false);
@@ -72,6 +79,8 @@ const props = withDefaults(defineProps<FieldProps>(), {
   lightNotHideOptionsLabel: false,
 });
 class FieldMethods extends FormFieldMethods {
+  isTemplateSlot = this.getSlotType(slots);
+  slotNames = this.getSlotNames(slots, props);
   updateValue = (value_) => {
     if (props['onUpdateValue']) {
       props['onUpdateValue']({
diff --git a/io.sc.platform.core.frontend/src/platform/components/splitter/WSplitter.vue b/io.sc.platform.core.frontend/src/platform/components/splitter/WSplitter.vue
index 9d11ef4b..904b0a78 100644
--- a/io.sc.platform.core.frontend/src/platform/components/splitter/WSplitter.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/splitter/WSplitter.vue
@@ -1,6 +1,6 @@
 <template>
   <q-splitter
-    v-model="splitterModel"
+    v-model="modelValue"
     v-bind="attrs"
     :horizontal="horizontal"
     :disable="disable"
@@ -25,14 +25,8 @@ import { ref, useAttrs, watch } from 'vue';
 import { getCssVar } from 'quasar';
 
 const attrs = useAttrs();
+const modelValue = defineModel<number>();
 const props = defineProps({
-  /**
-   * 切分大小
-   */
-  size: {
-    type: Number,
-    default: 50,
-  },
   /**
    * 上下切分，默认为左右切分
    */
@@ -83,14 +77,8 @@ const props = defineProps({
     default: true,
   },
 });
-const splitterModel = ref(props.size);
-const lineColor = props.separatorColor || getCssVar('primary');
-watch(
-  () => props.size,
-  (newVal, oldVal) => {
-    splitterModel.value = newVal;
-  },
-);
+// const lineColor = props.separatorColor || getCssVar('primary');
+const lineColor = props.separatorColor || 'rgba(0, 0, 0, 0.12)';
 </script>
 
 <style lang="css">