lw-cdp-ui 1.1.11 → 1.1.12

package/dist/components/lwForm/index.vue

@@ -335,7 +335,9 @@
 
             <!-- 没有组件是component值 就是插槽名称 -->
             <template v-else>
-              <slot :name="item.component" :itemCur="item" :formCur="form">
+              <slot :name="item.component"
+                    :itemCur="item"
+                    :formCur="form">
                 <el-tag type="danger">[{{ item.component }}]
                   没有这个默认组件也未自定义插槽内容</el-tag>
               </slot>

package/dist/components/lwFormView/index.vue

@@ -1,15 +1,15 @@
 <template>
-  <el-skeleton v-if="renderLoading || Object.keys(form).length==0"
+  <el-skeleton v-if="renderLoading || Object.keys(form).length == 0"
                animated />
-  <el-row :gutter="20"
+  <el-row :gutter="0"
           v-else>
     <template v-for="(item, index) in config.formItems">
       <template v-if="!hideHandle(item)">
         <template v-if="item.component == 'divider'">
           <el-col :span="item.span || 24"
-                  :class="{topPadding: index !== 0}">
+                  :class="{ topPadding: index !== 0 }">
             <div class="top-title-body">
-              <span class="title-name">{{ item.label }}</span>
+              <span class="lw-form-view-title-name">{{ item.label }}</span>
               <slot :name="item.options?.component"></slot>
             </div>
           </el-col>
@@ -19,7 +19,7 @@
           <div class="span-item"
                :class="[config.labelPosition]">
             <span v-if="item.label"
-                  :style="{minWidth: config.labelWidth}"
+                  :style="{ minWidth: config.labelWidth }"
                   class="title-item">
               {{ item.label }}
               <el-tooltip v-if="item.tips"
@@ -29,7 +29,7 @@
             </span>
             <!-- input -->
             <template
-                      v-if="item.component=='input' || item.component=='number'">
+                      v-if="item.component == 'input' || item.component == 'number'">
               <template v-if="item?.options?.name">
                 <textToPassword v-model="form[item.name][item.options.name]"
                                 :width="config.labelWidth"
@@ -41,7 +41,7 @@
               </template>
             </template>
             <!-- upload -->
-            <template v-else-if="item.component=='upload'">
+            <template v-else-if="item.component == 'upload'">
               <el-col v-for="(_item, _index) in item.options.items"
                       :key="_index">
                 <template v-if="item.name">
@@ -58,7 +58,7 @@
               </el-col>
             </template>
             <!-- checkbox -->
-            <template v-else-if="item.component=='checkbox'">
+            <template v-else-if="item.component == 'checkbox'">
               <template v-if="item.name">
                 {{ form[item.name][_item.name] }}
               </template>
@@ -67,11 +67,11 @@
               </template>
             </template>
             <!-- checkboxGroup -->
-            <template v-else-if="item.component=='checkboxGroup'">
+            <template v-else-if="item.component == 'checkboxGroup'">
               {{ form[item.name] }}
             </template>
             <!-- switch -->
-            <template v-else-if="item.component=='switch'">
+            <template v-else-if="item.component == 'switch'">
               <template v-if="item?.options?.name">
                 {{ form[item.name][item.options.name] ? item.options.true || '是' : item.options.false || '否' }}
               </template>
@@ -81,16 +81,16 @@
             </template>
             <!-- select -->
             <template
-                      v-else-if="item.component=='select' || item.component=='radio'">
+                      v-else-if="item.component == 'select' || item.component == 'radio'">
               <template v-if="item?.options?.name">
-                {{getKeyToLabel(form[item.name][item.options.name], item.options.items)}}
+                {{ getKeyToLabel(form[item.name][item.options.name], item.options.items) }}
               </template>
               <template v-else>
-                {{getKeyToLabel(form[item.name], item.options.items)}}
+                {{ getKeyToLabel(form[item.name], item.options.items) }}
               </template>
             </template>
             <!-- cascader -->
-            <template v-else-if="item.component=='cascader'">
+            <template v-else-if="item.component == 'cascader'">
               <template v-if="item?.options?.name">
                 <el-cascader v-model="form[item.name][item.options.name]"
                              :options="item.options.items"
@@ -103,9 +103,10 @@
               </template>
             </template>
             <!-- date -->
-            <template v-else-if="item.component=='date'">
+            <template v-else-if="item.component == 'date'">
               <template v-if="item?.options?.name">
-                {{ dayjs(form[item.name][item.options.name]).format(item.options.valueFormat || 'YYYY-MM-DD HH:mm:ss') }}
+                {{ dayjs(form[item.name][item.options.name]).format(item.options.valueFormat || 'YYYY-MM-DD HH:mm:ss')
+                }}
 
               </template>
               <template v-else>
@@ -114,7 +115,7 @@
 
             </template>
             <!-- color -->
-            <template v-else-if="item.component=='color'">
+            <template v-else-if="item.component == 'color'">
               <template v-if="item?.options?.name">
                 <el-color-picker disabled
                                  v-model="form[item.name][item.options.name]" />
@@ -126,7 +127,7 @@
 
             </template>
             <!-- rate -->
-            <template v-else-if="item.component=='rate'">
+            <template v-else-if="item.component == 'rate'">
               <template v-if="item?.options?.name">
                 <el-rate disabled
                          v-model="form[item.name][item.options.name]"></el-rate>
@@ -137,7 +138,7 @@
               </template>
             </template>
             <!-- slider -->
-            <template v-else-if="item.component=='slider'">
+            <template v-else-if="item.component == 'slider'">
               <template v-if="item?.options?.name">
                 <el-slider disabled
                            v-model="form[item.name][item.options.name]"
@@ -152,7 +153,7 @@
             </template>
 
             <!-- tags -->
-            <template v-else-if="item.component=='tags'">
+            <template v-else-if="item.component == 'tags'">
               <div class="tags-list">
                 <template v-if="item?.options?.name">
                   <el-tag v-for="tag in form[item.name][item?.options?.name]"
@@ -175,12 +176,12 @@
             <template v-else>
               <slot :name="item.component">
                 <el-tag type="danger">
-                  [{{item.component}}]
+                  [{{ item.component }}]
                   没有这个默认组件也未自定义插槽内容</el-tag>
               </slot>
             </template>
             <div v-if="item.message"
-                 class="el-form-item-msg">{{item.message}}</div>
+                 class="el-form-item-msg">{{ item.message }}</div>
           </div>
         </el-col>
       </template>
@@ -337,16 +338,21 @@ export default {
 </script>
 <style lang="scss" scoped>
 .topPadding {
-  margin-top: 20px;
+  border-top: 2px solid #f7f8fa;
+  margin-top: 30px;
+  padding-top: 30px;
 }
+
 .top-title-body {
   display: flex;
   justify-content: space-between;
+  align-items: center;
   width: 100%;
-  .title-name {
+  height: 30px;
+  margin-bottom: 5px;
+  .lw-form-view-title-name {
     font-size: 18px;
     font-weight: bold;
-    margin-bottom: 10px;
   }
 }
 
@@ -359,14 +365,17 @@ export default {
   line-height: 24px;
   font-size: 14px;
   width: 100%;
+
   &.top {
     flex-direction: column;
   }
+
   &.right {
     .title-item {
       text-align: right;
     }
   }
+
   .title-item {
     color: #7c7c7c;
     display: inline-block;

package/dist/components/lwLayout/index.vue

@@ -293,7 +293,6 @@ export default {
   data() {
     return {
       settingDialog: false,
-      changeMenu: false,
       menu: [],
       nextMenu: [],
       pmenu: {},
@@ -314,13 +313,6 @@ export default {
       return this.$store.state.global.menuIsCollapse
     }
   },
-  beforeCreate() {
-    // 挂载菜单订阅
-    this.$bus.$on('setMenu', (menu) => {
-      this.changeMenu = true
-      this.menu = this.filterUrl(menu)
-    })
-  },
   async created() {
     // 标识当前项目
     let isCombined = this.$tool.data.get("MENUCOMBINED")
@@ -330,13 +322,16 @@ export default {
 
     this.onLayoutResize();
     window.addEventListener('resize', this.onLayoutResize);
-    this.getUserInfo();
-    if (!this.changeMenu) {
-      var menu = this.$router.sc_getMenu();
-      this.menu = this.filterUrl(menu);
-    }
+    await this.getUserInfo();
+    var menu = this.$router.sc_getMenu();
+    this.menu = this.filterUrl(menu);
     this.showThis()
     this.$store.commit("LOAD_USER_FROM_LOCAL_STORAGE")
+
+    // 挂载菜单订阅
+    this.$bus.$on('setMenu', (menu) => {
+      this.menu = this.filterUrl(menu)
+    })
   },
   watch: {
     async $route() {
@@ -396,7 +391,6 @@ export default {
     },
     //转换外部链接的路由
     filterUrl(map) {
-
       var newMap = []
       map && map.forEach(item => {
         item.meta = item.meta ? item.meta : {};
@@ -414,8 +408,6 @@ export default {
         }
         newMap.push(item)
       })
-
-      this.changeMenu = false
       return newMap;
     },
     //退出最大化

package/dist/lw-cdp-ui.esm.js

@@ -1165,7 +1165,6 @@ const iframeView = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_ren
   data() {
     return {
       settingDialog: !1,
-      changeMenu: !1,
       menu: [],
       nextMenu: [],
       pmenu: {},
@@ -1186,17 +1185,12 @@ const iframeView = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_ren
       return this.$store.state.global.menuIsCollapse;
     }
   },
-  beforeCreate() {
-    this.$bus.$on("setMenu", (o) => {
-      this.changeMenu = !0, this.menu = this.filterUrl(o);
-    });
-  },
   async created() {
-    if (this.$tool.data.get("MENUCOMBINED") && this.$tool.data.set("MENUCOMBINEDNMAE", this.$config.APP_NAME), this.onLayoutResize(), window.addEventListener("resize", this.onLayoutResize), this.getUserInfo(), !this.changeMenu) {
-      var l = this.$router.sc_getMenu();
-      this.menu = this.filterUrl(l);
-    }
-    this.showThis(), this.$store.commit("LOAD_USER_FROM_LOCAL_STORAGE");
+    this.$tool.data.get("MENUCOMBINED") && this.$tool.data.set("MENUCOMBINEDNMAE", this.$config.APP_NAME), this.onLayoutResize(), window.addEventListener("resize", this.onLayoutResize), await this.getUserInfo();
+    var l = this.$router.sc_getMenu();
+    this.menu = this.filterUrl(l), this.showThis(), this.$store.commit("LOAD_USER_FROM_LOCAL_STORAGE"), this.$bus.$on("setMenu", (r) => {
+      this.menu = this.filterUrl(r);
+    });
   },
   watch: {
     async $route() {
@@ -1244,7 +1238,7 @@ const iframeView = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["render", _sfc_ren
         if (r.meta = r.meta ? r.meta : {}, r.meta.hidden || r.meta.type == "button")
           return !1;
         r.meta.type == "iframe" && (r.path = `/i/${r.name}`), r.children && r.children.length > 0 && (r.children = this.filterUrl(r.children)), l.push(r);
-      }), this.changeMenu = !1, l;
+      }), l;
     },
     //退出最大化
     exitMaximize() {
@@ -6107,7 +6101,7 @@ function _sfc_render$6(o, l, r, m, i, p) {
     [T, r.loading]
   ]);
 }
-const lwForm = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["render", _sfc_render$6], ["__scopeId", "data-v-0ba6beb1"]]), config$1 = {
+const lwForm = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["render", _sfc_render$6], ["__scopeId", "data-v-9e248ff8"]]), config$1 = {
   icons: [
     {
       name: "默认",
@@ -7582,7 +7576,7 @@ const textToPassword = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["render", _sfc
     },
     dayjs
   }
-}, _hoisted_1$1 = { class: "top-title-body" }, _hoisted_2$1 = { class: "title-name" }, _hoisted_3 = {
+}, _hoisted_1$1 = { class: "top-title-body" }, _hoisted_2$1 = { class: "lw-form-view-title-name" }, _hoisted_3 = {
   key: 12,
   class: "tags-list"
 }, _hoisted_4 = {
@@ -7596,7 +7590,7 @@ function _sfc_render$1(o, l, r, m, i, p) {
     animated: ""
   })) : (openBlock(), createBlock(oe, {
     key: 1,
-    gutter: 20
+    gutter: 0
   }, {
     default: withCtx(() => [
       (openBlock(!0), createElementBlock(Fragment, null, renderList(r.config.formItems, (_, G) => (openBlock(), createElementBlock(Fragment, null, [
@@ -7786,7 +7780,7 @@ function _sfc_render$1(o, l, r, m, i, p) {
     _: 3
   }));
 }
-const lwFormView = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-0c2eb1e0"]]), _sfc_main = {
+const lwFormView = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["render", _sfc_render$1], ["__scopeId", "data-v-021cd72b"]]), _sfc_main = {
   name: "lwCronSelect",
   props: {
     disabled: {