super-page-designer 2.0.41 → 2.0.45

package/dist/es/components/design/views/assemblys/data/table/table-attr-base.vue.js

@@ -1,13 +1,13 @@
 import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode, createCommentVNode } from "vue";
-import { getTableOperateConf, getFormComponentOptions } from "../../../../utils/assemblys-config.js";
+import { getTableSelectionConf, getTableIndexConf, getTableOperateConf, getFormComponentOptions } from "../../../../utils/assemblys-config.js";
 import DataOrigin from "../component/data-origin.vue.js";
 import _sfc_main$3 from "../../common/common-attr-size.vue.js";
 import _sfc_main$2 from "../../form/common/data-linkage.vue.js";
 import "@element-plus/icons-vue";
 import "agilebuilder-ui/src/utils/request";
-import { getUuidv4 } from "../../../../utils/common-util.js";
+import "uuid";
 import "../../../../../../stores/page-store.js";
-import "../../common/common-variable-bind.vue3.js";
+import "../../common/common-variable-bind.vue2.js";
 import "../../../../utils/eventBus.js";
 import _sfc_main$1 from "../../common/common-function-code.vue.js";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
@@ -45,62 +45,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       () => props.configure.props.base.selection,
       (newVal) => {
         if (newVal) {
-          let selectColumn = {
-            uuid: getUuidv4(),
-            name: "",
-            props: {
-              base: {
-                name: "复选框组件",
-                prop: "$selection",
-                columnWidth: 100,
-                sortable: true,
-                visible: true,
-                displayOrder: 0,
-                alignTittle: "center",
-                alignContent: "center"
-              },
-              size: {},
-              editLine: {},
-              scan: {},
-              preSuffix: {},
-              verification: {},
-              dataOrigin: {
-                sortField: [{ name: "", type: "" }],
-                staticState: [{ label: "选项1", vaule: 1 }],
-                displayQuantity: 20
-              },
-              defaultValue: {},
-              inParameter: {},
-              title: {},
-              definition: {},
-              uploadConfig: {},
-              singleWidth: {},
-              suffixModule: {},
-              querySetting: {},
-              formatting: {
-                type: "",
-                suffixModule: {
-                  jumpPageAdditional: [],
-                  icon: ""
-                }
-              }
-            },
-            events: [
-              { name: "show", label: "列表显示", tip: "列表显示回调方法" },
-              { name: "hidden", label: "列表隐藏", tip: "列表隐藏回调方法" }
-            ],
-            style: {
-              titleFont: {},
-              contentFont: {},
-              width: {},
-              background: {},
-              conentPadding: {},
-              tittlePadding: {},
-              border: {},
-              shadow: {},
-              tittleClass: ""
-            }
-          };
+          let selectColumn = getTableSelectionConf();
           props.configure.items.splice(0, 0, selectColumn);
         } else {
           if (props.configure.items[0].props.base.prop === "$selection") {
@@ -113,63 +58,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       () => props.configure.props.base.showIndex,
       (newVal) => {
         if (newVal) {
-          let indexColumn = {
-            uuid: getUuidv4(),
-            name: "",
-            props: {
-              base: {
-                name: "序号",
-                prop: "$index",
-                columnWidth: 80,
-                sortable: true,
-                visible: true,
-                displayOrder: 1,
-                alignTittle: "center",
-                alignContent: "center"
-              },
-              size: {},
-              editLine: {},
-              scan: {},
-              preSuffix: {},
-              verification: {},
-              dataOrigin: {
-                sortField: [{ name: "", type: "" }],
-                staticState: [{ label: "选项1", vaule: 1 }],
-                displayQuantity: 20
-              },
-              defaultValue: {},
-              inParameter: {},
-              title: {},
-              definition: {},
-              uploadConfig: {},
-              singleWidth: {},
-              suffixModule: {},
-              querySetting: {},
-              formatting: {
-                type: "",
-                suffixModule: {
-                  jumpPageAdditional: [],
-                  icon: ""
-                }
-              }
-            },
-            events: [
-              { name: "show", label: "列表显示", tip: "列表显示回调方法" },
-              { name: "hidden", label: "列表隐藏", tip: "列表隐藏回调方法" }
-            ],
-            style: {
-              titleFont: {},
-              contentFont: {},
-              width: {},
-              background: {},
-              tableCell: [{ type: "", model: "" }],
-              conentPadding: {},
-              tittlePadding: {},
-              border: {},
-              shadow: {},
-              tittleClass: ""
-            }
-          };
+          let indexColumn = getTableIndexConf();
           if (props.configure.items[0].props.base.prop === "$selection") {
             props.configure.items.splice(1, 0, indexColumn);
           } else {
@@ -416,7 +305,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       _: 1
                     }),
                     createVNode(_component_el_form_item, {
-                      label: "显示序列",
+                      label: "显示序号",
                       class: "amb-design-attr-item"
                     }, {
                       default: withCtx(() => [

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

@@ -2,7 +2,7 @@ import _sfc_main from "./table-design.vue2.js";
 import "./table-design.vue3.js";
 import "./table-design.vue4.js";
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
-const tableDesign = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8f9a70b0"]]);
+const tableDesign = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-130db8b6"]]);
 export {
   tableDesign as default
 };

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

@@ -2,15 +2,16 @@ import { defineComponent, ref, onMounted, watch, resolveComponent, openBlock, cr
 import eventBus from "../../../../utils/eventBus.js";
 import { useDraggable } from "vue-draggable-plus";
 import { caculateDetailComponentStyle, caculateComponentProps } from "../../../../utils/form-design-util.js";
-import "../../../../utils/assemblys-config.js";
+import { getTableColumnConf } from "../../../../utils/assemblys-config.js";
 import { Plus, Delete } from "@element-plus/icons-vue";
 import { ElMessageBox } from "element-plus";
-import { getColumnsWithGroupHeader, addColumnToGroupHeaders, deleteGroupHeaderByColumnUuid } from "../../../../utils/data-table-util.js";
-import { getUuidv4 } from "../../../../utils/common-util.js";
+import { getColumnsWithGroupHeader, addColumnToGroupHeaders } from "../../../../utils/data-table-util.js";
+import "uuid";
 import "@element-plus/icons";
 import "super-page-runtime";
 import "../../../../../../stores/page-store.js";
 import _sfc_main$1 from "../component/table-children-column.vue.js";
+import { queryTableFields } from "../../../../utils/page-table-util.js";
 const _hoisted_1 = {
   id: "tableDesignMenu",
   ref: "headerMenu",
@@ -32,9 +33,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const tableData = ref([
-      {}
-    ]);
+    const tableData = ref([{}]);
     const currentPage = ref(1);
     const pageSize = ref(1);
     const designStyle = ref({});
@@ -44,7 +43,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const menuVisible = ref(false);
     props.configure.props.groupHeaders;
     const listColumns = ref([]);
-    const tableRef = ref(null);
+    const tableRef = ref();
     const hiddenColumsName = ref([]);
     function getRestsParameter() {
       let defineProps = props.configure.props;
@@ -73,6 +72,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }
     }
+    if (props.configure) {
+      queryMyTableFields();
+    }
     onMounted(() => {
       listColumns.value = getColumnsWithGroupHeader(props.configure);
     });
@@ -83,37 +85,69 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         hiddenColumsName.value = hiddenColumsName.value.filter((item) => item != data.name);
       }
     });
-    watch(props.configure.style, () => {
-      caculateDetailComponentStyle(props.configure, designStyle, designClass, designHeaderStyle);
-      props.configure.runtime.style = designStyle.value;
-      props.configure.runtime.class = designClass.value;
-      props.configure.runtime.headerStyle = designHeaderStyle.value;
-    }, { immediate: true });
-    watch(props.configure.props, () => {
-      caculateComponentProps(props.configure, designProperty);
-      getRestsParameter();
-      props.configure.runtime.props = designProperty.value;
-    }, { immediate: true });
-    watch(() => props.configure.props.isChangeGroupHeader, () => {
-      if (props.configure.props.isChangeGroupHeader) {
-        listColumns.value = getColumnsWithGroupHeader(props.configure);
-        tableRef.value.doLayout();
+    watch(
+      props.configure.style,
+      () => {
+        caculateDetailComponentStyle(props.configure, designStyle, designClass, designHeaderStyle);
+        props.configure.runtime.style = designStyle.value;
+        props.configure.runtime.class = designClass.value;
+        props.configure.runtime.headerStyle = designHeaderStyle.value;
+      },
+      { immediate: true }
+    );
+    watch(
+      props.configure.props,
+      () => {
+        caculateComponentProps(props.configure, designProperty);
+        getRestsParameter();
+        props.configure.runtime.props = designProperty.value;
+      },
+      { immediate: true }
+    );
+    watch(
+      () => props.configure.props.isChangeGroupHeader,
+      () => {
+        if (props.configure.props.isChangeGroupHeader) {
+          listColumns.value = getColumnsWithGroupHeader(props.configure);
+          if (tableRef.value) {
+            tableRef.value.doLayout();
+          }
+        }
       }
-    });
-    eventBus.$on("reloadTable", () => {
+    );
+    eventBus.$on("reloadTable", (tableData2) => {
+      props.configure.items = JSON.parse(JSON.stringify(tableData2));
       listColumns.value = getColumnsWithGroupHeader(props.configure);
-      tableRef.value.doLayout();
+      if (tableRef.value) {
+        tableRef.value.doLayout();
+      }
     });
-    watch(() => listColumns.value, (newVal) => {
-      newVal.forEach((item) => {
-        if (item.props && item.props.base && !item.props.base.visible) {
-          hiddenColumsName.value.push(item.props.base.name);
-        }
-      });
-    }, { deep: true });
+    watch(
+      () => listColumns.value,
+      (newVal) => {
+        newVal.forEach((item) => {
+          if (item.props && item.props.base && !item.props.base.visible) {
+            hiddenColumsName.value.push(item.props.base.name);
+          }
+        });
+      },
+      { deep: true }
+    );
     function onSelectWidget(selIndex, objConfigure) {
       emit("onSelectWidget", selIndex, objConfigure);
     }
+    function queryMyTableFields() {
+      const systemCode = props.configure.tableSysCode ? props.configure.tableSysCode : props.pageDesign.systemCode;
+      const systemVersion = props.configure.tableSysVersion ? props.configure.tableSysVersion : props.pageDesign.version;
+      const tableName = props.configure.props.dataOrigin.tableName;
+      queryTableFields(systemCode, systemVersion, tableName).then((tableFields) => {
+        props.configure.modelFieldsMap = {};
+        tableFields.forEach((attrbt) => {
+          props.configure.modelFieldsMap[attrbt.dbColumnName] = attrbt;
+        });
+        props.configure.modelFields = tableFields;
+      });
+    }
     const headerLabel = ref("");
     function rowClick() {
       headerLabel.value = "";
@@ -149,54 +183,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function operationalMenuFun(type) {
       closeMenuVisible();
       if (type === "createCombinedHeader") {
-        let newObj = {
-          uuid: getUuidv4(),
-          isTable: true,
-          // 是否是表格组件
-          name: "",
-          props: {
-            base: { name: "字段名称", tittleShow: false, sortable: true, visible: true },
-            size: {},
-            editLine: {
-              plugType: ""
-            },
-            scan: {},
-            preSuffix: {},
-            verification: {},
-            dataOrigin: {
-              staticState: [{ label: "选项1", vaule: 1 }],
-              displayQuantity: 20
-            },
-            defaultValue: {},
-            inParameter: {},
-            title: {},
-            definition: {},
-            uploadConfig: {},
-            singleWidth: {},
-            suffixModule: {},
-            tableCell: [{ value: "", label: "" }],
-            format: { icon: "" }
-          },
-          style: {
-            titleFont: {},
-            contentFont: {},
-            width: {},
-            background: {},
-            tableCell: [{ type: "", model: "" }],
-            conentPadding: {},
-            tittlePadding: {},
-            border: {},
-            shadow: {},
-            tittleClass: ""
-          },
-          events: [
-            { name: "setValue", label: "弹框赋值回调", tip: "格式化配置超链接赋值回调" },
-            { name: "closePopup", label: "关闭弹框回调", tip: "格式化配置超链接关闭弹框回调" }
-          ]
-        };
+        const fieldInfo = { alias: "字段名称" };
+        let newObj = getTableColumnConf(fieldInfo);
         props.configure.items.splice(columnDataIndex.value + 1, 0, newObj);
         if (props.configure.props.base.isEnableGroupHeader) {
-          addColumnToGroupHeaders(props.configure.items[columnDataIndex.value + 1], null, props.configure.props.groupHeaders);
+          addColumnToGroupHeaders(
+            props.configure.items[columnDataIndex.value + 1],
+            null,
+            props.configure.props.groupHeaders
+          );
           listColumns.value = getColumnsWithGroupHeader(props.configure);
           eventBus.$emit("synchroGroupHeadersData");
         }
@@ -206,9 +201,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          deleteGroupHeaderByColumnUuid(props.configure.props.groupHeaders, columnData.value.uuid);
-          listColumns.value = getColumnsWithGroupHeader(props.configure);
-          eventBus.$emit("synchroGroupHeadersData");
+          console.log("%c描述-173127", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.configure.props);
+          console.log("%c描述-173140", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", columnData.value);
         }).catch(() => {
         });
       }
@@ -283,13 +277,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 listColumns: item,
                 designProperty: designProperty.value,
                 configure: _ctx.configure,
+                pageDesign: _ctx.pageDesign,
                 indexObj: _ctx.indexObj,
                 onSetHeaderLabel: setHeaderLabel,
                 onOnSelectWidget: onSelectWidget,
                 onSetColumnData: setColumnData,
                 onCloseMenuVisible: closeMenuVisible,
                 selectWidget: _ctx.selectWidget
-              }, null, 8, ["listColumns", "designProperty", "configure", "indexObj", "selectWidget"]);
+              }, null, 8, ["listColumns", "designProperty", "configure", "pageDesign", "indexObj", "selectWidget"]);
             }), 128))
           ]),
           _: 1