super-page-designer 2.0.20 → 2.0.26

package/dist/es/components/design/views/assemblys/chart/column-line/column-line-design.vue2.js

@@ -10,6 +10,7 @@ import { CanvasRenderer } from "echarts/renderers";
 import { LineChart, BarChart } from "echarts/charts";
 import { GridComponent, LegendComponent, TitleComponent, TooltipComponent, ToolboxComponent, DataZoomComponent } from "echarts/components";
 import VChart from "vue-echarts";
+import "element-plus";
 const _hoisted_1 = { style: { "position": "absolute", "top": "0px", "right": "60px", "text-align": "center" } };
 const _hoisted_2 = ["onClick"];
 const _sfc_main = /* @__PURE__ */ defineComponent({

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

@@ -25,13 +25,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const emits = __emit;
     const props = __props;
-    const typeOptions = [{
-      value: "ElementUI",
-      label: "ElementUI"
-    }, {
-      value: "custom",
-      label: "自定义"
-    }];
+    const typeOptions = [
+      {
+        value: "ElementUI",
+        label: "ElementUI"
+      },
+      {
+        value: "custom",
+        label: "自定义"
+      }
+    ];
     ref(false);
     const cachePage = {};
     const pagination = ref({});
@@ -103,13 +106,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         pageNo: pagination.value && pagination.value.pageNo ? pagination.value.pageNo : 1
       };
       searchValue.value;
-      http.post("/component/system-icon/query", param).then((result) => {
+      http.post(window["$vueApp"].config.globalProperties.baseAPI + "/component/general-icon/query", param).then((result) => {
         const data = result.data ? result.data : [];
         const tempOptions = [];
         for (let result2 of data) {
           tempOptions.push({
-            value: result2.name,
-            label: result2.name
+            value: result2.iconName,
+            label: result2.iconName
           });
         }
         selectOptions.value.customOptions = tempOptions;
@@ -211,14 +214,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       iconType.value = "custom";
       thisIconValue.value = searchValue.value;
+      const addValue = searchValue.value;
       searchValue.value = "";
       emits("update:modelValue", iconType.value, thisIconValue.value);
       popoverRef.value.hide();
       if (!isExist) {
         const iconInfo = {
-          name: searchValue.value
+          iconName: addValue
         };
-        http.post("/component/system-params/add", iconInfo).then((result) => {
+        http.post(window["$vueApp"].config.globalProperties.baseAPI + "/bs/general-icon/get-or-create", iconInfo).then((result) => {
           if (iconType.value == "custom") {
             queryCustomIcons();
           }

package/dist/es/components/design/views/assemblys/common/common-select-page.vue.js

@@ -62,7 +62,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     function queryAllSystems() {
-      http.get("/component/super-charts/findAllSystem").then((res) => {
+      http.get(window["$vueApp"].config.globalProperties.baseAPI + "/component/super-charts/findAllSystem").then((res) => {
         const datas = res;
         const systemCodes = [];
         const tempMap = {};
@@ -144,7 +144,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       let systemId = searchModel.systemId;
       searchModel.tableType ? searchModel.tableType : 0;
-      const url = "/mms/app-pages/listBySystem/" + (systemId ? systemId : 0);
+      const url = window["$vueApp"].config.globalProperties.baseAPI + "/mms/app-pages/listBySystem/" + (systemId ? systemId : 0);
       console.log("searchPages", url);
       http.post(url, param).then((res) => {
         tableDatas.value = res.data;

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

@@ -9,13 +9,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "common-select-table",
   emits: ["selectTable"],
   setup(__props, { expose: __expose, emit: __emit }) {
-    const props = __props;
     const pageDesignUtil = usePageContextStore();
-    pageDesignUtil.pageContext ? pageDesignUtil.pageContext : {};
+    const pageDesign = pageDesignUtil.pageContext ? pageDesignUtil.pageContext : {};
     const emits = __emit;
     const tableHeight = ref(300);
-    const appCode = getSystemCode();
-    const appVersion = getPublishVersion();
+    let appCode = getSystemCode();
+    let appVersion = getPublishVersion();
+    if (!appCode) {
+      appCode = pageDesign.systemCode;
+      appVersion = pageDesign.systemVersion;
+    }
     const dialogTableVisible = ref(false);
     const searchModel = reactive({
       systemCode: "",
@@ -47,7 +50,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         name: scopeData.row.name,
         alias: scopeData.row.alias
       };
-      if (searchModel.systemCode && searchModel.systemCode != props.systemCode) {
+      if (searchModel.systemCode && searchModel.systemCode != pageDesign.systemCode) {
         let systemCode = searchModel.systemCode;
         let items = allSystems.value.filter((item) => {
           return item.value == systemCode;
@@ -77,7 +80,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     function queryAllSystems() {
-      http.get("/component/super-charts/findAllSystem").then((res) => {
+      http.get(window["$vueApp"].config.globalProperties.baseAPI + "/component/super-charts/findAllSystem").then((res) => {
         const datas = res;
         const systemCodes = [];
         const tempMap = {};
@@ -156,7 +159,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         publishVersion = items.length > 0 ? items[0].version : -1;
       }
       const tableType = searchModel.tableType ? searchModel.tableType : 0;
-      const url = "/mms/data-tables/list/" + systemCode + "/" + tableType + "/" + publishVersion;
+      const url = window["$vueApp"].config.globalProperties.baseAPI + "/mms/data-tables/list/" + systemCode + "/" + tableType + "/" + publishVersion;
       console.log("searc", url);
       http.post(url, param).then((res) => {
         tableDatas.value = res.data;

package/dist/es/components/design/views/assemblys/common/common-style-background.vue.js

@@ -1,5 +1,6 @@
-import { defineComponent, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createElementBlock, unref } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createElementBlock, unref } from "vue";
 import { Plus } from "@element-plus/icons-vue";
+import { getToken } from "agilebuilder-ui/src/utils/auth";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = ["src"];
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -12,10 +13,28 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    function beforeAvatarUpload() {
+    const uploadAction = ref(window["$vueApp"].config.globalProperties.baseAPI + "/component/super-form/uploads");
+    const token = getToken();
+    const defaultShowImageAction = ref(window["$vueApp"].config.globalProperties.baseAPI + "/component/super-form/show-image?jwt=" + token + "&serverPath=");
+    console.log("uploadAction", uploadAction.value);
+    function beforeAvatarUpload(file) {
+      let limitFileSize = 3;
+      if (file.size > limitFileSize * 1024 * 1024) {
+        this.$message({
+          type: "warning",
+          message: this.$t("imatrixUIMessage.exceedFileSize", {
+            fileSize: limitFileSize
+          }),
+          showClose: true
+        });
+        return false;
+      }
     }
-    const handleAvatarSuccess = (response, uploadFile) => {
-      props.configure.style.backgroundImage = URL.createObjectURL(uploadFile.raw);
+    const handleAvatarSuccess = (response, file) => {
+      if (response) {
+        console.log("response", response);
+      }
+      props.configure.style.backgroundImageServerPath = response.serverPath;
     };
     return (_ctx, _cache) => {
       const _component_el_color_picker = resolveComponent("el-color-picker");
@@ -49,15 +68,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               default: withCtx(() => [
                 createVNode(_component_el_upload, {
                   class: "avatar-uploader",
-                  action: "https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15",
+                  accept: "image/png, image/jpeg",
+                  "with-credentials": true,
+                  action: uploadAction.value,
                   "show-file-list": false,
                   "on-success": handleAvatarSuccess,
-                  "before-upload": beforeAvatarUpload
+                  "before-upload": beforeAvatarUpload,
+                  name: "file"
                 }, {
                   default: withCtx(() => [
-                    __props.configure.style.backgroundImage ? (openBlock(), createElementBlock("img", {
+                    __props.configure.style.backgroundImageServerPath ? (openBlock(), createElementBlock("img", {
                       key: 0,
-                      src: __props.configure.style.backgroundImage,
+                      src: defaultShowImageAction.value + __props.configure.style.backgroundImageServerPath + "&_tt=" + (/* @__PURE__ */ new Date()).getTime(),
                       class: "avatar"
                     }, null, 8, _hoisted_2)) : (openBlock(), createBlock(_component_el_icon, {
                       key: 1,
@@ -70,7 +92,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     }))
                   ]),
                   _: 1
-                })
+                }, 8, ["action"])
               ]),
               _: 1
             })

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

@@ -30,6 +30,11 @@ const typeOptions = [
   {
     value: "fixed",
     label: "固定值"
+  },
+  {
+    value: "row",
+    label: "行记录"
+    // 子表行记录
   }
 ];
 const contextVarOptions = [
@@ -45,7 +50,7 @@ const contextVarOptions = [
   { value: "currentTransactorMainDepartmentId", label: "当前用户部门ID" },
   { value: "currentTransactorMainDepartmentCode", label: "当前用户部门编码" },
   { value: "currentTransactorMainDepartment", label: "当前用户部门名称" },
-  { value: "currentRoleCode", label: "当前角色编码" },
+  // { value: 'currentRoleCode', label: '当前角色编码' },
   // { value: 'currentRoleName', label: '当前角色名称' },
   // { value: 'currentWorkgroupId', label: '当前工作组ID' },
   // { value: 'currentWorkgroupName', label: '当前工作组名称' },

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

@@ -73,8 +73,8 @@ declare const _default: import('vue').DefineComponent<{
 }, {
     size: string;
     modelValue: string;
-    showLabel: boolean;
     paramTypes: string[];
+    showLabel: boolean;
     needParams: boolean;
 }, {}>;
 export default _default;

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-7a7f7d66"]]);
+const BindVariable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ea40d1e1"]]);
 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-7a7f7d66"), n = n(), popScopeId(), n);
+const _withScopeId = (n) => (pushScopeId("data-v-ea40d1e1"), 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));
@@ -116,12 +116,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         query: searchValue.value
       };
       lastSystemQuery = searchValue.value;
-      http.post("/component/system-params/query", param).then((results) => {
+      http.post(window["$vueApp"].config.globalProperties.baseAPI + "/component/system-params/query", param).then((results) => {
         const tempOptions = [];
         for (let result of results) {
           tempOptions.push({
-            value: result.key,
-            label: result.key + "  (" + result.value + ")"
+            value: result.propKey,
+            label: result.propKey + "  (" + result.propValue + ")"
           });
         }
         selectOptions.value.systemVarOptions = tempOptions;
@@ -284,7 +284,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_table = resolveComponent("el-table");
       const _component_el_row = resolveComponent("el-row");
       const _component_el_popover = resolveComponent("el-popover");
-      return __props.showLabel ? (openBlock(), createElementBlock("span", _hoisted_1, toDisplayString(labelValue.value), 1)) : (openBlock(), createBlock(_component_el_popover, {
+      return __props.showLabel ? (openBlock(), createElementBlock("span", _hoisted_1, toDisplayString(defalutValue.value), 1)) : (openBlock(), createBlock(_component_el_popover, {
         key: 1,
         ref_key: "popoverRef",
         ref: popoverRef,

package/dist/es/components/design/views/assemblys/common/page-permission-select.vue.js

@@ -98,7 +98,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       queryCustomServices();
     }
     function queryAllSystems() {
-      http.get("/component/super-charts/findAllSystem").then((res) => {
+      http.get(window["$vueApp"].config.globalProperties.baseAPI + "/component/super-charts/findAllSystem").then((res) => {
         var _a2, _b2;
         const datas = res;
         const systemCodes = [];
@@ -169,7 +169,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           propValue: searchModel.searchValue
         });
       }
-      let url = "/component/super-page-design/service-flow/list";
+      let url = window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/service-flow/list";
       let selSysVersion = null;
       if (searchModel.systemCode) {
         let selSystemItems = allSystems.value.filter((item) => {

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

@@ -3,6 +3,7 @@ import { VueDraggable } from "vue-draggable-plus";
 import _sfc_main$1 from "../../object-design.vue.js";
 import { deepCopy, getUuidv4 } from "../../../../utils/common-util.js";
 import { caculateComponentStyle } from "../../../../utils/container-design-util.js";
+import { ElMessageBox } from "element-plus";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "container-design",
   props: {
@@ -112,13 +113,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         items = props.configure.headers;
       }
       if (sourceItem.items && sourceItem.items.length > 0) {
-        if (!confirm("还有子元素，确定要删除吗?")) {
-          return;
-        }
-      }
-      const index = items.indexOf(sourceItem);
-      if (index > -1) {
-        items.splice(index, 1);
+        ElMessageBox.confirm(
+          "还有子元素，确定要删除吗?",
+          "删除",
+          {
+            confirmButtonText: "确认",
+            cancelButtonText: "取消",
+            type: "warning"
+          }
+        ).then(() => {
+          const index = items.indexOf(sourceItem);
+          if (index > -1) {
+            items.splice(index, 1);
+          }
+        }).catch((err) => {
+          console.log(err);
+        });
       }
     }
     return (_ctx, _cache) => {

package/dist/es/components/design/views/assemblys/container/flex/flex-design.vue2.js

@@ -3,6 +3,7 @@ import { useDraggable } from "vue-draggable-plus";
 import _sfc_main$1 from "../../object-design.vue.js";
 import { deepCopy, getUuidv4 } from "../../../../utils/common-util.js";
 import { caculateComponentStyle } from "../../../../utils/container-design-util.js";
+import { ElMessageBox } from "element-plus";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "flex-design",
   props: {
@@ -87,13 +88,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function deleteItem(sourceItem) {
       let items = props.configure.items;
       if (sourceItem.items && sourceItem.items.length > 0) {
-        if (!confirm("还有子元素，确定要删除吗?")) {
-          return;
-        }
-      }
-      const index = items.indexOf(sourceItem);
-      if (index > -1) {
-        items.splice(index, 1);
+        ElMessageBox.confirm(
+          "还有子元素，确定要删除吗?",
+          "删除",
+          {
+            confirmButtonText: "确认",
+            cancelButtonText: "取消",
+            type: "warning"
+          }
+        ).then(() => {
+          const index = items.indexOf(sourceItem);
+          if (index > -1) {
+            items.splice(index, 1);
+          }
+        }).catch((err) => {
+          console.log(err);
+        });
       }
     }
     return (_ctx, _cache) => {

package/dist/es/components/design/views/assemblys/container/form/form-design.vue2.js

@@ -3,6 +3,7 @@ import { useDraggable } from "vue-draggable-plus";
 import _sfc_main$1 from "../../object-design.vue.js";
 import { deepCopy, getUuidv4 } from "../../../../utils/common-util.js";
 import { caculateComponentStyle } from "../../../../utils/container-design-util.js";
+import { ElMessageBox } from "element-plus";
 const _hoisted_1 = { class: "amb-design-item-default" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "form-design",
@@ -99,14 +100,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function deleteItem(sourceItem) {
       if (sourceItem.items && sourceItem.items.length > 0) {
-        if (!confirm("还有子元素，确定要删除吗?")) {
-          return;
-        }
-      }
-      const items = props.configure.items;
-      const index = items.indexOf(sourceItem);
-      if (index > -1) {
-        items.splice(index, 1);
+        ElMessageBox.confirm(
+          "还有子元素，确定要删除吗?",
+          "删除",
+          {
+            confirmButtonText: "确认",
+            cancelButtonText: "取消",
+            type: "warning"
+          }
+        ).then(() => {
+          const items = props.configure.items;
+          const index = items.indexOf(sourceItem);
+          if (index > -1) {
+            items.splice(index, 1);
+          }
+        }).catch((err) => {
+          console.log(err);
+        });
       }
     }
     return (_ctx, _cache) => {

package/dist/es/components/design/views/assemblys/container/tools/tools-design.vue2.js

@@ -3,8 +3,9 @@ import { useDraggable } from "vue-draggable-plus";
 import _sfc_main$1 from "../../object-design.vue.js";
 import { deepCopy, getUuidv4 } from "../../../../utils/common-util.js";
 import { caculateComponentStyle } from "../../../../utils/container-design-util.js";
+import { ElMessageBox } from "element-plus";
 const _hoisted_1 = {
-  class: "amb-widget-tools-parent",
+  class: "amb-widget-tools-parent amb-design-item-default",
   style: { "width": "99.5%" }
 };
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -129,13 +130,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function deleteItem(sourceItem) {
       let items = props.configure.items;
       if (sourceItem.items && sourceItem.items.length > 0) {
-        if (!confirm("还有子元素，确定要删除吗?")) {
-          return;
-        }
-      }
-      const index = items.indexOf(sourceItem);
-      if (index > -1) {
-        items.splice(index, 1);
+        ElMessageBox.confirm("还有子元素，确定要删除吗?", "删除", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          const index = items.indexOf(sourceItem);
+          if (index > -1) {
+            items.splice(index, 1);
+          }
+        }).catch((err) => {
+          console.log(err);
+        });
       }
     }
     return (_ctx, _cache) => {