super-page-designer 2.0.23 → 2.0.31

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

@@ -15,7 +15,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const barcode = ref(null);
     const barcodeFormat = ref("CODE128");
     function createBarCode() {
-      JsBarcode(barcode.value, qrCodeData.value, { format: barcodeFormat.value });
+      if (barcode.value) {
+        JsBarcode(barcode.value, qrCodeData.value, { format: barcodeFormat.value });
+      }
     }
     function createQrCode() {
       qrcode.toDataURL(qrCodeData.value, (err, url) => {
@@ -37,12 +39,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       if (defineProps["base"] && defineProps["base"]["type"] === "br-code") {
         createBarCode();
-        tempProps["type"] = defineProps["base"]["type"];
       }
       if (defineProps["base"] && defineProps["base"]["type"] === "QR-code") {
         createQrCode();
-        tempProps["type"] = defineProps["base"]["type"];
       }
+      tempProps["type"] = defineProps["base"]["type"];
+      tempProps["brCodeFormat"] = defineProps["base"]["brCodeFormat"];
+      tempProps["generateRuleType"] = defineProps["base"]["generateRuleType"];
+      tempProps["generateRule"] = defineProps["base"]["generateRule"];
       if (tempProps != {}) {
         for (const tempPropsKey in tempProps) {
           designProperty.value[tempPropsKey] = tempProps[tempPropsKey];
@@ -56,12 +60,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const designClass = ref("");
     const designHeaderStyle = ref({});
     const designProperty = ref({});
-    watch(props.configure.style, () => {
-      caculateDetailComponentStyle(props.configure, designStyle, designClass, designHeaderStyle);
-    }, { immediate: true });
-    watch(props.configure.props, () => {
-      caculateComponentProps(props.configure, designProperty), getRestsParameter();
-    }, { immediate: true });
+    watch(
+      props.configure.style,
+      () => {
+        caculateDetailComponentStyle(props.configure, designStyle, designClass, designHeaderStyle);
+      },
+      { immediate: true }
+    );
+    watch(
+      props.configure.props,
+      () => {
+        caculateComponentProps(props.configure, designProperty), getRestsParameter();
+        props.configure.runtime.props = designProperty.value;
+      },
+      { immediate: true }
+    );
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
         class: normalizeClass(designClass.value),

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
 };