Browse Source

fix:修改单表组件不显示问题

zcuishan 3 months ago
parent
commit
facf74bb9c

+ 26 - 24
src/components/OneForOne/src/components/OneForOneItem.vue

@@ -1,3 +1,19 @@
+lr / xjr_vue_3 OneForOneItem.vue 14 KB 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
+24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56
+57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89
+90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116
+117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141
+142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166
+167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191
+192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216
+217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241
+242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266
+267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291
+292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316
+317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341
+342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366
+367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391
+392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415
 <template>
   <div>
     <!--如果是grid 组件 需要新增grid布局包裹-->
@@ -7,7 +23,6 @@
         :gutter="(schema.componentProps as any ).gutter ?? 0"
         :justify="(schema.componentProps as any ).justify"
         :align="(schema.componentProps as any ).align"
-        v-show="getIsShow(schema)"
       >
         <Col v-for="(col, colIndex) in schema.children" :key="colIndex" :span="col.span">
           <template v-for="childSchema in col.list" :key="childSchema.field">
@@ -31,7 +46,6 @@
         :tabPosition="(schema.componentProps as any ).tabPosition"
         :type="(schema.componentProps as any ).type"
         :size="(schema.componentProps as any ).tabSize"
-        v-show="getIsShow(schema)"
       >
         <TabPane
           v-for="(tab, tabIndex) in schema.children"
@@ -98,22 +112,22 @@
     <template v-else-if="schema.component.includes('Range')">
       <FormItem
         :key="schema.key"
-        :name="[mainKey, 0, schema.field]"
+        :name="schema.field"
         :label="getComponentsProps.showLabel ? schema.label : ''"
         :label-col="labelCol"
         :wrapperCol="itemLabelWidthProp.wrapperCol"
-        :validateTrigger="['blur', 'change']"
+        validateTrigger="blur"
         :rules="rules"
         v-if="getShow(schema)"
-        v-show="getIsShow(schema)"
       >
         <component
+          v-if="getShow(schema)"
           :disabled="getDisable"
           :is="componentMap.get(schema.component)"
           :size="formProps?.size"
           v-bind="schema.componentProps"
-          v-model:startField="schema.field.split(',')[0]"
-          v-model:endField="schema.field.split(',')[1]"
+          :startField="schema.field.split(',')[0]"
+          :endField="schema.field.split(',')[1]"
           :mainKey="mainKey"
           :tableIndex="0"
           v-model:value="formModel![mainKey!][0][schema.field]"
@@ -147,9 +161,9 @@
         :wrapperCol="itemLabelWidthProp.wrapperCol"
         :rules="rules"
         v-if="getShow(schema)"
-        v-show="getIsShow(schema)"
       >
         <component
+          v-if="getShow(schema)"
           :key="refreshFieldObj[schema.field]"
           :is="componentMap.get(schema.component)"
           :disabled="getDisable"
@@ -165,7 +179,6 @@
         :title="(schema.componentProps as any ).title"
         :bordered="false"
         :hasLeftBorder="true"
-        v-show="getIsShow(schema)"
       >
         <template v-for="childSchema  in schema.children![0].list" :key="childSchema.field">
           <OneForOneItem
@@ -182,7 +195,7 @@
     </template>
     <!--如果是 分割线 组件 需要新增divider组件包裹-->
     <template v-else-if="schema.component.includes('Divider')">
-      <FormItem v-show="getIsShow(schema)">
+      <FormItem>
         <Divider v-bind="getComponentsProps"> {{ getComponentsProps.text }}</Divider>
       </FormItem>
     </template>
@@ -190,7 +203,6 @@
     <template v-else-if="schema.component.includes('Opinion')">
       <FormItem
         v-if="getShow(schema)"
-        v-show="getIsShow(schema)"
         :key="schema.key"
         :name="schema.field"
         :label="getComponentsProps.showLabel ? schema.label : ''"
@@ -200,6 +212,7 @@
         :validateTrigger="['blur', 'change']"
       >
         <component
+          v-if="getShow(schema)"
           :is="componentMap.get(schema.component)"
           :key="refreshFieldObj[schema.field]"
           :disabled="getDisable"
@@ -212,7 +225,6 @@
     <template v-else>
       <FormItem
         v-if="getShow(schema)"
-        v-show="getIsShow(schema)"
         :key="schema.key"
         :name="[mainKey!, 0, schema.field]"
         :label="getComponentsProps.showLabel ? schema.label : ''"
@@ -222,13 +234,12 @@
         :validateTrigger="['blur', 'change']"
       >
         <component
+          v-if="getShow(schema)"
           :is="componentMap.get(schema.component)"
           :key="refreshFieldObj[schema.field]"
           :disabled="getDisable"
           :size="formProps?.size"
           v-bind="getComponentsProps"
-          :index="0"
-          :mainKey="mainKey"
           v-model:value="formModel![mainKey!][0][schema.field]"
         />
       </FormItem>
@@ -379,7 +390,6 @@
     },
   );
   onMounted(() => {
-    console.log('onMounted',props);
     // if (
     //   staticDataComponents.includes(props.schema.component) &&
     //   (props.schema.componentProps as any)?.datasourceType === 'staticData'
@@ -410,15 +420,6 @@
     }
     return isIfShow;
   }
-
-  function getIsShow(schema: FormSchema): boolean {
-    const { componentProps } = schema as any;
-    let show = true;
-    if (isBoolean(componentProps?.isShow)) {
-      show = componentProps?.isShow;
-    }
-    return show;
-  }
 </script>
 <style lang="less" scoped>
   :deep(.ant-form-item-label > label) {
@@ -427,3 +428,4 @@
     line-height: 28px;
   }
 </style>
+© 2024 Gogs页面: 29ms 模板: 1ms 简体中文 官方网站

+ 1 - 2
src/hooks/web/usePermission.ts

@@ -189,7 +189,6 @@ export function usePermission() {
       formAuth = formAuth.map((x) => {
         if (typeof x === 'object' && !!Object.keys(x)[0]) {
           const subformField = camelCaseString(Object.keys(x)[0])!;
-          x[subformField!] = x[subformField!]?.map((field) => camelCaseString(field));
           return {
             [subformField]: x[subformField!],
           };
@@ -240,7 +239,7 @@ export function usePermission() {
           return false;
         } else {
           schema.componentProps.childSchemas = schema.componentProps.childSchemas.filter((x) => {
-            return x.component
+            return x.componentType
               ? findLayoutComponent(x, Object.values(currentSubFormAuth)[0])
               : true;
           });

+ 2 - 2
src/views/form/template/components/FormModal.vue

@@ -74,7 +74,6 @@
   const { t } = useI18n();
 
   const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
-    console.log(data);
     if (props.formType === 'modal') {
       await handleInner(data, setModalProps);
     }
@@ -100,7 +99,8 @@
     state.pkField = data.pkField;
     releaseId = data.releaseId;
     formProps.value.schemas = filterFormSchemaAuth(formProps.value.schemas!);
-
+    console.log('formProps', formProps.value);
+    console.log('formProps', formProps.value);
     const viewformProps = cloneDeep(data.formProps);
     setDisabled(viewformProps.schemas);