فهرست منبع

fix: 新组建测试

fan 2 سال پیش
والد
کامیت
500d6db8c8

+ 8 - 0
src/components/Table/src/BasicTable.vue

@@ -403,6 +403,14 @@
       .ant-table.ant-table-bordered .ant-table-title {
         border: none !important;
       }
+
+      .ant-table.ant-table-bordered > .ant-table-container {
+        border: none !important;
+      }
+
+      table {
+        border-left: 1px solid #f0f0f0;
+      }
     }
 
     .ant-table {

+ 17 - 8
src/components/XTForm/src/XTForm.vue

@@ -14,7 +14,7 @@
               :style="{ width: item.width + 'px' }"
               :defaultValue="item.defaultValue"
               @change="handleChange"
-              :size="item.size || 'default'"
+              :size="item.size || 'large'"
             />
           </div>
           <div v-if="item.componentType == ComponentEnum.Select">
@@ -25,7 +25,7 @@
               :style="{ width: item.width + 'px' }"
               :defaultValue="item.defaultValue"
               @change="handleChange"
-              :size="item.size || 'default'"
+              :size="item.size || 'large'"
             >
               <SelectOption
                 v-for="r in item.dicts"
@@ -56,8 +56,7 @@
               :defaultValue="item.defaultValue"
               :disabled-date="item.disabledDate"
               @change="handleChange"
-              :size="item.size || 'default'"
-              :picker="item.picker"
+              :size="item.size || 'large'"
             />
           </div>
           <div v-if="item.componentType == ComponentEnum.RangePicker">
@@ -69,12 +68,13 @@
               :disabled="item.disabled ? true : false"
               :style="{ width: item.width + 'px' }"
               @change="handleChange"
-              :size="item.size || 'default'"
+              :size="item.size || 'large'"
+              :ranges="ranges"
             />
           </div>
           <div v-if="item.componentType == ComponentEnum.IconBtn">
-            <div class="icon-btn">
-              <i class="iconfont icon-lock" @click="handleClick(item)" />
+            <div :class="['icon-btn', item.selected ? 'icon-btn--selected' : '']">
+              <i class="iconfont icon-xt-screen_default" @click="handleClick(item)" />
             </div>
           </div>
         </FormItem>
@@ -109,6 +109,8 @@
     // Tooltip,
     // Upload,
   } from 'ant-design-vue';
+  import { dateRanges } from '/@/utils';
+
   interface Props {
     formShow?: boolean;
     formData: Array<{
@@ -131,6 +133,8 @@
       disabledDate?: any;
       picker?: string;
       size?: string;
+      // filter btn 是否选中
+      selected?: string;
     }>;
   }
   withDefaults(defineProps<Props>(), {
@@ -138,6 +142,7 @@
     formShow: true,
   });
   const emit = defineEmits(['change', 'click']);
+  const ranges = ref(dateRanges());
   // 表单
   const formRef = ref<any>({});
   function handleChange() {
@@ -174,9 +179,13 @@
     line-height: 40px;
     cursor: pointer;
 
+    &--selected,
+    &:hover {
+      color: #0075ff;
+    }
+
     & .iconfont {
       font-size: 24px;
-      color: #0075ff;
       margin-right: 0;
     }
   }

+ 1 - 0
src/components/XTTitle/index.ts

@@ -0,0 +1 @@
+export { default as XTTitle } from './src/Title.vue';

+ 1 - 1
src/settings/projectSetting.ts

@@ -121,7 +121,7 @@ const setting: ProjectConfig = {
   multiTabsSetting: {
     cache: false,
     // Turn on
-    show: true,
+    show: false,
     // Is it possible to drag and drop sorting tabs
     canDrag: true,
     // Turn on quick actions

+ 9 - 4
src/views/biz/bed/near/index.vue

@@ -126,8 +126,8 @@
           <div
             v-for="item in bedHas"
             :key="item.id"
-            :class="['edit-item', item.id == notBedId ? 'edit-item--has' : '']"
-            @click="handleNotBed(item)"
+            :class="['edit-item', item.id == hasBedId ? 'edit-item--has' : '']"
+            @click="handleHasBed(item)"
           >
             {{ item.name }}
           </div>
@@ -344,6 +344,11 @@
     hasBedId.value = null;
     setCnt();
   }
+  function handleHasBed(data) {
+    hasBedId.value = data.id;
+    notBedId.value = null;
+    setCnt();
+  }
   function callFilter(data) {
     console.log('🚀 ~ file: index.vue:173 ~ callFilter ~ data:', data);
     if (data.sailings || data.sailings == 0) {
@@ -526,7 +531,7 @@
 
       &--fixed {
         position: fixed;
-        top: 80px;
+        top: 48px;
         z-index: 8;
         padding-bottom: 4px;
       }
@@ -704,7 +709,7 @@
 
   .edit {
     position: fixed;
-    top: 100px;
+    top: 60px;
     right: 20px;
     min-width: 250px;
     height: calc(100vh - 120px);

+ 19 - 0
src/views/biz/visit/ready/data.ts

@@ -1,6 +1,7 @@
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Form';
 import { radioBoolean } from '/@/utils/filters';
+import { listDictModel } from '/@/api/common';
 
 export const dataFormSchema: FormSchema[] = [
   {
@@ -56,6 +57,24 @@ export const dataFormSchema: FormSchema[] = [
       extra: '123123',
     },
   },
+  {
+    field: 'configName333',
+    label: '有无异常',
+    component: 'ApiComplex',
+    componentProps: {
+      placeholder: '请输入异常内容',
+      api: listDictModel,
+      params: {
+        dictCode: 'sys_dict_type',
+      },
+      values: {
+        radioValue: 0,
+        inputValue: '',
+        checkboxValue: [],
+      },
+      defaultValue: '123123',
+    },
+  },
   {
     field: 'configKey',
     label: '参数键名',