super-page-designer 0.0.1-tmp7 → 0.0.2-tmp3

package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./common-variable-bind.vue2.js";
 import "./common-variable-bind.vue3.js";
 import _export_sfc from "../../../../../_virtual/_plugin-vue_export-helper.js";
-const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-46f68976"]]);
+const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7a7f7d66"]]);
 export {
   BindVariable as default
 };

package/dist/es/components/design/views/assemblys/common/common-variable-bind.vue2.js

@@ -4,7 +4,7 @@ import http from "agilebuilder-ui/src/utils/request";
 import { getUuidv4 } from "../../../utils/common-util.js";
 import { getTypeOptions, contextVarOptions, taskVarOptions } from "./common-variable-bind-option.js";
 import { usePageContextStore } from "../../../../../stores/page-store.js";
-const _withScopeId = (n) => (pushScopeId("data-v-46f68976"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-7a7f7d66"), n = n(), popScopeId(), n);
 const _hoisted_1 = { key: 0 };
 const _hoisted_2 = { style: { "margin-top": "10px", "font-size": "10px", "display": "flex", "align-items": "center", "justify-self": "center" } };
 const _hoisted_3 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("span", { style: { "margin-left": "5px" } }, "输入变量名后点击加号按钮添加", -1));
@@ -44,7 +44,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   emits: ["update:modelValue"],
   setup(__props, { emit: __emit }) {
-    const pageContextUtil = usePageContextStore(window["$pinia"]);
+    const pageContextUtil = usePageContextStore();
     const emits = __emit;
     const props = __props;
     const defalutValue = ref("");

package/dist/es/components/design/views/assemblys/data/bar-code/barcode-attr-base.vue.js

@@ -2,7 +2,7 @@ import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx
 import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
 import "@element-plus/icons-vue";
 import _sfc_main$2 from "../../common/common-attr-size.vue.js";
-import "../../form/common/dimension-input.vue2.js";
+import "../../form/common/dimension-input.vue.js";
 import "@element-plus/icons";
 import "agilebuilder-ui/src/utils/request";
 import _sfc_main$1 from "../../form/common/dataorigin-input-table.vue.js";
@@ -16,7 +16,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     default: () => ({ props: {} })
   },
   setup(__props) {
-    const openCollapseItems = ref("");
+    const openCollapseItems = ref([]);
     const dataRule = ref([]);
     ref(false);
     return (_ctx, _cache) => {

package/dist/es/components/design/views/assemblys/data/bar-code/barcode-attr-style.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, resolveComponent, openBlock, createBlock, withCtx, createVNode } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode } from "vue";
 import _sfc_main$1 from "../../form/common/attr-style.vue.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "barcode-attr-style",
@@ -6,6 +6,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     configure: Object
   },
   setup(__props) {
+    const openCollapseItems = ref([]);
     const blankOption = {
       showTittleFont: false,
       // 是否显示标题字体
@@ -35,8 +36,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }, {
         default: withCtx(() => [
           createVNode(_component_el_collapse, {
-            modelValue: _ctx.openCollapseItems,
-            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.openCollapseItems = $event),
+            modelValue: openCollapseItems.value,
+            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => openCollapseItems.value = $event),
             style: { "margin-top": "6px" }
           }, {
             default: withCtx(() => [

package/dist/es/components/design/views/assemblys/data/bar-code/barcode-design.vue2.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, onMounted, watch, openBlock, createElementBlock, normalizeClass, normalizeStyle } from "vue";
+import { defineComponent, ref, onMounted, watch, openBlock, createElementBlock, normalizeClass, normalizeStyle, withDirectives, createElementVNode, vShow } from "vue";
 import qrcode from "qrcode";
 import JsBarcode from "jsbarcode";
 import { caculateDetailComponentStyle, caculateComponentProps } from "../../../../utils/form-design-util.js";
@@ -67,14 +67,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         class: normalizeClass(designClass.value),
         style: normalizeStyle(designStyle.value)
       }, [
-        designProperty.value.type === "QR-code" ? (openBlock(), createElementBlock("img", {
-          key: 0,
-          src: qrUrl.value
-        }, null, 8, _hoisted_1)) : (openBlock(), createElementBlock("canvas", {
-          key: 1,
+        withDirectives(createElementVNode("canvas", {
           ref_key: "barcode",
           ref: barcode
-        }, null, 512))
+        }, null, 512), [
+          [vShow, designProperty.value.type === "br-code"]
+        ]),
+        withDirectives(createElementVNode("img", { src: qrUrl.value }, null, 8, _hoisted_1), [
+          [vShow, designProperty.value.type === "QR-code"]
+        ])
       ], 6);
     };
   }

package/dist/es/components/design/views/assemblys/data/component/attr-header.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./attr-header.vue2.js";
 import "./attr-header.vue3.js";
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const AttrHeader = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-f72f4657"]]);
+const AttrHeader = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-5458d957"]]);
 export {
   AttrHeader as default
 };

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

@@ -30,17 +30,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             class: normalizeClass({ selected: clickType.value === "advanced" }),
             onClick: _cache[1] || (_cache[1] = ($event) => changeType("advanced"))
           }, "高级", 2),
-          createElementVNode("label", {
-            class: normalizeClass({ selected: clickType.value === "import" }),
-            onClick: _cache[2] || (_cache[2] = ($event) => changeType("import"))
-          }, "导入配置", 2),
           createElementVNode("label", {
             class: normalizeClass({ selected: clickType.value === "style" }),
-            onClick: _cache[3] || (_cache[3] = ($event) => changeType("style"))
+            onClick: _cache[2] || (_cache[2] = ($event) => changeType("style"))
           }, "样式", 2),
           createElementVNode("label", {
             class: normalizeClass({ selected: clickType.value === "event" }),
-            onClick: _cache[4] || (_cache[4] = ($event) => changeType("event"))
+            onClick: _cache[3] || (_cache[3] = ($event) => changeType("event"))
           }, "事件", 2)
         ])
       ]);

package/dist/es/components/design/views/assemblys/data/component/attr-style.vue.js

@@ -1,5 +1,5 @@
 import { defineComponent, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, withCtx, createElementVNode, createBlock, createCommentVNode } from "vue";
-import "../../form/common/dimension-input.vue2.js";
+import "../../form/common/dimension-input.vue.js";
 import RowBackgroudColor from "./row-backgroud-color.vue.js";
 import _sfc_main$1 from "../../common/common-style-position.vue.js";
 import _sfc_main$2 from "../../common/common-style-margin.vue.js";

package/dist/es/components/design/views/assemblys/data/component/composite-header.vue.js

@@ -1,7 +1,7 @@
 import _sfc_main from "./composite-header.vue2.js";
 import "./composite-header.vue3.js";
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const CompositeHeader = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-4524bd8e"]]);
+const CompositeHeader = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-73667c88"]]);
 export {
   CompositeHeader as default
 };

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

@@ -3,6 +3,7 @@ import { Plus, EditPen, FolderAdd, Document, Delete } from "@element-plus/icons-
 import { getUuidv4 } from "../../../../utils/common-util.js";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { getTopGroupHeaderList, setGroupHeaderDataDisplayOrder, getChildrenList, addColumnToGroupHeaders, isLeafNode } from "../../../../utils/data-table-util.js";
+import eventBus from "../../../../utils/eventBus.js";
 const _hoisted_1 = { key: 0 };
 const _hoisted_2 = { style: { "display": "flex", "margin": "8px 0" } };
 const _hoisted_3 = { key: 0 };
@@ -56,7 +57,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     const fieldGroup = ref([]);
-    window["$eventBus"].$on("setFieldGroup", (value) => {
+    eventBus.$on("setFieldGroup", (value) => {
       if (value.length > 0) {
         fieldGroup.value = value;
         console.log("%c描述-164737", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", fieldGroup.value);
@@ -89,7 +90,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       notChooseListColumns.value = [];
       listColumns.forEach((column) => {
         if (column.props.base.prop !== "$selection" && column.props.base.prop !== "$index" && column.props.base.prop !== "operation") {
-          const hasColumns = groupHeaders.value.filter((item) => item.columnUuid && item.columnUuid === column.uuid);
+          const hasColumns = groupHeaders.value.filter(
+            (item) => item.columnUuid && item.columnUuid === column.uuid
+          );
           if (!hasColumns || hasColumns.length === 0) {
             notChooseListColumns.value.push(column);
           }
@@ -369,7 +372,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     function hadleDragStart(draggingNode, event) {
-      window["$eventBus"].$emit("hadleDragging", true);
+      eventBus.$emit("hadleDragging", true);
       dragNode.value = draggingNode;
     }
     function handleDrop(draggingNode, dropNode, dropType, ev) {
@@ -422,7 +425,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }
       setTimeout(() => {
-        window["$eventBus"].$emit("hadleDragging", false);
+        eventBus.$emit("hadleDragging", false);
       }, 50);
       console.log("%c描述-155324", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", dropData);
     }

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

@@ -1,7 +1,7 @@
 import _sfc_main from "./data-origin.vue2.js";
 import "./data-origin.vue3.js";
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const DataOrigin = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-d2060470"]]);
+const DataOrigin = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-eb7caa0f"]]);
 export {
   DataOrigin as default
 };

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

@@ -1,18 +1,28 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode, unref, createCommentVNode, withDirectives, vShow, createElementBlock, Fragment, renderList, normalizeClass, renderSlot } from "vue";
+import { defineComponent, ref, 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.vue.js";
 import { Codemirror } from "vue-codemirror";
-import _sfc_main$5 from "../../workflow/component/combination.vue.js";
-import _sfc_main$4 from "./return-set-table.vue.js";
-import _sfc_main$6 from "./column-config.vue.js";
-import _sfc_main$3 from "../../common/common-select-table.vue.js";
+import _sfc_main$6 from "../../workflow/component/combination.vue.js";
+import _sfc_main$5 from "./return-set-table.vue.js";
+import _sfc_main$7 from "./column-config.vue.js";
+import _sfc_main$4 from "../../common/common-select-table.vue.js";
 import { Search, Close } from "@element-plus/icons";
 import { queryTableFieldsOrMap } from "../../../../utils/page-table-util.js";
 import "uuid";
+import eventBus from "../../../../utils/eventBus.js";
 import StateButton from "../../common/state-button.vue.js";
-import _sfc_main$2 from "../../form/common/data-origin-service-in.vue.js";
+import _sfc_main$3 from "../../form/common/data-origin-service-in.vue.js";
+import _sfc_main$2 from "../../common/page-permission-select.vue.js";
+import { queryServiceReturnFields } from "../../../../utils/page-service-util.js";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = ["onClick"];
-const _hoisted_3 = { class: "dialog-footer" };
+const _hoisted_3 = { style: { "float": "left" } };
+const _hoisted_4 = { style: { "float": "right", "color": "var(--el-text-color-secondary)", "font-size": "13px" } };
+const _hoisted_5 = { style: { "float": "left" } };
+const _hoisted_6 = { style: { "float": "right", "color": "var(--el-text-color-secondary)", "font-size": "13px" } };
+const _hoisted_7 = { style: { "float": "left" } };
+const _hoisted_8 = { style: { "float": "right", "color": "var(--el-text-color-secondary)", "font-size": "13px" } };
+const _hoisted_9 = { style: { "float": "left" } };
+const _hoisted_10 = { style: { "float": "right", "color": "var(--el-text-color-secondary)", "font-size": "13px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "data-origin",
   props: {
@@ -51,22 +61,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const columnConfigVisible = ref(false);
     const combinationVisible = ref(false);
-    const parameterVisible = ref(false);
     const returnVisible = ref(false);
     const selectTableDialog = ref(null);
     const atPresentSortIndex = ref("");
     const defaultQueryVisible = ref(false);
     const dataOriginInfo = props.configure.props.dataOrigin;
+    if (!dataOriginInfo.service) {
+      dataOriginInfo.service = {};
+    }
     function seleteSort(index) {
       atPresentSortIndex.value = index;
     }
     function saveCondition(table) {
       props.configure.props.dataOrigin["sqlFilterCondition"] = JSON.stringify(table);
-      console.log(
-        "%c描述-142553",
-        "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px",
-        props.configure.props.dataOrigin["sqlFilterCondition"]
-      );
+      console.log("%c描述-142553", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.configure.props.dataOrigin["sqlFilterCondition"]);
     }
     function closeDefaultQuery() {
       defaultQueryVisible.value = false;
@@ -76,7 +84,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function setConfigure(tableData) {
       props.configure.items = tableData;
-      window["$eventBus"].$emit("reloadTable");
+      eventBus.$emit("reloadTable");
       columnConfigClose();
     }
     function selectTable() {
@@ -112,6 +120,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         });
       }
     }
+    function afterSelectService(type, code, name, serviceId) {
+      dataOriginInfo.service.simpleCode = code;
+      dataOriginInfo.service.name = name;
+      dataOriginInfo.service.id = serviceId;
+      getServiceReturnFields();
+    }
+    function getServiceReturnFields() {
+      const serviceId = dataOriginInfo.service.id;
+      if (!serviceId) {
+        props.configure.serviceFields = [];
+        props.configure.serviceDataField = null;
+        return;
+      }
+      queryServiceReturnFields(serviceId).then((fields) => {
+        props.configure.serviceFields = fields;
+      });
+    }
     function saveReturnSet(tableData) {
       console.log("%c描述-155222", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", tableData);
       props.configure.props.dataOrigin.returnSetList = tableData;
@@ -121,9 +146,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       returnVisible.value = false;
     }
     function removeReturnSet(rowVal) {
-      props.configure.props.dataOrigin.returnSetList = props.configure.props.dataOrigin.returnSetList.filter(
-        (item) => item != rowVal
-      );
+      props.configure.props.dataOrigin.returnSetList = props.configure.props.dataOrigin.returnSetList.filter((item) => item != rowVal);
     }
     function columnConfigClose() {
       columnConfigVisible.value = false;
@@ -131,8 +154,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function closeCombination() {
       combinationVisible.value = false;
     }
-    function handleCurrentChange() {
-    }
     function addSortField() {
       props.configure.props.dataOrigin.sortField.push({ name: "", type: "" });
       atPresentSortIndex.value = "";
@@ -148,9 +169,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_input = resolveComponent("el-input");
       const _component_el_option = resolveComponent("el-option");
       const _component_el_select = resolveComponent("el-select");
-      const _component_el_table_column = resolveComponent("el-table-column");
-      const _component_el_table = resolveComponent("el-table");
-      const _component_el_dialog = resolveComponent("el-dialog");
       const _component_el_collapse_item = resolveComponent("el-collapse-item");
       return openBlock(), createBlock(_component_el_collapse_item, {
         title: "数据",
@@ -342,9 +360,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     key: index,
                     onClick: ($event) => seleteSort(index),
                     style: { "margin-top": "10px" },
-                    class: normalizeClass(
-                      atPresentSortIndex.value === index ? "amb-design-attr-item-inline seleteSort" : "amb-design-attr-item-inline"
-                    )
+                    class: normalizeClass(atPresentSortIndex.value === index ? "amb-design-attr-item-inline seleteSort" : "amb-design-attr-item-inline")
                   }, [
                     createVNode(_component_el_select, {
                       modelValue: item.name,
@@ -390,10 +406,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               class: "amb-design-attr-item"
             }, {
               default: withCtx(() => [
-                createVNode(_sfc_main$1, {
-                  modelValue: __props.configure.props.dataOrigin.serveName,
-                  "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => __props.configure.props.dataOrigin.serveName = $event)
-                }, null, 8, ["modelValue"])
+                createVNode(_sfc_main$2, {
+                  pageDesign: __props.pageDesign,
+                  rowObj: unref(dataOriginInfo).service,
+                  onlyService: "",
+                  "onUpdate:modelValue": _cache[8] || (_cache[8] = (type, code, name, serviceId) => afterSelectService(type, code, name, serviceId))
+                }, null, 8, ["pageDesign", "rowObj"])
               ]),
               _: 1
             }, 512), [
@@ -446,136 +464,191 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ]),
               _: 1
             }, 512), [
-              [
-                vShow,
-                __props.remote && (__props.configure.props.dataOrigin.optionValueSetType === "dataTable" || __props.configure.props.dataOrigin.optionValueSetType === "service")
-              ]
+              [vShow, __props.remote && (__props.configure.props.dataOrigin.optionValueSetType === "dataTable" || __props.configure.props.dataOrigin.optionValueSetType === "service")]
             ]),
             __props.configure.props.dataOrigin.optionValueSetType === "service" ? (openBlock(), createBlock(_component_el_form_item, {
               key: 4,
-              label: "返回值设置",
+              label: "datas",
               class: "amb-design-attr-item"
             }, {
               default: withCtx(() => [
-                createVNode(StateButton, {
-                  buttonText: "查看",
-                  onClick: _cache[11] || (_cache[11] = ($event) => returnVisible.value = true),
-                  conditionData: __props.configure.props.dataOrigin.returnSetList
-                }, null, 8, ["conditionData"])
+                createVNode(_component_el_select, {
+                  modelValue: __props.configure.props.dataOrigin.service.datas,
+                  "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => __props.configure.props.dataOrigin.service.datas = $event),
+                  filterable: "",
+                  clearable: "",
+                  placeholder: "请选择"
+                }, {
+                  default: withCtx(() => [
+                    (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.showFields, (field, index) => {
+                      return openBlock(), createBlock(_component_el_option, {
+                        key: index,
+                        label: field.label,
+                        value: field.value
+                      }, {
+                        default: withCtx(() => [
+                          createElementVNode("span", _hoisted_3, toDisplayString(field.label), 1),
+                          createElementVNode("span", _hoisted_4, toDisplayString(field.type), 1)
+                        ]),
+                        _: 2
+                      }, 1032, ["label", "value"]);
+                    }), 128))
+                  ]),
+                  _: 1
+                }, 8, ["modelValue"])
               ]),
               _: 1
             })) : createCommentVNode("", true),
-            createVNode(_component_el_form_item, {
+            __props.configure.props.dataOrigin.optionValueSetType === "service" ? (openBlock(), createBlock(_component_el_form_item, {
+              key: 5,
+              label: "总页数",
+              class: "amb-design-attr-item"
+            }, {
+              default: withCtx(() => [
+                createVNode(_component_el_select, {
+                  modelValue: __props.configure.props.dataOrigin.service.pageCount,
+                  "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => __props.configure.props.dataOrigin.service.pageCount = $event),
+                  filterable: "",
+                  clearable: "",
+                  placeholder: "请选择"
+                }, {
+                  default: withCtx(() => [
+                    (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.showFields, (field, index) => {
+                      return openBlock(), createBlock(_component_el_option, {
+                        key: index,
+                        label: field.label,
+                        value: field.value
+                      }, {
+                        default: withCtx(() => [
+                          createElementVNode("span", _hoisted_5, toDisplayString(field.label), 1),
+                          createElementVNode("span", _hoisted_6, toDisplayString(field.type), 1)
+                        ]),
+                        _: 2
+                      }, 1032, ["label", "value"]);
+                    }), 128))
+                  ]),
+                  _: 1
+                }, 8, ["modelValue"])
+              ]),
+              _: 1
+            })) : createCommentVNode("", true),
+            __props.configure.props.dataOrigin.optionValueSetType === "service" ? (openBlock(), createBlock(_component_el_form_item, {
+              key: 6,
+              label: "总条数",
+              class: "amb-design-attr-item"
+            }, {
+              default: withCtx(() => [
+                createVNode(_component_el_select, {
+                  modelValue: __props.configure.props.dataOrigin.service.total,
+                  "onUpdate:modelValue": _cache[13] || (_cache[13] = ($event) => __props.configure.props.dataOrigin.service.total = $event),
+                  filterable: "",
+                  clearable: "",
+                  placeholder: "请选择"
+                }, {
+                  default: withCtx(() => [
+                    (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.showFields, (field, index) => {
+                      return openBlock(), createBlock(_component_el_option, {
+                        key: index,
+                        label: field.label,
+                        value: field.value
+                      }, {
+                        default: withCtx(() => [
+                          createElementVNode("span", _hoisted_7, toDisplayString(field.label), 1),
+                          createElementVNode("span", _hoisted_8, toDisplayString(field.type), 1)
+                        ]),
+                        _: 2
+                      }, 1032, ["label", "value"]);
+                    }), 128))
+                  ]),
+                  _: 1
+                }, 8, ["modelValue"])
+              ]),
+              _: 1
+            })) : createCommentVNode("", true),
+            __props.configure.props.dataOrigin.optionValueSetType === "service" ? (openBlock(), createBlock(_component_el_form_item, {
+              key: 7,
+              label: "页码",
+              class: "amb-design-attr-item"
+            }, {
+              default: withCtx(() => [
+                createVNode(_component_el_select, {
+                  modelValue: __props.configure.props.dataOrigin.service.pager,
+                  "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => __props.configure.props.dataOrigin.service.pager = $event),
+                  filterable: "",
+                  clearable: "",
+                  placeholder: "请选择"
+                }, {
+                  default: withCtx(() => [
+                    (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.showFields, (field, index) => {
+                      return openBlock(), createBlock(_component_el_option, {
+                        key: index,
+                        label: field.label,
+                        value: field.value
+                      }, {
+                        default: withCtx(() => [
+                          createElementVNode("span", _hoisted_9, toDisplayString(field.label), 1),
+                          createElementVNode("span", _hoisted_10, toDisplayString(field.type), 1)
+                        ]),
+                        _: 2
+                      }, 1032, ["label", "value"]);
+                    }), 128))
+                  ]),
+                  _: 1
+                }, 8, ["modelValue"])
+              ]),
+              _: 1
+            })) : createCommentVNode("", true),
+            __props.configure.props.dataOrigin.optionValueSetType === "dataTable" ? (openBlock(), createBlock(_component_el_form_item, {
+              key: 8,
               label: "查询条件",
               class: "amb-design-attr-item"
             }, {
               default: withCtx(() => [
                 createVNode(StateButton, {
-                  onClick: _cache[12] || (_cache[12] = ($event) => defaultQueryVisible.value = true),
+                  onClick: _cache[15] || (_cache[15] = ($event) => defaultQueryVisible.value = true),
                   conditionData: JSON.parse(__props.configure.props.dataOrigin.defaultQueryCriteria)
                 }, null, 8, ["conditionData"])
               ]),
               _: 1
-            }),
-            createVNode(_component_el_form_item, {
+            })) : createCommentVNode("", true),
+            __props.configure.props.dataOrigin.optionValueSetType === "dataTable" ? (openBlock(), createBlock(_component_el_form_item, {
+              key: 9,
               label: "过滤条件",
               class: "amb-design-attr-item"
             }, {
               default: withCtx(() => [
                 createVNode(StateButton, {
-                  onClick: _cache[13] || (_cache[13] = ($event) => combinationVisible.value = true),
+                  onClick: _cache[16] || (_cache[16] = ($event) => combinationVisible.value = true),
                   conditionData: JSON.parse(__props.configure.props.dataOrigin.sqlFilterCondition)
                 }, null, 8, ["conditionData"])
               ]),
               _: 1
-            }),
+            })) : createCommentVNode("", true),
             renderSlot(_ctx.$slots, "bottom", {
               row: __props.configure.props.dataOrigin
             }, void 0, true),
-            withDirectives(createVNode(_sfc_main$2, {
+            withDirectives(createVNode(_sfc_main$3, {
               ref: "dataOriginServiceInRef",
               dataOrigin: unref(dataOriginInfo)
             }, null, 8, ["dataOrigin"]), [
               [vShow, __props.configure.props.dataOrigin.optionValueSetType == "service"]
             ])
           ]),
-          createVNode(_component_el_dialog, {
-            modelValue: parameterVisible.value,
-            "onUpdate:modelValue": _cache[16] || (_cache[16] = ($event) => parameterVisible.value = $event),
-            title: "入参"
-          }, {
-            footer: withCtx(() => [
-              createElementVNode("div", _hoisted_3, [
-                createVNode(_component_el_button, {
-                  onClick: _cache[14] || (_cache[14] = ($event) => parameterVisible.value = false)
-                }, {
-                  default: withCtx(() => [
-                    createTextVNode("取消")
-                  ]),
-                  _: 1
-                }),
-                createVNode(_component_el_button, {
-                  type: "primary",
-                  onClick: _cache[15] || (_cache[15] = ($event) => parameterVisible.value = false)
-                }, {
-                  default: withCtx(() => [
-                    createTextVNode(" 确定 ")
-                  ]),
-                  _: 1
-                })
-              ])
-            ]),
-            default: withCtx(() => [
-              createVNode(_component_el_table, {
-                border: "",
-                "highlight-current-row": "",
-                onCurrentChange: handleCurrentChange,
-                data: __props.configure.props.dataOrigin.parameterList,
-                style: { "width": "100%" }
-              }, {
-                default: withCtx(() => [
-                  createVNode(_component_el_table_column, {
-                    align: "center",
-                    type: "index",
-                    label: "序号",
-                    width: "80"
-                  }),
-                  createVNode(_component_el_table_column, {
-                    align: "center",
-                    prop: "code",
-                    label: "参数名"
-                  }),
-                  createVNode(_component_el_table_column, {
-                    align: "center",
-                    prop: "required",
-                    label: "必填"
-                  }),
-                  createVNode(_component_el_table_column, {
-                    align: "center",
-                    prop: "name",
-                    label: "取值"
-                  })
-                ]),
-                _: 1
-              }, 8, ["data"])
-            ]),
-            _: 1
-          }, 8, ["modelValue"]),
-          createVNode(_sfc_main$3, {
+          createVNode(_sfc_main$4, {
             ref_key: "selectTableDialog",
             ref: selectTableDialog,
             onSelectTable,
             systemCode: __props.pageDesign.systemCode,
             systemVersion: __props.pageDesign.version
           }, null, 8, ["systemCode", "systemVersion"]),
-          returnVisible.value ? (openBlock(), createBlock(_sfc_main$4, {
+          returnVisible.value ? (openBlock(), createBlock(_sfc_main$5, {
             key: 0,
             returnSetList: __props.configure.props.dataOrigin.returnSetList,
             onSave: saveReturnSet,
             onClose: closeReturnSet,
             onRemove: removeReturnSet
           }, null, 8, ["returnSetList"])) : createCommentVNode("", true),
-          combinationVisible.value ? (openBlock(), createBlock(_sfc_main$5, {
+          combinationVisible.value ? (openBlock(), createBlock(_sfc_main$6, {
             key: 1,
             conditionList: __props.configure.props.dataOrigin.sqlFilterCondition,
             fieldNameList: __props.configure.modelFields,
@@ -583,7 +656,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             onSave: saveCondition,
             onClose: closeCombination
           }, null, 8, ["conditionList", "fieldNameList", "fieldMap"])) : createCommentVNode("", true),
-          defaultQueryVisible.value ? (openBlock(), createBlock(_sfc_main$5, {
+          defaultQueryVisible.value ? (openBlock(), createBlock(_sfc_main$6, {
             key: 2,
             conditionList: __props.configure.props.dataOrigin.defaultQueryCriteria,
             fieldNameList: __props.configure.modelFields,
@@ -591,7 +664,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             onClose: closeDefaultQuery,
             onSave: saveDefaultQuery
           }, null, 8, ["conditionList", "fieldNameList", "fieldMap"])) : createCommentVNode("", true),
-          columnConfigVisible.value ? (openBlock(), createBlock(_sfc_main$6, {
+          columnConfigVisible.value ? (openBlock(), createBlock(_sfc_main$7, {
             key: 3,
             configure: __props.configure,
             onSetConfigure: setConfigure,