lw-cdp-ui 1.3.2 → 1.3.3-ui

package/dist/components/lwFormMini/FormItem.vue

@@ -384,35 +384,6 @@ export default {
 
 
 <style lang="scss" scoped>
-:deep(.el-col) {
-  &:first-child {
-    .title-name {
-      border: 0;
-      padding-top: 25px;
-      margin-top: 0;
-    }
-  }
-}
-
-.title-name {
-  font-size: 18px;
-  font-weight: bold;
-  margin-bottom: 10px;
-  margin-top: 25px;
-  border-top: 10px solid #f5f7fa;
-  padding-top: 20px;
-}
-
-.form-mini {
-  display: flex;
-  width: 100%;
-  box-sizing: border-box;
-}
-.form-affix {
-  min-width: 130px;
-  padding-left: 20px;
-}
-
 .w-20 {
   width: 100px;
 }
@@ -422,48 +393,7 @@ export default {
     display: none !important;
   }
 }
-.affix-body {
-  background-color: var(--el-fill-color-light);
-  border: 1px solid var(--el-border-color-light);
-  margin: 0;
-  position: relative;
-  &::after {
-    content: "";
-    position: absolute;
-    left: -2px;
-    right: 0;
-    height: 16px;
-    background-color: #ffffff;
-    top: -17px;
-  }
-  .anchor-link {
-    padding: 0 20px;
-    height: var(--el-tabs-header-height);
-    box-sizing: border-box;
-    list-style: none;
-    font-size: var(--el-font-size-base);
-    font-weight: bold;
-    color: var(--el-text-color-secondary);
-    position: relative;
-    height: 40px;
-    display: inline-block;
-    line-height: 40px;
-    cursor: pointer;
-    border-left: 1px solid transparent;
-    border-right: 1px solid transparent;
-  }
-  .active {
-    color: var(--el-color-primary);
-    background-color: var(--el-bg-color-overlay);
-    border-bottom: 1px solid var(--el-bg-color-overlay);
-    border-right-color: var(--el-border-color);
-    border-left: 1px solid var(--el-border-color-light);
-    border-right: 1px solid var(--el-border-color-light);
-    &:first-child {
-      border-left: 1px solid var(--el-fill-color-light);
-    }
-  }
-}
+
 
 :deep(.el-tag) {
   & + .button-new-tag {

package/dist/components/lwFormMini/ViewItem.vue

@@ -299,38 +299,6 @@ export default {
 
 
 <style lang="scss" scoped>
-:deep(.el-col) {
-  &:first-child {
-    .title-name {
-      border: 0;
-      padding-top: 25px;
-      margin-top: 0;
-    }
-  }
-}
-
-.title-name {
-  font-size: 18px;
-  font-weight: bold;
-  margin-bottom: 10px;
-  margin-top: 25px;
-  border-top: 10px solid #f5f7fa;
-  padding-top: 20px;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.form-mini {
-  display: flex;
-  width: 100%;
-  box-sizing: border-box;
-}
-.form-affix {
-  min-width: 130px;
-  padding-left: 20px;
-}
-
 .w-20 {
   width: 100px;
 }
@@ -340,48 +308,6 @@ export default {
     display: none !important;
   }
 }
-.affix-body {
-  background-color: var(--el-fill-color-light);
-  border: 1px solid var(--el-border-color-light);
-  margin: 0;
-  position: relative;
-  &::after {
-    content: "";
-    position: absolute;
-    left: -2px;
-    right: 0;
-    height: 16px;
-    background-color: #ffffff;
-    top: -17px;
-  }
-  .anchor-link {
-    padding: 0 20px;
-    height: var(--el-tabs-header-height);
-    box-sizing: border-box;
-    list-style: none;
-    font-size: var(--el-font-size-base);
-    font-weight: bold;
-    color: var(--el-text-color-secondary);
-    position: relative;
-    height: 40px;
-    display: inline-block;
-    line-height: 40px;
-    cursor: pointer;
-    border-left: 1px solid transparent;
-    border-right: 1px solid transparent;
-  }
-  .active {
-    color: var(--el-color-primary);
-    background-color: var(--el-bg-color-overlay);
-    border-bottom: 1px solid var(--el-bg-color-overlay);
-    border-right-color: var(--el-border-color);
-    border-left: 1px solid var(--el-border-color-light);
-    border-right: 1px solid var(--el-border-color-light);
-    &:first-child {
-      border-left: 1px solid var(--el-fill-color-light);
-    }
-  }
-}
 
 :deep(.el-tag) {
   & + .button-new-tag {

package/dist/components/lwFormMini/index.vue

@@ -20,68 +20,68 @@
 
   <el-form v-else
            ref="form"
+           class="lw-form-mini"
            :model="form"
            :label-width="config.labelWidth"
            :label-position="$i18n.locale == 'en-us' ? 'top' : config.labelPosition"
            v-loading="loading"
            :size="config?.size || 'default'"
            element-loading-text="Loading...">
-    <el-row :gutter="15">
+    <div class="lw-form-mini-card"
+         v-for="card in formItems">
+      <el-row :gutter="15">
+        <template v-for="(item, index) in card">
+          <el-col :span="item.span || 24"
+                  v-if="!hideHandle(item)">
+            <ViewItem v-if="isView && !item?.options?.isInput"
+                      :item="item"
+                      :form="form"
+                      :index="index">
+              <!-- 没有组件是component值 就是插槽名称 -->
+              <template v-if="!['input', 'upload', 'checkbox', 'checkboxGroup', 'switch', 'select', 'treeSelect', 'cascader', 'date', 'number', 'radio', 'color', 'rate', 'slider','tags', 'divider'].includes(item.component)"
+                        v-slot:[item.component]>
+                <slot :name="item.component"
+                      :itemCur="item"
+                      :formCur="form">
+                  <el-tag type="danger">[{{ item.component }}]
+                    没有这个默认组件也未自定义插槽内容</el-tag>
+                </slot>
+              </template>
+              <template v-if="item?.options?.component"
+                        v-slot:[item?.options?.component]>
+                <slot :name="item?.options?.component"></slot>
+              </template>
 
-      <template v-for="(item, index) in config.formItems">
-        <el-col :span="item.span || 24"
-                v-if="!hideHandle(item)">
-          <ViewItem v-if="isView && !item?.options?.isInput"
-                    :item="item"
-                    :form="form"
-                    :index="index">
-            <!-- 没有组件是component值 就是插槽名称 -->
-            <template v-if="!['input', 'upload', 'checkbox', 'checkboxGroup', 'switch', 'select', 'treeSelect', 'cascader', 'date', 'number', 'radio', 'color', 'rate', 'slider','tags', 'divider'].includes(item.component)"
-                      v-slot:[item.component]>
-              <slot :name="item.component"
-                    :itemCur="item"
-                    :formCur="form">
-                <el-tag type="danger">[{{ item.component }}]
-                  没有这个默认组件也未自定义插槽内容</el-tag>
-              </slot>
-            </template>
-            <template v-if="item?.options?.component"
-                      v-slot:[item?.options?.component]>
-              <slot :name="item?.options?.component"></slot>
-            </template>
-
-          </ViewItem>
-          <FormItem v-else
-                    :item="item"
-                    :form="form"
-                    :index="index">
-            <!-- 没有组件是component值 就是插槽名称 -->
-            <template v-if="!['input', 'upload', 'checkbox', 'checkboxGroup', 'switch', 'select', 'treeSelect', 'cascader', 'date', 'number', 'radio', 'color', 'rate', 'slider','tags', 'divider'].includes(item.component)"
-                      v-slot:[item.component]>
-              <slot :name="item.component"
-                    :itemCur="item"
-                    :formCur="form">
-                <el-tag type="danger">[{{ item.component }}]
-                  没有这个默认组件也未自定义插槽内容</el-tag>
-              </slot>
-            </template>
-            <template v-if="item?.options?.component"
-                      v-slot:[item?.options?.component]>
-              <slot :name="item?.options?.component"></slot>
-            </template>
-          </FormItem>
-        </el-col>
-      </template>
-      <el-col v-if="!isView"
-              :span="24">
-        <el-form-item>
-          <slot>
-            <el-button type="primary"
-                       @click="submit">提交</el-button>
-          </slot>
-        </el-form-item>
-      </el-col>
-    </el-row>
+            </ViewItem>
+            <FormItem v-else
+                      :item="item"
+                      :form="form"
+                      :index="index">
+              <!-- 没有组件是component值 就是插槽名称 -->
+              <template v-if="!['input', 'upload', 'checkbox', 'checkboxGroup', 'switch', 'select', 'treeSelect', 'cascader', 'date', 'number', 'radio', 'color', 'rate', 'slider','tags', 'divider'].includes(item.component)"
+                        v-slot:[item.component]>
+                <slot :name="item.component"
+                      :itemCur="item"
+                      :formCur="form">
+                  <el-tag type="danger">[{{ item.component }}]
+                    没有这个默认组件也未自定义插槽内容</el-tag>
+                </slot>
+              </template>
+              <template v-if="item?.options?.component"
+                        v-slot:[item?.options?.component]>
+                <slot :name="item?.options?.component"></slot>
+              </template>
+            </FormItem>
+          </el-col>
+        </template>
+      </el-row>
+    </div>
+    <el-form-item v-if="!isView">
+      <slot>
+        <el-button type="primary"
+                   @click="submit">提交</el-button>
+      </slot>
+    </el-form-item>
   </el-form>
 </template>
 
@@ -174,15 +174,34 @@ export default {
     hasValue() {
       return Object.keys(this.modelValue).length > 0
     },
+    formItems() {
+      const result = [];
+      let currentGroup = [];
+
+      this.config.formItems.forEach(item => {
+        if (item.component === "divider") {
+          if (currentGroup.length) {
+            result.push(currentGroup);
+            currentGroup = [];
+          }
+          currentGroup.push(item);
+        } else {
+          currentGroup.push(item);
+        }
+      });
 
+      if (currentGroup.length) {
+        result.push(currentGroup);
+      }
+
+      return result;
+    }
   },
   mounted() {
     if (this.hasConfig) {
       this.render()
     }
   },
-  beforeDestroy() {
-  },
   methods: {
     /**
      * 渲染表单数据。
@@ -333,16 +352,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-:deep(.el-col) {
-  &:first-child {
-    .title-name {
-      border: 0;
-      padding-top: 25px;
-      margin-top: 0;
-    }
-  }
-}
-
 .form-mini {
   display: flex;
   width: 100%;
@@ -361,60 +370,9 @@ export default {
   margin-left: 10px;
 }
 
-.title-name {
-  font-size: 18px;
-  font-weight: bold;
-  margin-bottom: 10px;
-  margin-top: 25px;
-  border-top: 10px solid #f5f7fa;
-  padding-top: 20px;
-}
-
 :deep(.form-item-name-null) {
   > .el-form-item__label {
     display: none !important;
   }
 }
-.affix-body {
-  background-color: var(--el-fill-color-light);
-  border: 1px solid var(--el-border-color-light);
-  margin: 0;
-  position: relative;
-  &::after {
-    content: "";
-    position: absolute;
-    left: -2px;
-    right: 0;
-    height: 16px;
-    background-color: #ffffff;
-    top: -17px;
-  }
-  .anchor-link {
-    padding: 0 20px;
-    height: var(--el-tabs-header-height);
-    box-sizing: border-box;
-    list-style: none;
-    font-size: var(--el-font-size-base);
-    font-weight: bold;
-    color: var(--el-text-color-secondary);
-    position: relative;
-    height: 40px;
-    display: inline-block;
-    line-height: 40px;
-    cursor: pointer;
-    border-left: 1px solid transparent;
-    border-right: 1px solid transparent;
-  }
-  .active {
-    color: var(--el-color-primary);
-    background-color: var(--el-bg-color-overlay);
-    border-bottom: 1px solid var(--el-bg-color-overlay);
-    border-right-color: var(--el-border-color);
-    border-left: 1px solid var(--el-border-color-light);
-    border-right: 1px solid var(--el-border-color-light);
-    &:first-child {
-      border-left: 1px solid var(--el-fill-color-light);
-    }
-  }
-}
 </style>

package/dist/components/lwLayout/components/tags.vue

@@ -179,14 +179,11 @@ export default {
     closeSelectedTag(tag, autoPushLatestView = true) {
       let item = this.menu[0]
       if (item.children) {
-        item =  item.children[0]
+        item = item.children[0]
       }
-
-      // 兼容合并菜单
-      if (item.meta?.code) {
-        item.path = `/i/${item.name}`
+      if (this.tagList.length == 1 && item.path == this.$route.fullPath) {
+        return false
       }
-
       this.$store.commit("removeViewTags", tag)
       this.$store.commit("removeIframeList", tag)
       this.$store.commit("removeKeepLive", tag.name)
@@ -196,7 +193,7 @@ export default {
         if (latestView) {
           this.$router.push(latestView)
         } else {
-          this.$router.push({ path: item.path })
+          this.$router.push('/')
         }
       }
     },