lw-cdp-ui 1.3.44 → 1.3.45

package/dist/components/lwFlow/components/lfNodePanel.vue

@@ -65,7 +65,7 @@ export default {
   text-align: center;
   z-index: 101;
   :deep(.el-collapse) {
-    background-color: rgba($color: #ffffff, $alpha: 0.6);
+    background-color: var(--color-white-1);
   }
 }
 :deep(.el-collapse-item__header) {

package/dist/components/lwFormJson/JsonItem.vue

@@ -197,7 +197,7 @@ export default {
   }
   &.showBorder {
     border: 1px dashed var(--el-border-color-light);
-    background-color: rgba($color: #fff, $alpha: 1);
+    background-color: var(--color-white);
   }
 }
 // :deep(.el-form-item__content){

package/dist/components/lwFormJson/StatsConfig.vue

@@ -503,10 +503,10 @@ export default {
   max-height: calc(100vh - 137px);
   .form-title {
     font-size: 12px;
-    color: #000;
+    color: var(--color-title);
     font-weight: bold;
     padding: 15px 10px;
-    background-color: var(--el-fill-color-lighter);
+    background-color: var(--color-white-1);
   }
   .form-body {
     padding: 10px;

package/dist/components/lwFormJson/index.vue

@@ -324,6 +324,7 @@ export default {
 .menu-list {
   :deep(.el-collapse) {
     border-top: 0;
+    background-color: var(--color-white);
   }
   .menu-list-title {
     :deep(.el-collapse-item__header) {
@@ -355,10 +356,10 @@ export default {
 .aside-right {
   border-right: 0;
   border-left: 1px solid var(--el-border-color-light);
-  background-color: #fff;
+  background-color: var(--color-white);
 }
 .form-json-body {
   max-height: calc(100vh - 137px);
-  background-color: #fff;
+  background-color: var(--color-white);
 }
 </style>

package/dist/components/lwLayout/components/setting.vue

@@ -48,7 +48,7 @@ import colorTool from '@/utils/color'
 import Lang from './lang.vue'
 
 export default {
-  components: { Lang },
+  components: {Lang},
   data() {
     return {
       layout: this.$store.state.global.layout,
@@ -60,39 +60,42 @@ export default {
     }
   },
   watch: {
-    layout(val) {
-      this.$store.commit("SET_layout", val)
+    layout: {
+      handler(val) {
+        this.$store.commit('SET_layout', val)
+        document.body.setAttribute('data-layout', val)
+      },
+      immediate: true
     },
     menuIsCollapse(val) {
-      this.$store.commit("TOGGLE_menuIsCollapse")
-			if (val) {
-        this.$tool.data.set("APP_menuIsCollapse", 'true');
+      this.$store.commit('TOGGLE_menuIsCollapse')
+      if (val) {
+        this.$tool.data.set('APP_menuIsCollapse', 'true')
       } else {
-        this.$tool.data.remove("APP_menuIsCollapse");
+        this.$tool.data.remove('APP_menuIsCollapse')
       }
     },
     layoutTags(val) {
-      this.$store.commit("TOGGLE_layoutTags")
+      this.$store.commit('TOGGLE_layoutTags')
       if (val) {
-        this.$tool.data.remove("APP_LAYOUTTAGS");
+        this.$tool.data.remove('APP_LAYOUTTAGS')
       } else {
-        this.$tool.data.set("APP_LAYOUTTAGS", 'hide');
+        this.$tool.data.set('APP_LAYOUTTAGS', 'hide')
       }
-
     },
     dark(val) {
       document.body.setAttribute('data-theme', val)
-      this.$tool.data.set("APP_THEME", val);
+      this.$tool.data.set('APP_THEME', val)
     },
     colorPrimary(val) {
-      document.documentElement.style.setProperty('--el-color-primary', val);
+      document.documentElement.style.setProperty('--el-color-primary', val)
       for (let i = 1; i <= 9; i++) {
-        document.documentElement.style.setProperty(`--el-color-primary-light-${i}`, colorTool.lighten(val, i / 10));
+        document.documentElement.style.setProperty(`--el-color-primary-light-${i}`, colorTool.lighten(val, i / 10))
       }
       for (let i = 1; i <= 9; i++) {
-        document.documentElement.style.setProperty(`--el-color-primary-dark-${i}`, colorTool.darken(val, i / 10));
+        document.documentElement.style.setProperty(`--el-color-primary-dark-${i}`, colorTool.darken(val, i / 10))
       }
-      this.$tool.data.set("APP_COLOR", val);
+      this.$tool.data.set('APP_COLOR', val)
     }
   }
 }

package/dist/components/lwLayout/init.vue

@@ -59,7 +59,7 @@ export default {
 
 <style lang="scss" scoped>
 :deep(.el-main) {
-  background-color: #fafafa;
+  background-color: var(--color-white-1);
 }
 .footer-body {
   text-align: right;
@@ -69,6 +69,7 @@ export default {
   border: 1px solid var(--el-fill-color);
   height: calc(100vh - 85px);
   padding: 20px;
+  overflow: auto;
 }
 .notice-block {
   position: relative;

package/dist/components/lwSearch/index.vue

@@ -15,8 +15,7 @@
               <el-form-item :label-width="hideLabel ? 0 : labelWidth"
                             :required="item.required"
                             :label="hideLabel ? '' : $t(item.label)">
-                <template
-                          v-if="item.dateSection && item.prop && item.prop.length === 2">
+                <template v-if="item.dateSection && item.prop && item.prop.length === 2">
                   <el-row :gutter="10"
                           class="date-section">
                     <el-col :span="12"
@@ -53,12 +52,13 @@
         </el-row>
 
         <div class="control">
-          <el-button class="reset"
+          <el-button text
+                     bg
+                     type="primary"
                      @click="resetForm('searchForm')">
             {{$t('btn.reset')}}
           </el-button>
-          <el-button class="submit"
-                     type="primary"
+          <el-button type="primary"
                      @click="submitForm('searchForm')">
             {{$t('btn.query')}}
           </el-button>
@@ -74,13 +74,13 @@
 </template>
 
 <script>
-import SearchInput from "./input/input.vue";
-import SearchSelect from "./select/select.vue";
-import SearchDate from "./date/date.vue";
-import SearchDates from "./dates/dates.vue";
-import SearchDateRange from "./dateRange/dateRange.vue";
-import SearchCascader from "./cascader/cascader.vue";
-import dayjs from "dayjs";
+import SearchInput from './input/input.vue'
+import SearchSelect from './select/select.vue'
+import SearchDate from './date/date.vue'
+import SearchDates from './dates/dates.vue'
+import SearchDateRange from './dateRange/dateRange.vue'
+import SearchCascader from './cascader/cascader.vue'
+import dayjs from 'dayjs'
 
 export default {
   components: {
@@ -91,63 +91,63 @@ export default {
     SearchDateRange,
     SearchCascader
   },
-  name: "lwSearch",
+  name: 'lwSearch',
   props: {
     options: {
       // 配置项
       type: Array,
-      default: () => [],
+      default: () => []
     },
     modelValue: {
       // 绑定的结果对象
       type: Object,
-      default: () => ({}),
+      default: () => ({})
     },
     labelWidth: {
       // label全局宽度
       type: String,
-      default: "70px",
+      default: '70px'
     },
     labelPosition: {
       // label全局位置
       type: String,
-      default: "left",
+      default: 'left'
     },
     isSave: {
       // 是否保存功能
       type: Boolean,
-      default: false,
+      default: false
     },
     isCloud: {
       // 是否保存功能
       type: Boolean,
-      default: false,
+      default: false
     },
     saveKey: {
       // 保存功能指定localStorage searchSaveData对象中key
       type: String,
-      default: "",
+      default: ''
     },
     isExpand: {
       // 默认是否展开
       type: Boolean,
-      default: false,
+      default: false
     },
     hasExpandAll: {
       // 默认收起展示数量
       type: Boolean,
-      default: false,
+      default: false
     },
     hideLabel: {
       // 是否隐藏标签
       type: Boolean,
-      default: false,
+      default: false
     },
     labelAlign: {
       //标签对齐方式
       type: String,
-      default: "right",
-    },
+      default: 'right'
+    }
   },
   data() {
     return {
@@ -156,145 +156,143 @@ export default {
       isExpandStatus: false, // 是否展开搜索条件
       isChange: false, // 是否展示变式下拉框
       saveList: [], // 搜索保存数据列表
-      saveFormName: "", // 当前保存数据名称
+      saveFormName: '', // 当前保存数据名称
       isSaveShow: false, // 是否展示保存操作
       isSelectShow: false, // 是否展示选择操作
-      selectForm: "", // 当前选中数据
+      selectForm: '', // 当前选中数据
       isExpandAll: true,
       span: 6,
       currentTemplate: {},
       variantList: [],
       varianId: [],
-      systemName: "shopManagement",
-    };
+      systemName: 'shopManagement'
+    }
   },
   watch: {
     modelValue: {
       handler(newVal) {
         if (JSON.stringify(newVal) !== JSON.stringify(this.form)) {
-          this.form = JSON.parse(JSON.stringify(newVal));
+          this.form = JSON.parse(JSON.stringify(newVal))
         }
       },
-      deep: true,
+      deep: true
     },
     form: {
       handler(newVal) {
         if (JSON.stringify(newVal) !== JSON.stringify(this.modelValue)) {
-          this.$emit("update:modelValue", newVal);
+          this.$emit('update:modelValue', newVal)
         }
       },
-      deep: true,
+      deep: true
     },
     options: {
       handler(newVal) {
         // 变化时计算稿表格高度
-        this.$bus.$emit("setTableHeight")
+        this.$bus.$emit('setTableHeight')
       },
-      deep: true,
-    },
+      deep: true
+    }
   },
   computed: {
     // 是否显示展开关闭按钮
     isExpandNumber() {
       let spans = this.options.reduce((sum, item) => sum + (item.span || this.span), 0)
-      return (spans - 24) > 0;
+      return spans - 24 > 0
     },
     // 是否行内显示按钮
     isExpandRow() {
-      const spans = this.options.reduce((sum, item) => sum + (item.span || this.span), 0);
-      const remainder = spans % 24;
+      const spans = this.options.reduce((sum, item) => sum + (item.span || this.span), 0)
+      const remainder = spans % 24
 
       if (spans > 18) {
-        return !this.isExpandStatus || remainder === 0 || (remainder > 18 && remainder < 24);
+        return !this.isExpandStatus || remainder === 0 || (remainder > 18 && remainder < 24)
       }
 
       return false
-    },
+    }
   },
   mounted() {
-    this.isExpandStatus = this.isExpand;
-    this.form = JSON.parse(JSON.stringify(this.modelValue));
+    this.isExpandStatus = this.isExpand
+    this.form = JSON.parse(JSON.stringify(this.modelValue))
     this.defaultForm =
-      JSON.stringify(this.defaultForm) === "{}"
-        ? JSON.parse(JSON.stringify(this.modelValue))
-        : this.defaultForm;
+      JSON.stringify(this.defaultForm) === '{}' ? JSON.parse(JSON.stringify(this.modelValue)) : this.defaultForm
   },
   methods: {
     // 是否默认展示
     isDefaultShow(index) {
       let span = this.options.slice(0, index + 1).reduce((sum, item) => sum + (item.span || this.span), 0)
-      return span <= 24;
+      return span <= 24
     },
     // 切换展开状态
     handleExpandStatus() {
-      this.isExpandStatus = !this.isExpandStatus;
-      this.$bus.$emit("setTableHeight")
+      this.isExpandStatus = !this.isExpandStatus
+      this.$bus.$emit('setTableHeight')
     },
     // 根据renderType设置对应组件
     setComponent(type) {
       const typeList = {
-        input: "SearchInput",
-        select: "SearchSelect",
-        date: "SearchDate",
-        dates: "SearchDates",
-        dateRange: "SearchDateRange",
-        cascader: "SearchCascader",
-      };
-      return typeList[type] || "SearchInput";
+        input: 'SearchInput',
+        select: 'SearchSelect',
+        date: 'SearchDate',
+        dates: 'SearchDates',
+        dateRange: 'SearchDateRange',
+        cascader: 'SearchCascader'
+      }
+      return typeList[type] || 'SearchInput'
     },
     // 触发提交
     submitForm(formEl) {
-      if (!this.$refs[formEl]) return;
-      this.$refs[formEl].validate((valid) => {
+      if (!this.$refs[formEl]) return
+      this.$refs[formEl].validate(valid => {
         if (valid) {
-          this.$emit("search");
+          this.$emit('search')
         }
-      });
+      })
     },
     // 重置条件
     resetForm(formEl) {
-      if (!this.$refs[formEl]) return;
-      this.$refs[formEl].resetFields();
-      this.form = JSON.parse(JSON.stringify(this.defaultForm));
+      if (!this.$refs[formEl]) return
+      this.$refs[formEl].resetFields()
+      this.form = JSON.parse(JSON.stringify(this.defaultForm))
       // 保留页面table分页数据
-      this.form.size = this.modelValue.size;
+      this.form.size = this.modelValue.size
       // this.form.page = this.modelValue.page;
-      this.$emit("reset");
+      this.$emit('reset')
     },
 
     // 关闭变式
     handleChangeHide(vis) {
       if (vis === false) {
-        this.isChange = false;
-        this.isSaveShow = false;
-        this.isSelectShow = false;
-        this.saveFormName = "";
-        this.selectForm = "";
+        this.isChange = false
+        this.isSaveShow = false
+        this.isSelectShow = false
+        this.saveFormName = ''
+        this.selectForm = ''
       }
     },
     // 保存搜索表单
     handleSaveSearchForm() {
       if (this.saveKey && this.isSave) {
         if (Object.keys(this.form).length === 0) {
-          this.$message.error("搜索条件为空！");
-          return;
+          this.$message.error('搜索条件为空！')
+          return
         }
         let tempObj = Object.assign({}, this.form, {
           searchSaveName: this.saveFormName,
-          id: dayjs().valueOf() + Math.random() + "",
-        });
+          id: dayjs().valueOf() + Math.random() + ''
+        })
         let obj = {
           route: this.$route.name,
           system: this.systemName,
-          variant: [tempObj],
-        };
-        let resObj = this.variantList.find((it) => {
-          return it.route === this.$route.name;
-        });
+          variant: [tempObj]
+        }
+        let resObj = this.variantList.find(it => {
+          return it.route === this.$route.name
+        })
         if (resObj) {
-          resObj.variant.push(tempObj);
+          resObj.variant.push(tempObj)
         } else {
-          this.variantList.push(obj);
+          this.variantList.push(obj)
         }
         if (this.isCloud) {
           let params = {
@@ -302,50 +300,50 @@ export default {
             username: JSON.parse(sessionStorage.userAuthInfo).username,
             system: this.systemName,
             menu: this.saveKey,
-            content: JSON.stringify(this.variantList),
-          };
+            content: JSON.stringify(this.variantList)
+          }
         } else {
-          localStorage.setItem("variantList", JSON.stringify(this.variantList));
+          localStorage.setItem('variantList', JSON.stringify(this.variantList))
         }
       }
     },
     // 选择保存过的搜索历史
     handleSearchSelect(val) {
-      let obj = this.saveList.find((it) => {
-        return it.id === val;
-      });
+      let obj = this.saveList.find(it => {
+        return it.id === val
+      })
       if (obj) {
-        let rObj = JSON.parse(JSON.stringify(obj));
-        delete rObj.id;
-        delete rObj.searchSaveName;
-        this.$emit("update:modelValue", rObj);
+        let rObj = JSON.parse(JSON.stringify(obj))
+        delete rObj.id
+        delete rObj.searchSaveName
+        this.$emit('update:modelValue', rObj)
       }
     },
     // 删除保存过的搜索历史
     handleDeleteSearchList(index) {
-      let tempList = JSON.parse(JSON.stringify(this.saveList));
-      tempList.splice(index, 1);
+      let tempList = JSON.parse(JSON.stringify(this.saveList))
+      tempList.splice(index, 1)
       if (this.saveKey && this.isSave) {
         // 更新逻辑，视具体API而定
       }
     },
     // 禁止选择日期
-    disabledDate(date, currentSource, limitDate = "") {
+    disabledDate(date, currentSource, limitDate = '') {
       if (limitDate) {
-        if (currentSource === "prev") {
-          return dayjs(date.getTime()).isAfter(dayjs(limitDate), "day");
+        if (currentSource === 'prev') {
+          return dayjs(date.getTime()).isAfter(dayjs(limitDate), 'day')
         }
-        if (currentSource === "next") {
-          return dayjs(date.getTime()).isBefore(dayjs(limitDate), "day");
+        if (currentSource === 'next') {
+          return dayjs(date.getTime()).isBefore(dayjs(limitDate), 'day')
         }
       }
     },
     // 一键收缩展开
     expandAll() {
-      this.isExpandAll = !this.isExpandAll;
+      this.isExpandAll = !this.isExpandAll
     }
-  },
-};
+  }
+}
 </script>
 <style lang="scss" scoped>
 @keyframes slide-animation {
@@ -431,42 +429,7 @@ export default {
       display: flex;
       justify-content: flex-end;
       align-items: flex-end;
-      .reset {
-        width: 90px;
-        height: 32px;
-        margin-right: 0px;
-        border: none;
-        background-color: #eeeefc;
-        color: var(--el-color-primary);
-        border-radius: 2px;
-        font-size: 12px;
-        & > span {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-
-          .el-icon--left {
-            margin-right: 5px;
-          }
-        }
-      }
-
-      .submit {
-        width: 90px;
-        height: 32px;
-        background-color: var(--el-color-primary);
-        border: none;
-        border-radius: 2px;
-        & > span {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-
-          .el-icon--left {
-            margin-right: 5px;
-          }
-        }
-      }
+      
 
       .expand-button {
         display: flex;

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

@@ -2486,7 +2486,9 @@ function xd(e, n, t, r, a, o) {
           }, 8, ["class"]),
           D("div", Id, [
             C(c, {
-              class: "reset",
+              text: "",
+              bg: "",
+              type: "primary",
               onClick: n[0] || (n[0] = (f) => o.resetForm("searchForm"))
             }, {
               default: b(() => [
@@ -2495,7 +2497,6 @@ function xd(e, n, t, r, a, o) {
               _: 1
             }),
             C(c, {
-              class: "submit",
               type: "primary",
               onClick: n[1] || (n[1] = (f) => o.submitForm("searchForm"))
             }, {
@@ -2517,7 +2518,7 @@ function xd(e, n, t, r, a, o) {
     ])
   ]);
 }
-const tu = /* @__PURE__ */ le(wd, [["render", xd], ["__scopeId", "data-v-2aff72fc"]]), Bd = {
+const tu = /* @__PURE__ */ le(wd, [["render", xd], ["__scopeId", "data-v-09f23c0e"]]), Bd = {
   components: {
     lwTable: eu,
     lwSearch: tu
@@ -2802,8 +2803,11 @@ const nu = /* @__PURE__ */ le(Td, [["render", Vd]]), Dd = {
     };
   },
   watch: {
-    layout(e) {
-      this.$store.commit("SET_layout", e);
+    layout: {
+      handler(e) {
+        this.$store.commit("SET_layout", e), document.body.setAttribute("data-layout", e);
+      },
+      immediate: !0
     },
     menuIsCollapse(e) {
       this.$store.commit("TOGGLE_menuIsCollapse"), e ? this.$tool.data.set("APP_menuIsCollapse", "true") : this.$tool.data.remove("APP_menuIsCollapse");
@@ -3444,7 +3448,7 @@ function p8(e, n, t, r, a, o) {
     _: 3
   });
 }
-const g8 = /* @__PURE__ */ le(c8, [["render", p8], ["__scopeId", "data-v-f8dd58a6"]]);
+const g8 = /* @__PURE__ */ le(c8, [["render", p8], ["__scopeId", "data-v-28e65f0b"]]);
 var m2 = typeof globalThis < "u" ? globalThis : typeof window < "u" ? window : typeof global < "u" ? global : typeof self < "u" ? self : {};
 function au(e) {
   return e && e.__esModule && Object.prototype.hasOwnProperty.call(e, "default") ? e.default : e;
@@ -9182,7 +9186,7 @@ function a7(e, n, t, r, a, o) {
     _: 3
   }, 8, ["list", "disabled", "class"]);
 }
-const r7 = /* @__PURE__ */ le(t7, [["render", a7], ["__scopeId", "data-v-78e6fac1"]]), o7 = {
+const r7 = /* @__PURE__ */ le(t7, [["render", a7], ["__scopeId", "data-v-b4808c0f"]]), o7 = {
   name: "TreeItem",
   components: {
     draggable: _2
@@ -10141,7 +10145,7 @@ function x7(e, n, t, r, a, o) {
     _: 1
   }, 8, ["model"]);
 }
-const B7 = /* @__PURE__ */ le(g7, [["render", x7], ["__scopeId", "data-v-cd2d5518"]]), k7 = [
+const B7 = /* @__PURE__ */ le(g7, [["render", x7], ["__scopeId", "data-v-53321171"]]), k7 = [
   {
     title: "布局组件",
     list: [
@@ -10756,7 +10760,7 @@ function M7(e, n, t, r, a, o) {
     _: 3
   }, 8, ["style"]);
 }
-const T7 = /* @__PURE__ */ le(L7, [["render", M7], ["__scopeId", "data-v-cf755236"]]), V7 = {
+const T7 = /* @__PURE__ */ le(L7, [["render", M7], ["__scopeId", "data-v-38da41f6"]]), V7 = {
   props: {
     modelValue: { type: String, default: "" },
     // 传入的字符串
@@ -16774,7 +16778,7 @@ function iA(e, n, t, r, a, o) {
     }, 8, ["modelValue"])
   ]);
 }
-const sA = /* @__PURE__ */ le(nA, [["render", iA], ["__scopeId", "data-v-663b3bb3"]]);
+const sA = /* @__PURE__ */ le(nA, [["render", iA], ["__scopeId", "data-v-b0f0cda9"]]);
 function uA(e) {
   e.register("start", ({ HtmlNode: n, HtmlNodeModel: t, h: r }) => {
     class a extends n {