super-page-designer 2.1.74 → 2.1.78

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/hyperlink-mult-config.vue.js

@@ -19,6 +19,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const conditionRef = ref(null);
     const emits = __emit;
     const props = __props;
+    if (!props.linkPage) {
+      props.linkPage = [];
+      emits("update:linkPage", []);
+    }
     function addPage() {
       if (!props.linkPage) {
         emits("update:linkPage", []);

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

@@ -7,6 +7,7 @@ import BindVariable from "../../common/common-variable-bind.vue.js";
 import _sfc_main$2 from "./condition.vue.js";
 import _sfc_main$3 from "../../common/common-icon-bind.vue.js";
 import _sfc_main$1 from "../../common/common-i18n-key-input.vue.js";
+import { getModelOptionsByFields } from "../../../../utils/page-table-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "suffixmodule",
   props: {
@@ -21,6 +22,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const selectPageDialog = ref(null);
     const linkPage = ref({});
+    let dataFieldNameList;
+    const pageType = props.pageDesign ? props.pageDesign.pageType : null;
+    if (pageType && (pageType === "form" || pageType === "list")) {
+      dataFieldNameList = props.pageDesign.modelFields;
+    }
+    const dataModelOptions = ref(null);
+    if (dataFieldNameList && dataFieldNameList.length > 0) {
+      dataModelOptions.value = getModelOptionsByFields(dataFieldNameList);
+    }
+    const rowModelOptions = ref(null);
+    if (props.tableConfigure) {
+      rowModelOptions.value = getModelOptionsByFields(props.tableConfigure.modelFields);
+    }
     if (props.isDialog) {
       linkPage.value = props.configure;
     } else {
@@ -485,8 +499,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             createVNode(BindVariable, {
               isTable: _ctx.configure.isTable,
               modelValue: sowDefaultValue.value,
+              dataModelOptions: dataModelOptions.value,
+              objModelOptions: rowModelOptions.value,
               "onUpdate:modelValue": afterBindDefaultValue
-            }, null, 8, ["isTable", "modelValue"])
+            }, null, 8, ["isTable", "modelValue", "dataModelOptions", "objModelOptions"])
           ]),
           _: 1
         })) : createCommentVNode("", true),

package/dist/es/components/design/views/assemblys/object-design.vue.js

@@ -8,6 +8,7 @@ import { batchUpdatePermissions, batchRemovePermissions } from "../../utils/page
 import { watchValidate, getRefrencePropMap, removePropFromRefrencePropMap } from "../../utils/form-design-util.js";
 import { usePageContextStore } from "../../../../stores/page-store.js";
 import { getListCode } from "super-page-runtime";
+import { getFormPropName } from "../../utils/page-helper-util.js";
 const _hoisted_1 = { class: "amb-widget-item-tool" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "object-design",
@@ -21,6 +22,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   emits: ["onSelectWidget", "onCustomAttrWidget", "onCopy", "onDelete"],
   setup(__props, { emit: __emit }) {
+    var _a, _b;
     const pageDesignContextUtil = usePageContextStore();
     const props = __props;
     if (props.configure.name === "table") {
@@ -40,22 +42,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     if (props.configure.style == void 0) {
       props.configure.style = {};
     }
-    const fieldInfo = pageDesignContextUtil.getModelField();
+    const fieldInfo = pageDesignContextUtil.getModelField(getFormPropName((_b = (_a = props.configure.props) == null ? void 0 : _a.base) == null ? void 0 : _b.prop));
     if (props.pageDesign && props.configure && props.configure.name == "table") {
       if (props.configure.uuid) {
         if (!props.pageDesign.tableUuids) {
           props.pageDesign.tableUuids = [];
         }
         setTimeout(() => {
-          var _a, _b, _c, _d;
-          if (!((_b = (_a = props.pageDesign) == null ? void 0 : _a.tableUuids) == null ? void 0 : _b.includes(props.configure.uuid))) {
+          var _a2, _b2, _c, _d;
+          if (!((_b2 = (_a2 = props.pageDesign) == null ? void 0 : _a2.tableUuids) == null ? void 0 : _b2.includes(props.configure.uuid))) {
             (_d = (_c = props.pageDesign) == null ? void 0 : _c.tableUuids) == null ? void 0 : _d.push(props.configure.uuid);
           }
           getListCodeMap(props.configure.code);
         }, 500);
         onUnmounted(() => {
-          var _a, _b, _c, _d;
-          const uuidIndex = (_b = (_a = props.pageDesign) == null ? void 0 : _a.tableUuids) == null ? void 0 : _b.indexOf(props.configure.uuid);
+          var _a2, _b2, _c, _d;
+          const uuidIndex = (_b2 = (_a2 = props.pageDesign) == null ? void 0 : _a2.tableUuids) == null ? void 0 : _b2.indexOf(props.configure.uuid);
           if (uuidIndex != void 0 && uuidIndex > -1) {
             (_d = (_c = props.pageDesign) == null ? void 0 : _c.tableUuids) == null ? void 0 : _d.shift(uuidIndex, 1);
           }
@@ -182,8 +184,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }
         );
         onUnmounted(() => {
-          var _a, _b;
-          removePropFromRefrencePropMap(props.configure.props.base.prop, (_b = (_a = props.pageDesign) == null ? void 0 : _a.runtime) == null ? void 0 : _b.refercePropMap);
+          var _a2, _b2;
+          removePropFromRefrencePropMap(props.configure.props.base.prop, (_b2 = (_a2 = props.pageDesign) == null ? void 0 : _a2.runtime) == null ? void 0 : _b2.refercePropMap);
         });
       }
       watch(props.configure.props.verification, (newValue, oldValue) => {

package/dist/es/components/design/views/design/view/view-design-display.vue.js

@@ -167,6 +167,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       const configureCopy = JSON.parse(JSON.stringify(props.configure));
       configureCopy.tableRuntimes = {};
+      configureCopy.currentTableConfig = {};
       beforeSaveForm(configureCopy);
       http.post(window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/save", {
         id: props.configure.id,

package/dist/es/stores/page-store.js

@@ -52,7 +52,7 @@ const usePageContextStore = defineStore("pageDesignContextUtil", () => {
       return null;
     }
     for (let item of modelFields) {
-      if (item.name == fieldName) {
+      if (item.name == fieldName || item.dbColumnName && item.dbColumnName === fieldName) {
         return item;
       }
     }

package/dist/es/style.css

@@ -674,6 +674,10 @@ fieldset.amb-design-item-selected {
 [data-v-511b453b]::-webkit-scrollbar-thumb:hover {
   background-color: grey;
 }
+
+.el-select__wrapper.is-disabled{
+		cursor: default;
+}
 .el-tree-node__content {
   height: 34px !important;
 }
@@ -1910,6 +1914,10 @@ fieldset.amb-design-item-selected {
   padding: 10px;
   font-weight: bold;
 }
+
+.el-switch.is-disabled .el-switch__core, .el-switch.is-disabled .el-switch__label{
+		cursor: default;
+}
 .el-tree-node__content {
   height: 34px !important;
 }
@@ -2528,10 +2536,6 @@ fieldset.amb-design-item-selected {
   padding: 10px;
   font-weight: bold;
 }
-
-.el-select__wrapper.is-disabled{
-		cursor: default;
-}
 .el-tree-node__content {
   height: 34px !important;
 }
@@ -4386,10 +4390,6 @@ fieldset.amb-design-item-selected {
   padding: 10px;
   font-weight: bold;
 }
-
-.el-switch.is-disabled .el-switch__core, .el-switch.is-disabled .el-switch__label{
-		cursor: default;
-}
 .el-tree-node__content {
   height: 34px !important;
 }
@@ -16804,56 +16804,6 @@ fieldset.amb-design-item-selected {
   padding: 10px;
   font-weight: bold;
 }
-
-/*不显示列样式*/
-.hiddenBorder {
-  border-right: solid 1px #ebebeb !important;
-  border-left: solid 1px #ebebeb !important;
-  background-color: #ebebeb !important;
-}
-/*选中列样式*/
-.addBorder {
-  border-right: solid 1px #5893ef !important;
-  border-left: solid 1px #5893ef !important;
-  background-color: #5893ef !important;
-  color: #ffffff;
-}
-.ghost {
-  opacity: 0.5;
-  background: #c8ebfb;
-}
-
-li[data-v-a555cba7] {
-  color: #333;
-}
-.context-menu[data-v-a555cba7] {
-  position: fixed;
-  background: #fff;
-  z-index: 999;
-  padding: 5px;
-  margin: 0;
-  margin-top: 30px;
-}
-.context-menu li[data-v-a555cba7] {
-  min-width: 75px;
-  height: 28px;
-  line-height: 28px;
-  text-align: left;
-  color: #1a1a1a;
-  cursor: pointer;
-}
-.context-menu li[data-v-a555cba7]:hover {
-  background: #5893ef;
-  color: #fff;
-}
-.context-menu[data-v-a555cba7] {
-  border: 1px solid #eee;
-  box-shadow: 0 0.5em 1em 0 rgba(0, 0, 0, 0.1);
-  border-radius: 5px;
-}
-li[data-v-a555cba7] {
-  list-style-type: none;
-}
 .el-tree-node__content {
   height: 34px !important;
 }
@@ -17472,6 +17422,56 @@ fieldset.amb-design-item-selected {
   padding: 10px;
   font-weight: bold;
 }
+
+/*不显示列样式*/
+.hiddenBorder {
+  border-right: solid 1px #ebebeb !important;
+  border-left: solid 1px #ebebeb !important;
+  background-color: #ebebeb !important;
+}
+/*选中列样式*/
+.addBorder {
+  border-right: solid 1px #5893ef !important;
+  border-left: solid 1px #5893ef !important;
+  background-color: #5893ef !important;
+  color: #ffffff;
+}
+.ghost {
+  opacity: 0.5;
+  background: #c8ebfb;
+}
+
+li[data-v-a555cba7] {
+  color: #333;
+}
+.context-menu[data-v-a555cba7] {
+  position: fixed;
+  background: #fff;
+  z-index: 999;
+  padding: 5px;
+  margin: 0;
+  margin-top: 30px;
+}
+.context-menu li[data-v-a555cba7] {
+  min-width: 75px;
+  height: 28px;
+  line-height: 28px;
+  text-align: left;
+  color: #1a1a1a;
+  cursor: pointer;
+}
+.context-menu li[data-v-a555cba7]:hover {
+  background: #5893ef;
+  color: #fff;
+}
+.context-menu[data-v-a555cba7] {
+  border: 1px solid #eee;
+  box-shadow: 0 0.5em 1em 0 rgba(0, 0, 0, 0.1);
+  border-radius: 5px;
+}
+li[data-v-a555cba7] {
+  list-style-type: none;
+}
 
 .amb-design-attr-header[data-v-226997f7] {
   position: sticky;
@@ -17533,19 +17533,6 @@ fieldset.amb-design-item-selected {
   border: 1px solid rgba(88, 147, 239);
 }
 
-.seleteSort[data-v-1fd3d630] {
-	border-radius: 5px;
-	border: 1px solid rgba(88, 147, 239);
-}
-[data-v-1fd3d630] .el-select__selection{
-	display: inline-block;
-}
-
-.seleteSort[data-v-3336d6c5] {
-  border-radius: 5px;
-  border: 1px solid rgba(88, 147, 239);
-}
-
 .icon-set-center-body[data-v-181d1ce8]{
 	display: grid;
 	grid-template-columns:repeat(5,1fr);
@@ -17583,12 +17570,17 @@ fieldset.amb-design-item-selected {
 	margin-bottom: 20px;
 }
 
-.stateBtn[data-v-ae2798fb]{
-	display: flex;
+.seleteSort[data-v-3336d6c5] {
+  border-radius: 5px;
+  border: 1px solid rgba(88, 147, 239);
+}
+
+.seleteSort[data-v-1fd3d630] {
+	border-radius: 5px;
+	border: 1px solid rgba(88, 147, 239);
 }
-.stateText[data-v-ae2798fb]{
-	margin-left: 10px;
-	color: #7b7b7b;
+[data-v-1fd3d630] .el-select__selection{
+	display: inline-block;
 }
 
 li[data-v-4fd4369c] {
@@ -17628,6 +17620,14 @@ li[data-v-4fd4369c] {
   list-style-type: none;
 }
 
+.stateBtn[data-v-ae2798fb]{
+	display: flex;
+}
+.stateText[data-v-ae2798fb]{
+	margin-left: 10px;
+	color: #7b7b7b;
+}
+
 .el-tag[data-v-665d3bf4]{
 	margin-left: 10px;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-designer",
-  "version": "2.1.74",
+  "version": "2.1.78",
   "description": "AgileBuilder super page designer",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -41,7 +41,7 @@
     "qrcode": "^1.5.3",
     "quill": "^2.0.1",
     "service-flow-designer": "2.1.59",
-    "super-page-runtime": "2.1.72",
+    "super-page-runtime": "2.1.77",
     "uuid": "^9.0.1",
     "vite": "^5.1.6",
     "vite-plugin-node-stdlib-browser": "^0.2.1",