super-page-designer 2.0.26 → 2.0.34

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

@@ -1,12 +1,10 @@
 import { defineComponent, ref, onMounted, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode, createCommentVNode } from "vue";
 import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
-import _sfc_main$2 from "../../common/common-attr-size.vue.js";
-import _sfc_main$1 from "../../form/common/dataorigin-input-table.vue.js";
+import _sfc_main$1 from "../../common/common-attr-size.vue.js";
+import "@element-plus/icons-vue";
 import BindVariable from "../../common/common-variable-bind.vue.js";
 import http from "agilebuilder-ui/src/utils/request";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
-const _hoisted_2 = { style: { "padding": "8px 0px 0px 0px" } };
-const _hoisted_3 = { key: 2 };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "barcode-attr-base",
   props: {
@@ -16,7 +14,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props) {
     const props = __props;
     const openCollapseItems = ref([]);
-    const dataRule = ref([]);
+    ref([]);
     const formatOptions = ref([]);
     onMounted(() => {
       http.get(window["$vueApp"].config.globalProperties.baseAPI + "/dc/setting-barcode-model/select-options").then((res) => {
@@ -52,7 +50,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           createVNode(_component_el_collapse, {
             modelValue: openCollapseItems.value,
-            "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => openCollapseItems.value = $event),
+            "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => openCollapseItems.value = $event),
             style: { "margin-top": "6px" }
           }, {
             default: withCtx(() => [
@@ -114,6 +112,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       ]),
                       _: 1
                     }),
+                    createVNode(_component_el_form_item, {
+                      label: "绑定变量",
+                      class: "amb-design-attr-item"
+                    }, {
+                      default: withCtx(() => [
+                        (openBlock(), createBlock(BindVariable, {
+                          key: __props.configure.uuid,
+                          modelValue: __props.configure.props.base.prop,
+                          paramTypes: ["data", "page"],
+                          "onUpdate:modelValue": afterBindVariable
+                        }, null, 8, ["modelValue"]))
+                      ]),
+                      _: 1
+                    }),
                     createVNode(_component_el_form_item, {
                       label: "条码类型",
                       class: "amb-design-attr-item"
@@ -327,92 +339,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               }),
-              createVNode(_component_el_collapse_item, {
-                title: "数据",
-                name: "data",
-                class: "amb-design-attr-group-header"
-              }, {
-                default: withCtx(() => [
-                  createElementVNode("div", _hoisted_2, [
-                    createVNode(_component_el_form_item, {
-                      label: "绑定",
-                      class: "amb-design-attr-item"
-                    }, {
-                      default: withCtx(() => [
-                        createVNode(_component_el_radio_group, {
-                          modelValue: __props.configure.props.base.way,
-                          "onUpdate:modelValue": _cache[9] || (_cache[9] = ($event) => __props.configure.props.base.way = $event),
-                          class: "ml-4"
-                        }, {
-                          default: withCtx(() => [
-                            createVNode(_component_el_radio, { value: "data" }, {
-                              default: withCtx(() => [
-                                createTextVNode("绑定变量")
-                              ]),
-                              _: 1
-                            }),
-                            createVNode(_component_el_radio, { value: "regulation" }, {
-                              default: withCtx(() => [
-                                createTextVNode("绑定规则")
-                              ]),
-                              _: 1
-                            })
-                          ]),
-                          _: 1
-                        }, 8, ["modelValue"])
-                      ]),
-                      _: 1
-                    }),
-                    __props.configure.props.base.way === "data" ? (openBlock(), createBlock(_component_el_form_item, {
-                      key: 0,
-                      label: "绑定变量",
-                      class: "amb-design-attr-item"
-                    }, {
-                      default: withCtx(() => [
-                        (openBlock(), createBlock(BindVariable, {
-                          key: __props.configure.uuid,
-                          modelValue: __props.configure.props.base.prop,
-                          paramTypes: ["data", "page"],
-                          "onUpdate:modelValue": afterBindVariable
-                        }, null, 8, ["modelValue"]))
-                      ]),
-                      _: 1
-                    })) : createCommentVNode("", true),
-                    __props.configure.props.base.way === "regulation" ? (openBlock(), createBlock(_component_el_form_item, {
-                      key: 1,
-                      label: "绑定规则",
-                      class: "amb-design-attr-item"
-                    }, {
-                      default: withCtx(() => [
-                        createVNode(_sfc_main$1, {
-                          modelValue: __props.configure.props.base.regulation,
-                          "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => __props.configure.props.base.regulation = $event)
-                        }, null, 8, ["modelValue"])
-                      ]),
-                      _: 1
-                    })) : createCommentVNode("", true),
-                    dataRule.value ? (openBlock(), createElementBlock("div", _hoisted_3, [
-                      (openBlock(true), createElementBlock(Fragment, null, renderList(dataRule.value, (item, index) => {
-                        return openBlock(), createBlock(_component_el_form_item, {
-                          key: index,
-                          label: item.name,
-                          class: "amb-design-attr-item"
-                        }, {
-                          default: withCtx(() => [
-                            createVNode(_sfc_main$1, {
-                              modelValue: item.date,
-                              "onUpdate:modelValue": ($event) => item.date = $event
-                            }, null, 8, ["modelValue", "onUpdate:modelValue"])
-                          ]),
-                          _: 2
-                        }, 1032, ["label"]);
-                      }), 128))
-                    ])) : createCommentVNode("", true)
-                  ])
-                ]),
-                _: 1
-              }),
-              (openBlock(), createBlock(_sfc_main$2, {
+              (openBlock(), createBlock(_sfc_main$1, {
                 key: __props.configure.uuid,
                 size: __props.configure.props.size
               }, null, 8, ["size"]))

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

@@ -1,5 +1,4 @@
 import { defineComponent, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, withCtx, createElementVNode, createBlock, createCommentVNode } from "vue";
-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/column-config.vue.js

@@ -31,14 +31,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const tableData = ref([]);
     if (props.configure) {
       tableData.value = getColumnsWithGroupHeader(props.configure);
-      console.log("%c描述-152039", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", tableData.value);
     }
     onMounted(() => {
       eventBus.$emit("hadleDragging", true);
     });
-    function dialogClose() {
+    function handleClose() {
       eventBus.$emit("hadleDragging", false);
-      emit("close");
+      emit("setConfigure", tableData.value);
     }
     function add() {
       let obj = {
@@ -67,7 +66,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           suffixModule: {},
           querySetting: {},
           orgFields: [{ type: "", model: "" }],
-          format: `{"type":"","icon":"111","suffixModule":{"staticStates":[]},"jumpPageAdditional":{"staticStates":[]}}`
+          format: { type: "", icon: "", suffixModule: { staticStates: [] }, jumpPageAdditional: { staticStates: [] } }
         },
         events: [
           { name: "show", label: "列表显示", tip: "列表显示回调方法" },
@@ -118,10 +117,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const items = tableData.value;
       [items[sortIndex], items[sortIndex + 1]] = [items[sortIndex + 1], items[sortIndex]];
     }
-    function setColumnConfig() {
-      eventBus.$emit("hadleDragging", false);
-      emit("setConfigure", tableData.value);
-    }
     function getTableHeaderName(item) {
       let nameValue = "";
       if (item.children && item.children.length > 0) {
@@ -134,8 +129,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return nameValue;
     }
     return (_ctx, _cache) => {
-      const _component_el_button = resolveComponent("el-button");
       const _component_el_table_column = resolveComponent("el-table-column");
+      const _component_el_button = resolveComponent("el-button");
       const _component_el_icon = resolveComponent("el-icon");
       const _component_el_input = resolveComponent("el-input");
       const _component_el_option = resolveComponent("el-option");
@@ -149,19 +144,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           title: "快捷设置",
           width: "70%",
           "close-on-click-modal": false,
-          onClose: dialogClose
+          "before-close": handleClose
         }, {
           default: withCtx(() => [
-            createVNode(_component_el_button, {
-              type: "primary",
-              style: { "margin": "8px 0" },
-              onClick: setColumnConfig
-            }, {
-              default: withCtx(() => [
-                createTextVNode("确定")
-              ]),
-              _: 1
-            }),
             createVNode(_component_el_table, {
               data: tableData.value,
               "row-key": "uuid",
@@ -262,7 +247,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           return openBlock(), createBlock(_component_el_option, {
                             key: item.name,
                             label: item.alias,
-                            value: item.name
+                            value: item.dbColumnName
                           }, null, 8, ["label", "value"]);
                         }), 128))
                       ]),
@@ -294,7 +279,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       createVNode(_component_el_select, {
                         modelValue: scope.row.name,
                         "onUpdate:modelValue": ($event) => scope.row.name = $event,
-                        placeholder: "请选择"
+                        placeholder: "请选择",
+                        clearable: ""
                       }, {
                         default: withCtx(() => [
                           (openBlock(true), createElementBlock(Fragment, null, renderList(unref(getFormComponentOptions)(), (item) => {

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-73667c88"]]);
+const CompositeHeader = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-690ad0d7"]]);
 export {
   CompositeHeader as default
 };

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

@@ -63,6 +63,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         console.log("%c描述-164737", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", fieldGroup.value);
       }
     });
+    eventBus.$on("synchroGroupHeadersData", () => {
+      treeData.value = getTopGroupHeaderList(groupHeaders.value);
+    });
     function initGroupHeaders() {
       let index = 1;
       props.configure.props.groupHeaders = [];
@@ -90,9 +93,7 @@ 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);
           }

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

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