super-page-designer 2.1.34 → 2.1.38

package/dist/es/components/design/utils/assemblys-config.js

@@ -3085,8 +3085,12 @@ const standardButtonOperations = [
         value: "export"
       },
       {
-        label: "查询",
+        label: "刷新列表",
         value: "search"
+      },
+      {
+        label: "显示查询区域",
+        value: "showSearch"
       }
     ]
   },

package/dist/es/components/design/views/assemblys/common/common-select-page.vue.js

@@ -125,28 +125,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           order: sortColumnInfo.order == "ascending" ? "asc" : "desc"
         });
       }
-      if (searchModel.searchValue) {
-        param.searchForm.push({
-          propName: "code",
-          propDbName: "code",
-          operator: "like",
-          dataType: "string",
-          propValue: searchModel.searchValue,
-          joinSign: "or"
-        });
-        param.searchForm.push({
-          propName: "name",
-          propDbName: "name",
-          operator: "like",
-          dataType: "string",
-          propValue: searchModel.searchValue
-        });
-      }
       let systemId = searchModel.systemId;
       searchModel.tableType ? searchModel.tableType : 0;
       const url = window["$vueApp"].config.globalProperties.baseAPI + "/mms/app-pages/listBySystem/" + (systemId ? systemId : 0);
       console.log("searchPages", url);
-      http.post(url, param).then((res) => {
+      let queryParam = {
+        searchParam: param,
+        searchInfo: {}
+      };
+      if (searchModel.searchValue) {
+        queryParam.searchInfo.name = searchModel.searchValue;
+      }
+      http.post(url, queryParam).then((res) => {
         tableDatas.value = res.data;
         pagination.currentPage = res.page;
         pagination.pageSize = res.size;

package/dist/es/components/design/views/assemblys/data/component/data-origin.vue2.js

@@ -1,5 +1,5 @@
 import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode, unref, createCommentVNode, withDirectives, vShow, createElementBlock, Fragment, renderList, normalizeClass, toDisplayString, renderSlot } from "vue";
-import _sfc_main$1 from "../../form/common/dataorigin-input-table.vue2.js";
+import _sfc_main$1 from "../../form/common/dataorigin-input-table.vue.js";
 import { Codemirror } from "vue-codemirror";
 import _sfc_main$6 from "../../workflow/component/combination.vue.js";
 import _sfc_main$5 from "./return-set-table.vue.js";

package/dist/es/components/design/views/assemblys/form/common/data-format.vue.js

@@ -1,5 +1,5 @@
 import { defineComponent, ref, onMounted, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, unref, createCommentVNode, withDirectives, createTextVNode, createElementBlock, Fragment, renderList, vShow, normalizeClass } from "vue";
-import _sfc_main$3 from "./dataorigin-input-table.vue2.js";
+import _sfc_main$3 from "./dataorigin-input-table.vue.js";
 import _sfc_main$2 from "./condition.vue.js";
 import _sfc_main$1 from "./row-ul-li.vue.js";
 import "uuid";

package/dist/es/components/design/views/assemblys/form/common/dataorigin-input-table.vue.js

@@ -1,4 +1,155 @@
-import _sfc_main from "./dataorigin-input-table.vue2.js";
+import { defineComponent, ref, watch, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, withCtx, unref, createElementVNode, createTextVNode } from "vue";
+import { Search } from "@element-plus/icons-vue";
+const _hoisted_1 = { class: "dialog-footer" };
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "dataorigin-input-table",
+  props: {
+    modelValue: {
+      type: String,
+      default: ""
+    }
+  },
+  emits: ["update:modelValue"],
+  setup(__props, { emit: __emit }) {
+    const props = __props;
+    const inputValue = ref(props.modelValue);
+    const emit = __emit;
+    const tableData = [
+      {
+        id: 1,
+        date: "2016-05-03",
+        name: "Tom",
+        address: "No. 189, Grove St, Los Angeles"
+      },
+      {
+        id: 2,
+        date: "2016-05-02",
+        name: "Tom",
+        address: "No. 189, Grove St, Los Angeles"
+      },
+      {
+        id: 3,
+        date: "2016-05-04",
+        name: "Tom",
+        address: "No. 189, Grove St, Los Angeles"
+      },
+      {
+        id: 4,
+        date: "2016-05-01",
+        name: "Tom",
+        address: "No. 189, Grove St, Los Angeles"
+      }
+    ];
+    const dialogVisible = ref(false);
+    const selectData = ref([]);
+    watch(() => props.modelValue, (newVal) => {
+      inputValue.value = newVal;
+    });
+    function confirm() {
+      if (selectData.value.length > 0) {
+        let str = "";
+        selectData.value.forEach((item) => {
+          str = str + item.name + ",";
+        });
+        str = str.substring(0, str.length - 1);
+        emit("update:modelValue", str);
+        dialogVisible.value = false;
+      } else {
+        dialogVisible.value = false;
+      }
+    }
+    function handleSelectionChange(selection) {
+      selectData.value = selection;
+    }
+    function inputClick() {
+      dialogVisible.value = true;
+    }
+    return (_ctx, _cache) => {
+      const _component_el_icon = resolveComponent("el-icon");
+      const _component_el_input = resolveComponent("el-input");
+      const _component_el_table_column = resolveComponent("el-table-column");
+      const _component_el_table = resolveComponent("el-table");
+      const _component_el_button = resolveComponent("el-button");
+      const _component_el_dialog = resolveComponent("el-dialog");
+      return openBlock(), createElementBlock(Fragment, null, [
+        createVNode(_component_el_input, {
+          modelValue: inputValue.value,
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => inputValue.value = $event),
+          placeholder: "请选择",
+          onClick: inputClick
+        }, {
+          suffix: withCtx(() => [
+            createVNode(_component_el_icon, { onClick: inputClick }, {
+              default: withCtx(() => [
+                createVNode(unref(Search))
+              ]),
+              _: 1
+            })
+          ]),
+          _: 1
+        }, 8, ["modelValue"]),
+        createVNode(_component_el_dialog, {
+          modelValue: dialogVisible.value,
+          "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => dialogVisible.value = $event),
+          title: "Tips",
+          width: "500"
+        }, {
+          footer: withCtx(() => [
+            createElementVNode("div", _hoisted_1, [
+              createVNode(_component_el_button, {
+                onClick: _cache[1] || (_cache[1] = ($event) => dialogVisible.value = false)
+              }, {
+                default: withCtx(() => [
+                  createTextVNode("取消")
+                ]),
+                _: 1
+              }),
+              createVNode(_component_el_button, {
+                type: "primary",
+                onClick: confirm
+              }, {
+                default: withCtx(() => [
+                  createTextVNode(" 确定 ")
+                ]),
+                _: 1
+              })
+            ])
+          ]),
+          default: withCtx(() => [
+            createVNode(_component_el_table, {
+              data: tableData,
+              style: { "width": "100%" },
+              onSelectionChange: handleSelectionChange
+            }, {
+              default: withCtx(() => [
+                createVNode(_component_el_table_column, {
+                  type: "selection",
+                  width: "55"
+                }),
+                createVNode(_component_el_table_column, {
+                  prop: "date",
+                  label: "Date",
+                  width: "180"
+                }),
+                createVNode(_component_el_table_column, {
+                  prop: "name",
+                  label: "Name",
+                  width: "180"
+                }),
+                createVNode(_component_el_table_column, {
+                  prop: "address",
+                  label: "Address"
+                })
+              ]),
+              _: 1
+            })
+          ]),
+          _: 1
+        }, 8, ["modelValue"])
+      ], 64);
+    };
+  }
+});
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/form/common/dataorigin-input-table.vue2.js

@@ -1,155 +1,4 @@
-import { defineComponent, ref, watch, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, withCtx, unref, createElementVNode, createTextVNode } from "vue";
-import { Search } from "@element-plus/icons-vue";
-const _hoisted_1 = { class: "dialog-footer" };
-const _sfc_main = /* @__PURE__ */ defineComponent({
-  __name: "dataorigin-input-table",
-  props: {
-    modelValue: {
-      type: String,
-      default: ""
-    }
-  },
-  emits: ["update:modelValue"],
-  setup(__props, { emit: __emit }) {
-    const props = __props;
-    const inputValue = ref(props.modelValue);
-    const emit = __emit;
-    const tableData = [
-      {
-        id: 1,
-        date: "2016-05-03",
-        name: "Tom",
-        address: "No. 189, Grove St, Los Angeles"
-      },
-      {
-        id: 2,
-        date: "2016-05-02",
-        name: "Tom",
-        address: "No. 189, Grove St, Los Angeles"
-      },
-      {
-        id: 3,
-        date: "2016-05-04",
-        name: "Tom",
-        address: "No. 189, Grove St, Los Angeles"
-      },
-      {
-        id: 4,
-        date: "2016-05-01",
-        name: "Tom",
-        address: "No. 189, Grove St, Los Angeles"
-      }
-    ];
-    const dialogVisible = ref(false);
-    const selectData = ref([]);
-    watch(() => props.modelValue, (newVal) => {
-      inputValue.value = newVal;
-    });
-    function confirm() {
-      if (selectData.value.length > 0) {
-        let str = "";
-        selectData.value.forEach((item) => {
-          str = str + item.name + ",";
-        });
-        str = str.substring(0, str.length - 1);
-        emit("update:modelValue", str);
-        dialogVisible.value = false;
-      } else {
-        dialogVisible.value = false;
-      }
-    }
-    function handleSelectionChange(selection) {
-      selectData.value = selection;
-    }
-    function inputClick() {
-      dialogVisible.value = true;
-    }
-    return (_ctx, _cache) => {
-      const _component_el_icon = resolveComponent("el-icon");
-      const _component_el_input = resolveComponent("el-input");
-      const _component_el_table_column = resolveComponent("el-table-column");
-      const _component_el_table = resolveComponent("el-table");
-      const _component_el_button = resolveComponent("el-button");
-      const _component_el_dialog = resolveComponent("el-dialog");
-      return openBlock(), createElementBlock(Fragment, null, [
-        createVNode(_component_el_input, {
-          modelValue: inputValue.value,
-          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => inputValue.value = $event),
-          placeholder: "请选择",
-          onClick: inputClick
-        }, {
-          suffix: withCtx(() => [
-            createVNode(_component_el_icon, { onClick: inputClick }, {
-              default: withCtx(() => [
-                createVNode(unref(Search))
-              ]),
-              _: 1
-            })
-          ]),
-          _: 1
-        }, 8, ["modelValue"]),
-        createVNode(_component_el_dialog, {
-          modelValue: dialogVisible.value,
-          "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => dialogVisible.value = $event),
-          title: "Tips",
-          width: "500"
-        }, {
-          footer: withCtx(() => [
-            createElementVNode("div", _hoisted_1, [
-              createVNode(_component_el_button, {
-                onClick: _cache[1] || (_cache[1] = ($event) => dialogVisible.value = false)
-              }, {
-                default: withCtx(() => [
-                  createTextVNode("取消")
-                ]),
-                _: 1
-              }),
-              createVNode(_component_el_button, {
-                type: "primary",
-                onClick: confirm
-              }, {
-                default: withCtx(() => [
-                  createTextVNode(" 确定 ")
-                ]),
-                _: 1
-              })
-            ])
-          ]),
-          default: withCtx(() => [
-            createVNode(_component_el_table, {
-              data: tableData,
-              style: { "width": "100%" },
-              onSelectionChange: handleSelectionChange
-            }, {
-              default: withCtx(() => [
-                createVNode(_component_el_table_column, {
-                  type: "selection",
-                  width: "55"
-                }),
-                createVNode(_component_el_table_column, {
-                  prop: "date",
-                  label: "Date",
-                  width: "180"
-                }),
-                createVNode(_component_el_table_column, {
-                  prop: "name",
-                  label: "Name",
-                  width: "180"
-                }),
-                createVNode(_component_el_table_column, {
-                  prop: "address",
-                  label: "Address"
-                })
-              ]),
-              _: 1
-            })
-          ]),
-          _: 1
-        }, 8, ["modelValue"])
-      ], 64);
-    };
-  }
-});
+import _sfc_main from "./dataorigin-input-table.vue.js";
 export {
   _sfc_main as default
 };

package/dist/es/components/design/views/assemblys/form/common/suffixmodule.vue.js

@@ -48,6 +48,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       { label: "新页签", value: "newTab" },
       { label: "局部刷新", value: "refresh" }
     ];
+    const mobileWayList = [
+      { label: "弹窗", value: "popup" },
+      { label: "局部刷新", value: "refresh" }
+    ];
     const dialogTypeList = [
       { label: "弹框", value: "dialog" },
       { label: "抽屉", value: "drawer" }
@@ -235,7 +239,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               placeholder: "请选择"
             }, {
               default: withCtx(() => [
-                (openBlock(), createElementBlock(Fragment, null, renderList(wayList, (item, index) => {
+                (openBlock(), createElementBlock(Fragment, null, renderList(mobileWayList, (item, index) => {
                   return createVNode(_component_el_option, {
                     key: index,
                     label: item.label,

package/dist/es/components/design/views/assemblys/form/label/label-attr-base.vue.js

@@ -65,7 +65,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           createVNode(_component_el_collapse, {
             modelValue: openCollapseItems.value,
-            "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => openCollapseItems.value = $event),
+            "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => openCollapseItems.value = $event),
             style: { "margin-top": "6px" }
           }, {
             default: withCtx(() => [
@@ -186,6 +186,36 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       ]),
                       _: 1
                     }),
+                    __props.configure.props.base.tittleShow ? (openBlock(), createBlock(_component_el_form_item, {
+                      key: 2,
+                      label: "是否是标题",
+                      class: "amb-design-attr-item"
+                    }, {
+                      default: withCtx(() => [
+                        createVNode(_component_el_radio_group, {
+                          modelValue: __props.configure.props.base.whetherTittle,
+                          "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => __props.configure.props.base.whetherTittle = $event),
+                          class: "ml-4"
+                        }, {
+                          default: withCtx(() => [
+                            createVNode(_component_el_radio, { value: true }, {
+                              default: withCtx(() => [
+                                createTextVNode("是")
+                              ]),
+                              _: 1
+                            }),
+                            createVNode(_component_el_radio, { value: false }, {
+                              default: withCtx(() => [
+                                createTextVNode("否")
+                              ]),
+                              _: 1
+                            })
+                          ]),
+                          _: 1
+                        }, 8, ["modelValue"])
+                      ]),
+                      _: 1
+                    })) : createCommentVNode("", true),
                     withDirectives(createVNode(_component_el_form_item, {
                       label: "标题",
                       class: "amb-design-attr-item"
@@ -193,7 +223,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_sfc_main$2, {
                           modelValue: __props.configure.props.base.title,
-                          "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => __props.configure.props.base.title = $event)
+                          "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.configure.props.base.title = $event)
                         }, null, 8, ["modelValue"])
                       ]),
                       _: 1
@@ -207,7 +237,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_input_number, {
                           modelValue: __props.configure.props.base.titleWidth,
-                          "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.configure.props.base.titleWidth = $event),
+                          "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => __props.configure.props.base.titleWidth = $event),
                           style: { "width": "100%" },
                           min: 0,
                           max: 200,

package/dist/es/components/design/views/assemblys/form/label/label-design.vue2.js

@@ -28,6 +28,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (propsBase["labelText"]) {
         tempProps["labelText"] = propsBase["labelText"];
       }
+      if (propsBase["whetherTittle"]) {
+        console.log("%c描述-170704", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", "是标题");
+        tempProps["whetherTittle"] = propsBase["whetherTittle"];
+      }
       const preSuffix = defineProps.preSuffix ? defineProps.preSuffix : {};
       if (preSuffix.preIconType || preSuffix.preText || preSuffix.sufIconType || preSuffix.sufText) {
         tempProps.preIconType = preSuffix.preIconType;

package/dist/es/components/design/views/assemblys/workflow/component/combination.vue.js

@@ -52,13 +52,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       tableData.value = props.list;
       if (tableData.value.length > 0) {
         tableData.value.forEach((item, index) => {
-          console.log("%c描述-112048", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", item);
           if (item.type === "date") {
             tableData.value[index].isDate = true;
           } else {
             tableData.value[index].isDate = false;
           }
-          let fieldItem = props.fieldMap[item.propName];
+          let fieldItem = props.fieldMap[item.propDbName];
           operationArr.value[index] = getOperators(fieldItem);
         });
       }
@@ -87,7 +86,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       row.propValue = modelValue;
     }
     function changeFieldName(index, row, propDbName) {
-      console.log("%c描述-164035", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.fieldMap);
       const item = props.fieldMap[propDbName];
       if (item.type === "date") {
         tableData.value[index].isDate = true;

package/dist/es/components/design/views/design/page-event/config.vue.js

@@ -1,5 +1,5 @@
-import _sfc_main from "./config.vue3.js";
-import "./config.vue2.js";
+import _sfc_main from "./config.vue2.js";
+import "./config.vue3.js";
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
 const config = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-26f79956"]]);
 export {