agilebuilder-ui 1.1.50 → 1.1.52-sit1

package/lib/{tab-content-iframe-index-c7bb8381.js → tab-content-iframe-index-b33c12ef.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-75ff2a06.js";
+import { _ as s } from "./index-b4a81c9e.js";
 const u = ["src"], f = s({ data: () => ({ src: null }), watch: { $route(n, c) {
   this.src = this.$route.query.src;
 } }, mounted() {

package/lib/{tab-content-index-95a59e50.js → tab-content-index-63eb906e.js}

@@ -1,5 +1,5 @@
-import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-75ff2a06.js";
-import { resolveComponent as u, openBlock as l, createBlock as b, withCtx as g, createVNode as v, TransitionGroup as L, createElementBlock as p, Fragment as C, renderList as T, createElementVNode as m, toDisplayString as w, normalizeClass as S, createCommentVNode as y } from "vue";
+import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-b4a81c9e.js";
+import { resolveComponent as u, openBlock as d, createBlock as b, withCtx as g, createVNode as v, TransitionGroup as L, createElementBlock as p, Fragment as T, renderList as C, createElementVNode as m, toDisplayString as w, normalizeClass as S, createCommentVNode as y } from "vue";
 const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ levelList: null }), computed: { levelListWithTitle() {
   return this.levelList.filter((e) => e.meta.title !== void 0 && e.meta.title !== null);
 } }, watch: { $route() {
@@ -8,7 +8,7 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
   this.getBreadcrumb();
 }, methods: { getBreadcrumb() {
   const { params: e } = this.$route;
-  console.log("this.$route.matched==", this.$route.matched);
+  this.$route.matched;
   let t = this.$route.matched.filter((a) => {
     if (a.name) {
       var r = _(a.path);
@@ -17,12 +17,12 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
   });
   if (t) {
     let a;
-    const r = x(), o = window.$vueApp.config.globalProperties.systemNameObj;
-    o && (a = o[r]), t = [{ path: "/", redirect: "noredirect", meta: { title: a } }].concat(t);
-    const s = P.get("selectMenu"), d = window.$vueApp.config.globalProperties._selectMenu;
-    let n;
-    if (d ? n = d : s && (n = s), n) {
-      const i = n.substring(0, n.indexOf("~~")), c = n.substring(n.indexOf("~~") + 2);
+    const r = x(), n = window.$vueApp.config.globalProperties.systemNameObj;
+    n && (a = n[r]), t = [{ path: "/", redirect: "noredirect", meta: { title: a } }].concat(t);
+    const s = P.get("selectMenu"), l = window.$vueApp.config.globalProperties._selectMenu;
+    let o;
+    if (l ? o = l : s && (o = s), o) {
+      const i = o.substring(0, o.indexOf("~~")), c = o.substring(o.indexOf("~~") + 2);
       if (t && t.length > 0) {
         const $ = t[t.length - 1];
         this.isShouldConcatLastMenu(c, i, $) && t.push({ path: i, meta: { title: c } });
@@ -35,9 +35,9 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
   return !(!this.isTitleNotEqual(e, a) || !this.isPathNotEqual(t, a));
 }, isTitleNotEqual(e, t) {
   return !(!e || !t.meta || e === t.meta.title || e === this.$t(t.meta.title));
-}, isPathNotEqual: (e, t) => !(!e || !t.path || e === t.path) } }, [["render", function(e, t, a, r, o, s) {
-  const d = u("el-breadcrumb-item"), n = u("el-breadcrumb");
-  return l(), b(n, { class: "app-breadcrumb", separator: ">" }, { default: g(() => [v(L, { name: "breadcrumb", tag: "span" }, { default: g(() => [(l(!0), p(C, null, T(s.levelListWithTitle, (i, c) => (l(), b(d, { key: i.path + "-" + c }, { default: g(() => [m("span", k, w(e.$t(i.meta.title)), 1)]), _: 2 }, 1024))), 128))]), _: 1 })]), _: 1 });
+}, isPathNotEqual: (e, t) => !(!e || !t.path || e === t.path) } }, [["render", function(e, t, a, r, n, s) {
+  const l = u("el-breadcrumb-item"), o = u("el-breadcrumb");
+  return d(), b(o, { class: "app-breadcrumb", separator: ">" }, { default: g(() => [v(L, { name: "breadcrumb", tag: "span" }, { default: g(() => [(d(!0), p(T, null, C(s.levelListWithTitle, (i, c) => (d(), b(l, { key: i.path + "-" + c }, { default: g(() => [m("span", k, w(e.$t(i.meta.title)), 1)]), _: 2 }, 1024))), 128))]), _: 1 })]), _: 1 });
 }], ["__scopeId", "data-v-768a430c"]]), { body: B } = document, E = { watch: { $route(e) {
   this.device === "mobile" && this.sidebar.opened && h.dispatch("closeSidebar", { withoutAnimation: !1 });
 } }, beforeMount() {
@@ -76,8 +76,8 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
   if (e.routePath === "/iframe-page/page") {
     let a, r = "";
     if (e.routeQuery)
-      for (const o in e.routeQuery)
-        o === "src" ? a = e.routeQuery[o] : r += o + "=" + e.routeQuery[o] + "&";
+      for (const n in e.routeQuery)
+        n === "src" ? a = e.routeQuery[n] : r += n + "=" + e.routeQuery[n] + "&";
     a && (t = a), r && (t += "?" + r);
   } else if (e.routePath.indexOf("http:") < 0 && e.routePath.indexOf("https:") < 0 && (t = "#"), t = e.routePath.indexOf("?") >= 0 ? t + e.routePath + "&" : t + e.routePath + "?", e.routeQuery)
     for (const a in e.routeQuery)
@@ -87,16 +87,16 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
   if (e && typeof e.data == "string" && e.data === "refreshTabContent")
     window.location.reload();
   else if (e && typeof e.data == "string" && e.data.indexOf("loginTimeout") >= 0)
-    console.log("tab-content-接收到登录超时的信息---event.data=", e.data), window.parent.postMessage(e.data, "*");
+    e.data, window.parent.postMessage(e.data, "*");
   else if (e && typeof e.data == "string" && e.data === "return-to-system-list") {
     this.$store.commit("clear_tabs");
     let t = "_IS_APP_LIST";
     const a = window.sessionStorage.getItem(t);
     a !== void 0 && a === "true" ? this.$router.push({ path: "/mms/apps/list" }) : this.$router.push({ path: "/mms/systems/list" });
   }
-} } }, V = ["src"], Q = { key: 1, class: "default-page-tip" }, R = { class: "default-page-tip-msg" }, q = { class: "default-page-tip-item" }, z = { class: "default-page-tip-item" }, j = { class: "main-container" }, W = f({ name: "Layout", components: { Menubar: O, Breadcrumb: A, TabContent: f(N, [["render", function(e, t, a, r, o, s) {
-  const d = u("el-tab-pane"), n = u("el-tabs");
-  return e.openTab && e.openTab.length > 0 ? (l(), b(n, { key: 0, modelValue: s.activeIndex, "onUpdate:modelValue": t[0] || (t[0] = (i) => s.activeIndex = i), class: "nav-tab menu-tab-container", closable: "", onTabRemove: s.closeSelectedTag }, { default: g(() => [(l(!0), p(C, null, T(e.openTab, (i) => (l(), b(d, { key: i.code, label: i.name, name: i.code }, { default: g(() => [m("iframe", { ref_for: !0, ref: "tabMainContent", src: s.getFullPath(i), class: "tab-main-content", name: "tab-main-content", frameborder: "0" }, null, 8, V)]), _: 2 }, 1032, ["label", "name"]))), 128))]), _: 1 }, 8, ["modelValue", "onTabRemove"])) : (l(), p("div", Q, [m("div", R, [m("div", q, w(o.defaultPageTipCn), 1), m("div", z, w(o.defaultPageTipEn), 1)])]));
+} } }, V = ["src"], Q = { key: 1, class: "default-page-tip" }, R = { class: "default-page-tip-msg" }, q = { class: "default-page-tip-item" }, z = { class: "default-page-tip-item" }, j = { class: "main-container" }, W = f({ name: "Layout", components: { Menubar: O, Breadcrumb: A, TabContent: f(N, [["render", function(e, t, a, r, n, s) {
+  const l = u("el-tab-pane"), o = u("el-tabs");
+  return e.openTab && e.openTab.length > 0 ? (d(), b(o, { key: 0, modelValue: s.activeIndex, "onUpdate:modelValue": t[0] || (t[0] = (i) => s.activeIndex = i), class: "nav-tab menu-tab-container", closable: "", onTabRemove: s.closeSelectedTag }, { default: g(() => [(d(!0), p(T, null, C(e.openTab, (i) => (d(), b(l, { key: i.code, label: i.name, name: i.code }, { default: g(() => [m("iframe", { ref_for: !0, ref: "tabMainContent", src: s.getFullPath(i), class: "tab-main-content", name: "tab-main-content", frameborder: "0" }, null, 8, V)]), _: 2 }, 1032, ["label", "name"]))), 128))]), _: 1 }, 8, ["modelValue", "onTabRemove"])) : (d(), p("div", Q, [m("div", R, [m("div", q, w(n.defaultPageTipCn), 1), m("div", z, w(n.defaultPageTipEn), 1)])]));
 }], ["__scopeId", "data-v-a5252a92"]]) }, mixins: [E], data: () => ({ showMenuRoute: I(), systemCode: null }), computed: { sidebar() {
   return this.$store.state.app.sidebar;
 }, device() {
@@ -104,12 +104,12 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
 }, classObj() {
   return { hideSidebar: !this.sidebar.opened, openSidebar: this.sidebar.opened, withoutAnimation: this.sidebar.withoutAnimation, mobile: this.device === "mobile" };
 } }, created() {
-  this.systemCode = window.$vueApp.config.globalProperties.customSystem, console.log("新菜单组件-----systemCode====", this.systemCode);
+  this.systemCode = window.$vueApp.config.globalProperties.customSystem, this.systemCode;
 }, methods: { handleClickOutside() {
   this.$store.dispatch("closeSidebar", { withoutAnimation: !1 });
-} } }, [["render", function(e, t, a, r, o, s) {
-  const d = u("menubar"), n = u("breadcrumb"), i = u("tab-content");
-  return l(), p("div", { class: S([s.classObj, "app-wrapper"]) }, [s.device === "mobile" && s.sidebar.opened ? (l(), p("div", { key: 0, class: "drawer-bg", onClick: t[0] || (t[0] = (...c) => s.handleClickOutside && s.handleClickOutside(...c)) })) : y("", !0), v(d, { "system-code": o.systemCode, collapse: !0, class: "sidebar-container" }, null, 8, ["system-code"]), m("div", j, [o.showMenuRoute ? (l(), b(n, { key: 0 })) : y("", !0), v(i)])], 2);
+} } }, [["render", function(e, t, a, r, n, s) {
+  const l = u("menubar"), o = u("breadcrumb"), i = u("tab-content");
+  return d(), p("div", { class: S([s.classObj, "app-wrapper"]) }, [s.device === "mobile" && s.sidebar.opened ? (d(), p("div", { key: 0, class: "drawer-bg", onClick: t[0] || (t[0] = (...c) => s.handleClickOutside && s.handleClickOutside(...c)) })) : y("", !0), v(l, { "system-code": n.systemCode, collapse: !0, class: "sidebar-container" }, null, 8, ["system-code"]), m("div", j, [n.showMenuRoute ? (d(), b(o, { key: 0 })) : y("", !0), v(i)])], 2);
 }], ["__scopeId", "data-v-5c0a6bf6"]]);
 export {
   W as default

package/lib/{tache-subprocess-history-106dc6ec.js → tache-subprocess-history-906be146.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as t, openBlock as a, createElementBlock as s, createElementVNode as y, createVNode as l, withCtx as r, createTextVNode as n, toDisplayString as p, createCommentVNode as c, createBlock as h } from "vue";
-import { _ as I } from "./index-75ff2a06.js";
+import { _ as I } from "./index-b4a81c9e.js";
 const g = { style: { "padding-bottom": "10px" } }, k = { key: 0, class: "graphDiv" }, N = I({ name: "TacheSubprocessHistory", data: () => ({ type: "graph", workflowId: null }), created() {
   const o = this.$route.query.workflowId;
   o && (this.workflowId = parseInt(o));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.50",
+  "version": "1.1.52-sit1",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/department-tree-inline/src/search-result.vue

@@ -151,7 +151,8 @@ export default {
     },
     // 添加用户
     addUser(index, row) {
-      $emit(this, 'addUser', index, JSON.parse(JSON.stringify(row)))
+	  // JSON.parse(JSON.stringify(row)) 转换对象是为了解决添加数据时浏览器崩溃
+	  $emit(this, 'addUser', index, JSON.parse(JSON.stringify(row)))
     },
     selectUser(selectVal) {
       // console.log('selectUser', selectVal)

package/packages/department-user-tree-inline/src/search-result.vue

@@ -202,7 +202,8 @@ export default {
     },
     // 添加用户
     addUser(index, row) {
-      this.$emit('addUser', index, JSON.parse(JSON.stringify(row)))
+	  // JSON.parse(JSON.stringify(row)) 转换对象是为了解决添加数据时浏览器崩溃
+	  this.$emit('addUser', index, JSON.parse(JSON.stringify(row)))
     },
     selectUser(selectVal) {
       // console.log('selectUser', selectVal)

package/packages/dynamic-source-select/src/dynamic-source-select.vue

@@ -24,6 +24,14 @@
       @visible-change="visibleChange"
       @remove-tag="removeTag(remote, $event)"
     >
+     <template v-if="isSearch" #header>
+      <el-checkbox
+        v-model="checkEmptyValue"
+        @change="changeEmptyValue"
+      >
+        {{$t('imatrixUIPublicModel.emptyValue')}}
+      </el-checkbox>
+    </template>
       <template v-if="descriptionAttribute">
         <div v-if="optionWidth > 0" :style="{ width: optionWidth + 'px' }">
           <el-option
@@ -172,6 +180,11 @@ export default {
     // 下拉框配置宽度
     optionWidth: {
       default: 0
+    },
+    // 是否是查询时
+    isSearch: {
+      type: Boolean,
+      default: false
     }
   },
   // 是否是页面预览, 从页面管理传递
@@ -211,7 +224,8 @@ export default {
       descriptionAttribute: null,
       queryParam: {}, // 请求参数,
       lastValues, // 最后一次的value值，用于判断是否是增加元素
-      optionItemList: [] // 多选时会多一个saveAll 全选 选项
+      optionItemList: [], // 多选时会多一个saveAll 全选 选项
+      checkEmptyValue: false // 是否查询空值
     }
   },
   watch: {
@@ -719,11 +733,11 @@ export default {
                 if (this.optionItems && this.optionItems.length > 0) {
                   this.optionItems.forEach((selectItem) => {
                     const addValue = selectItem[sourceColumnName]
-                    if (originalValue !== undefined && originalValue !== null && originalValue !== '') {
-                      originalValue = originalValue + ',' + addValue
-                    } else {
-                      originalValue = addValue
-                    }
+                      if (originalValue !== undefined && originalValue !== null && originalValue !== '') {
+                        originalValue = originalValue + ',' + addValue
+                      } else {
+                        originalValue = addValue
+                      }
                   })
                   value = originalValue
                 }
@@ -831,6 +845,13 @@ export default {
         }
         this.markValue = JSON.stringify(muMarkValue)
       }
+    },
+    changeEmptyValue(newVal) {  
+      this.$emit('changeEmptyValue', newVal)
+    },
+    // 清空 空值 勾选，列表查询空值 重置时调用了
+    clearEmptyValue(){
+      this.checkEmptyValue = false
     }
   },
   emits: [
@@ -841,7 +862,8 @@ export default {
     'focus',
     'blur',
     'visible-change',
-    'change'
+    'change',
+    'chnageEmptyValue'
   ]
 }
 </script>

package/packages/fs-preview/src/fs-preview.vue

@@ -304,7 +304,7 @@ export default {
             // window.$vueApp.config.globalProperties.kkFileViewUrl +
             // '?url=' +
             // encodeURIComponent(Base64.encode(myPreviewUrl))
-          /window.open(previewUrl, showName)
+          //window.open(previewUrl, showName)
           console.log('previewUrl====', previewUrl)
         } else {
           previewUrl = baseUrl + '/common/fs-upload/preview?jwt=' + token

package/packages/super-grid/src/normal-column-content.vue

@@ -107,6 +107,7 @@
             :is-show="operation.isShow"
             :label="operation.props.label ? operation.props.label : row[column.prop]"
             :on-click="operation.onClick"
+            :operation="operation"
             :operation-index="operationIndex"
             :operation-setting="operation.props"
             :event-name="operation.eventName"

package/packages/super-grid/src/row-operation.vue

@@ -1,10 +1,10 @@
 <template>
   <!--将@click改为@mousedown.native是因为操作列保存按钮时事件和input等组件的@blur冲突，导致保存需要保存两次，因为
       @blur先于@click执行的，所以只会执行@blur，@click就失效了，@mousedown是先于@blur执行的-->
-  <span :style="myStyle">
+  <span class="table-operation-row-btn" :style="myStyle">
     <template v-if="isShowButton()">
       <el-tooltip :disabled="tooltipDisabled" :content="label" placement="top">
-        <template v-if="operationSettingData.permission">
+        <template v-if="operationSettingData?.permission">
           <component
             v-bind="operationSettingData"
             :is="isElementType"
@@ -77,9 +77,13 @@ export default {
       type: String,
       default: null,
     },
+    operation: {
+      type: Object,
+      default: () => ({}),
+    },
     operationSetting: {
       type: Object,
-      default: null,
+      default: () => ({}),
     },
     operationIndex: {
       type: Number,
@@ -148,16 +152,16 @@ export default {
     },
     // 后置图标
     suffixIcon() {
-      if(['right'].includes(this.operationSettingData.iconPosition)) return this.operationSetting.iconValue
+      if(['right'].includes(this.operationSetting.iconPosition)) return this.operationSetting.iconValue
       return undefined
     },
     // 是否显示文字按钮 > 图标模式
     isTextIcon() {
       if (this.isTableBtnLinkShow) {
-        if (this.operationSettingData.isTextIcon === undefined) {
+        if (this.operationSetting.isTextIcon === undefined) {
           return this.isSaveRow || this.isDeleteRow || this.isEditRow || this.isRestoreRow
         }
-        return this.operationSettingData.isTextIcon
+        return this.operationSetting.isTextIcon
       } else {
         return false
       }
@@ -172,14 +176,14 @@ export default {
     },
     // 是否自动开启表格 按钮 转 文字按钮
     isTableBtnLinkShow() {
-      if (this.operationSetting.text) return true
+      if (this.operationSetting?.text) return true
       if (this.isTableBtnLink && this.elementType === 'el-button') {
-        return [this.operationSetting.text, this.operationSetting.plain, this.operationSetting.round].every(v => v === undefined)
+        return [this.operationSetting?.text, this.operationSetting?.plain, this.operationSetting?.round].every(v => v === undefined)
       }
       return false
     },
     operationSettingData() {
-      const dataList = { ...this.operationSetting }
+      const dataList = { ...(this.operationSetting ?? {}) }
       if (this.isTableBtnLinkShow) {
         dataList.underline = false
         delete dataList.text

package/packages/super-grid/src/search-form-item.vue

@@ -119,6 +119,14 @@
       filterable
       @change="setValueToModelProp(column.prop, $event)"
     >
+     <template v-if="column.dataType !== 'BOOLEAN'" #header>
+        <el-checkbox
+          v-model="checkEmptyValue"
+          @change="checkEmptyChange"
+        >
+          {{$t('imatrixUIPublicModel.emptyValue')}}
+        </el-checkbox>
+      </template>
       <el-option v-for="item in column.valueSet" :key="item.value" :label="item.label" :value="item.value" />
     </el-select>
     <el-select
@@ -133,6 +141,14 @@
       filterable
       @change="setValueToModelProp(column.prop, $event)"
     >
+     <template v-if="column.dataType !== 'BOOLEAN'" #header>
+        <el-checkbox
+          v-model="checkEmptyValue"
+          @change="checkEmptyChange"
+        >
+          {{$t('imatrixUIPublicModel.emptyValue')}}
+        </el-checkbox>
+      </template>
       <el-option v-for="item in column.valueSet" :key="item.value" :label="item.label" :value="item.value" />
     </el-select>
     <el-select
@@ -146,6 +162,14 @@
       multiple
       @change="setValueToModelProp(column.prop, $event)"
     >
+     <template #header>
+        <el-checkbox
+          v-model="checkEmptyValue"
+          @change="checkEmptyChange"
+        >
+          {{$t('imatrixUIPublicModel.emptyValue')}}
+        </el-checkbox>
+      </template>
       <el-option v-for="item in column.valueSet" :key="item.value" :label="item.label" :value="item.value" />
     </el-select>
     <template
@@ -156,6 +180,7 @@
       "
     >
       <dynamic-source-select
+        ref="selectRef"
         v-model:value="searchForm[column.prop]"
         :allow-create="dataSourceOptions?.controlConfig?.allowCreate"
         :base-props="{
@@ -168,7 +193,9 @@
         :list-toolbar-form-data="listToolbarFormData"
         :options="dataSourceOptions"
         :table-name="tableName"
+        :is-search="true"
         @change="multiselectChange"
+        @changeEmptyValue="checkEmptyChange"
       />
     </template>
     <!--
@@ -290,8 +317,8 @@ export default {
       dateVal: this.getFormItemValue(this.column.prop),
       controlConfig: getControlConfig(this.column),
       isShowEmtptyFlag: false,
-      dataSourceOptions: {}
-      // checkedEmpty: false,
+      dataSourceOptions: {},
+      checkEmptyValue: false // 是否选中空值
     }
   },
   computed: {
@@ -320,6 +347,22 @@ export default {
       }
     }
   },
+  watch:{
+    // 重置按钮时，清空下拉选中 空值 的选中状态
+    'column._resetValue': {
+      deep: true,
+      handler(newValue) {
+        if (newValue) {
+          // 表示是点击了重置按钮
+          this.checkEmptyValue = false
+          if(this.$refs.selectRef){
+            this.$refs.selectRef.clearEmptyValue()
+          }
+          this.column._resetValue = undefined
+        }
+      }
+    }
+  },
   created() {
     if (this.column.valueSetOptions) {
       this.moduleConfig = JSON.parse(this.column.valueSetOptions)
@@ -509,13 +552,11 @@ export default {
       }
     },
     multiselectChange(arr, selectedItem) {
-      debugger
       if (arr && arr.indexOf('saveAll') !== -1) {
         if (this.searchForm[this.column.prop] && typeof this.searchForm[this.column.prop] === 'string') {
           this.searchForm[this.column.prop] = this.searchForm[this.column.prop].split(',')
         }
       } else {
-        debugger
         this.searchForm[this.column.prop] = arr
       }
     },

package/packages/super-grid/src/search-methods.js

@@ -237,11 +237,28 @@ const searchMethods = {
       // if (!Array.isArray(values)) {
       //   selectValues = values.split(',')
       // }
+      // 是否已经封装了左括号
+      let isHasFirstLeftBracket = false
+      if(param.isEmptyValue){
+        const selectParam = Object.assign({}, param)
+        if(selectParam){
+          if(selectValues.length > 0){
+            selectParam.joinSign = 'or' // 将条件连接符修改为or，否则无法查询到值
+            isHasFirstLeftBracket = true
+            selectParam.leftBracket = '1' // 左边有1个括号
+          } else {
+            selectParam.joinSign = 'and' // 将条件连接符修改为or，否则无法查询到值
+          }
+          searchParams.push(selectParam)
+        }
+        // 用完该变量就修改这个变量的值，否则会导致下面的查询字段报错
+        param.isEmptyValue = false
+      }
       let num = 0
       selectValues.forEach((val) => {
         const selectParam = Object.assign({}, param)
         selectParam.joinSign = 'or' // 将条件连接符修改为or，否则无法查询到值
-        if (num === 0) {
+        if (num === 0 && !isHasFirstLeftBracket) {
           selectParam.leftBracket = '1' // 左边有1个括号
         }
         if (num === selectValues.length - 1) {

package/src/i18n/langs/cn.js

@@ -44,7 +44,8 @@ const cn = {
     forbidden: '禁用',
     startUsing: '启用',
     systemCode: '系统编码',
-    code: '编码'
+    code: '编码',
+    emptyValue: '空值'
   },
   imatrixUIMessage: {
     whetherToConfirmDeletion: '是否确认删除',

package/src/i18n/langs/en.js

@@ -44,7 +44,8 @@ const en = {
     forbidden: 'forbidden',
     startUsing: 'Start Using',
     systemCode: 'System Code',
-    code: 'Code'
+    code: 'Code',
+    emptyValue: 'Empty Value'
   },
   imatrixUIMessage: {
     whetherToConfirmDeletion: 'Whether To Confirm Deletion',

package/src/views/layout/EmptyLayout.vue

@@ -1,11 +1,3 @@
 <template>
   <router-view />
-</template>
-<script>
-import {showWatermarkNew} from '../../utils/watermark'
-export default {
-  mounted(){
-    showWatermarkNew()
-  }
-}
-</script>
+</template>

package/src/views/layout/NewLayout.vue

@@ -9,14 +9,10 @@
 
 <script>
 import { AppMain } from './components'
-import {showWatermarkNew} from '../../utils/watermark'
 export default {
   name: 'NewLayout',
   components: {
     AppMain,
-  },
-  mounted(){
-    showWatermarkNew()
   }
 }
 </script>

package/vite.config.js

@@ -12,7 +12,7 @@ export default defineConfig(({ mode }) => ({
     terser({
       compress: {
         drop_debugger: ['production'].includes(mode),
-        // pure_funcs: ['production'].includes(mode) ? ['console.log', 'console.info', 'console.warn', 'console.debug'] : [],
+        pure_funcs: ['production'].includes(mode) ? ['console.log', 'console.info', 'console.warn', 'console.debug'] : [],
       },
       output: {
         // 对于console.error，不做任何处理