lw-cdp-ui 1.1.49 → 1.1.51

package/dist/components/lwFormMini/index.vue

@@ -30,6 +30,7 @@
 
           <!-- 表单内容 -->
           <el-form-item v-else
+                        :class="{ 'form-item-name-null': !item?.label }"
                         :prop="getPropName(item)"
                         :rules="rulesHandle(item)">
             <template #label>
@@ -524,7 +525,13 @@ export default {
   font-weight: bold;
   margin-bottom: 10px;
   margin-top: 10px;
-  // border-top: 1px solid #efefef;
+  border-top: 10px solid #f5f7fa;
   padding-top: 20px;
 }
+
+:deep(.form-item-name-null) {
+  > .el-form-item__label {
+    display: none !important;
+  }
+}
 </style>

package/dist/components/lwTableSelect/index.vue

@@ -130,9 +130,13 @@ export default {
       }
       let expression = this.$expression(this.formData)
       if (expression && this.params?.expression) {
-        this.formData.expression = ` ${this.params.expression} AND ${expression}`
+        this.formData.expression = `${this.params.expression} AND ${expression}`
+      } else if (expression) {
+        this.formData.expression = expression
+      } else if (this.params?.expression) {
+        this.formData.expression = this.params?.expression
       } else {
-        this.formData.expression = this.params.expression
+        this.formData.expression = ''
       }
       Object.assign(reqData, this.params, this.formData)
 

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

@@ -6498,6 +6498,7 @@ function _sfc_render$f(e, t, n, d, a, h) {
                   }, 1032, ["content"])) : createCommentVNode("", !0)
                 ], 8, _hoisted_1$a)) : (openBlock(), createBlock(ce, {
                   key: 1,
+                  class: normalizeClass({ "form-item-name-null": !(c != null && c.label) }),
                   prop: h.getPropName(c),
                   rules: h.rulesHandle(c)
                 }, {
@@ -6743,7 +6744,7 @@ function _sfc_render$f(e, t, n, d, a, h) {
                     ];
                   }),
                   _: 2
-                }, 1032, ["prop", "rules"]))
+                }, 1032, ["class", "prop", "rules"]))
               ]),
               _: 2
             }, 1032, ["span"]))
@@ -6778,7 +6779,7 @@ function _sfc_render$f(e, t, n, d, a, h) {
     [p, n.loading]
   ]);
 }
-const lwFormMini = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-32ee505f"]]), config$1 = {
+const lwFormMini = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["render", _sfc_render$f], ["__scopeId", "data-v-4f20df25"]]), config$1 = {
   icons: [
     {
       name: "默认",
@@ -7278,7 +7279,7 @@ const lwIconSelect = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["render", _sfc_r
     },
     //获取表格数据
     async getData() {
-      var a;
+      var a, h, y;
       this.loading = !0;
       var e = {
         [this.defaultProps.page]: this.currentPage - 1,
@@ -7286,20 +7287,20 @@ const lwIconSelect = /* @__PURE__ */ _export_sfc(_sfc_main$e, [["render", _sfc_r
         [this.defaultProps.keyword]: this.keyword
       };
       let t = this.$expression(this.formData);
-      t && ((a = this.params) != null && a.expression) ? this.formData.expression = ` ${this.params.expression} AND ${t}` : this.formData.expression = this.params.expression, Object.assign(e, this.params, this.formData);
+      t && ((a = this.params) != null && a.expression) ? this.formData.expression = `${this.params.expression} AND ${t}` : t ? this.formData.expression = t : (h = this.params) != null && h.expression ? this.formData.expression = (y = this.params) == null ? void 0 : y.expression : this.formData.expression = "", Object.assign(e, this.params, this.formData);
       var n = await this.apiObj(e), d = config.parseData(n);
       this.tableData = d.rows, this.total = d.total, this.loading = !1, this.$nextTick(() => {
         if (this.multiple)
-          this.defaultValue.forEach((y) => {
-            var m = this.tableData.filter((f) => f[this.defaultProps.value] === y.value);
-            m.length > 0 && this.$refs.table.toggleRowSelection(m[0], !0);
+          this.defaultValue.forEach((f) => {
+            var b = this.tableData.filter((V) => V[this.defaultProps.value] === f.value);
+            b.length > 0 && this.$refs.table.toggleRowSelection(b[0], !0);
           });
         else {
-          var h = this.tableData.filter((y) => {
-            var m;
-            return y[this.defaultProps.value] === ((m = this.defaultValue) == null ? void 0 : m.value);
+          var m = this.tableData.filter((f) => {
+            var b;
+            return f[this.defaultProps.value] === ((b = this.defaultValue) == null ? void 0 : b.value);
           });
-          this.$refs.table.setCurrentRow(h[0]);
+          this.$refs.table.setCurrentRow(m[0]);
         }
         this.$refs.table.setScrollTop(0);
       });
@@ -7440,7 +7441,7 @@ function _sfc_render$d(e, t, n, d, a, h) {
     _: 3
   }, 8, ["modelValue", "size", "clearable", "multiple", "collapse-tags", "collapse-tags-tooltip", "filterable", "placeholder", "disabled", "filter-method", "onRemoveTag", "onVisibleChange", "onClear"]);
 }
-const lwTableSelect = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["render", _sfc_render$d], ["__scopeId", "data-v-7f4d09a6"]]), _sfc_main$c = {
+const lwTableSelect = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["render", _sfc_render$d], ["__scopeId", "data-v-d3d0e6b4"]]), _sfc_main$c = {
   components: {
     lwUpload
   },