super-page-designer 2.1.55 → 2.1.61

package/dist/es/components/design/views/assemblys/form/custom/custom-attr-base.vue.js

@@ -1,5 +1,5 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode } from "vue";
-import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createTextVNode, toDisplayString } from "vue";
+import "../../../../utils/assemblys-config.js";
 import "@element-plus/icons-vue";
 import _sfc_main$4 from "../../common/common-attr-size.vue.js";
 import "../common/dimension-input.vue.js";
@@ -27,8 +27,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props) {
     const openCollapseItems = ref([]);
     return (_ctx, _cache) => {
-      const _component_el_option = resolveComponent("el-option");
-      const _component_el_select = resolveComponent("el-select");
       const _component_el_form_item = resolveComponent("el-form-item");
       const _component_el_input = resolveComponent("el-input");
       const _component_el_radio = resolveComponent("el-radio");
@@ -44,7 +42,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           createVNode(_component_el_collapse, {
             modelValue: openCollapseItems.value,
-            "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => openCollapseItems.value = $event),
+            "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => openCollapseItems.value = $event),
             style: { "margin-top": "6px" }
           }, {
             default: withCtx(() => [
@@ -60,22 +58,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       class: "amb-design-attr-item"
                     }, {
                       default: withCtx(() => [
-                        createVNode(_component_el_select, {
-                          modelValue: __props.configure.name,
-                          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.configure.name = $event),
-                          placeholder: "请选择"
-                        }, {
-                          default: withCtx(() => [
-                            (openBlock(true), createElementBlock(Fragment, null, renderList(unref(getFormComponentOptions)(), (item) => {
-                              return openBlock(), createBlock(_component_el_option, {
-                                key: item.name,
-                                label: item.label,
-                                value: item.name
-                              }, null, 8, ["label", "value"]);
-                            }), 128))
-                          ]),
-                          _: 1
-                        }, 8, ["modelValue"])
+                        createTextVNode(toDisplayString(__props.configure.label) + "(" + toDisplayString(__props.configure.name) + ") ", 1)
                       ]),
                       _: 1
                     }),
@@ -86,7 +69,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_input, {
                           modelValue: __props.configure.props.base.name,
-                          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => __props.configure.props.base.name = $event),
+                          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => __props.configure.props.base.name = $event),
                           placeholder: "请输入"
                         }, null, 8, ["modelValue"])
                       ]),
@@ -99,7 +82,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_input, {
                           modelValue: __props.configure.props.base.prop,
-                          "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => __props.configure.props.base.prop = $event),
+                          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => __props.configure.props.base.prop = $event),
                           placeholder: "请输入"
                         }, null, 8, ["modelValue"])
                       ]),
@@ -112,7 +95,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_sfc_main$1, {
                           modelValue: __props.configure.props.base.title,
-                          "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => __props.configure.props.base.title = $event)
+                          "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => __props.configure.props.base.title = $event)
                         }, null, 8, ["modelValue"])
                       ]),
                       _: 1
@@ -124,7 +107,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_input, {
                           modelValue: __props.configure.props.base.titleWidth,
-                          "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.configure.props.base.titleWidth = $event),
+                          "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => __props.configure.props.base.titleWidth = $event),
                           placeholder: "请输入"
                         }, null, 8, ["modelValue"])
                       ]),
@@ -137,7 +120,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_radio_group, {
                           modelValue: __props.configure.props.base.tittleShow,
-                          "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => __props.configure.props.base.tittleShow = $event),
+                          "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.configure.props.base.tittleShow = $event),
                           class: "ml-4"
                         }, {
                           default: withCtx(() => [
@@ -166,7 +149,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_radio_group, {
                           modelValue: __props.configure.props.base.state,
-                          "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => __props.configure.props.base.state = $event),
+                          "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => __props.configure.props.base.state = $event),
                           class: "ml-4"
                         }, {
                           default: withCtx(() => [
@@ -226,7 +209,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_checkbox, {
                           modelValue: __props.configure.props.verification.required,
-                          "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => __props.configure.props.verification.required = $event),
+                          "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => __props.configure.props.verification.required = $event),
                           label: "必填"
                         }, null, 8, ["modelValue"])
                       ]),

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

@@ -96,7 +96,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           const bindEvents = props.configure.events.filter((event) => {
             return !event.isStandard && event.jsContent || event.isStandard && event.eventName;
           });
-          console.log("bindEvents=========", bindEvents);
           if (!props.configure.runtime) {
             props.configure.runtime = {};
           }
@@ -192,19 +191,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       });
     }
     if (props.pageDesign.props) {
-      watch(() => props.pageDesign.props.activeWorkflow, (newValue, oldValue) => {
-        if (newValue) {
-          const requiredRules = props.configure.props && props.configure.props.rules ? props.configure.props.rules.filter((item) => item.required) : null;
-          if (requiredRules && requiredRules.length > 0) {
-            requiredRules.forEach((item) => {
-              item.required = false;
-            });
-          }
-          if (props.configure.props && props.configure.props.verification && props.configure.props.verification.required) {
-            props.configure.props.verification.required = false;
+      watch(
+        () => props.pageDesign.props.activeWorkflow,
+        (newValue, oldValue) => {
+          if (newValue) {
+            const requiredRules = props.configure.props && props.configure.props.rules ? props.configure.props.rules.filter((item) => item.required) : null;
+            if (requiredRules && requiredRules.length > 0) {
+              requiredRules.forEach((item) => {
+                item.required = false;
+              });
+            }
+            if (props.configure.props && props.configure.props.verification && props.configure.props.verification.required) {
+              props.configure.props.verification.required = false;
+            }
           }
         }
-      });
+      );
     }
     const thisRef = ref(null);
     const designStyle = ref({});
@@ -279,7 +281,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         };
       }
       designClass.value = tempStyle[dimentions + "_class"];
-      console.log("outerStyle1", styleConf, tempStyle);
       return style;
     });
     watch(props.selectWidget, (newValue) => {

package/dist/es/components/design/views/assemblys/page/page-attr-advanced.vue.js

@@ -146,7 +146,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, {
             default: withCtx(() => [
               createVNode(_component_el_collapse_item, {
-                title: "表单编号规则",
+                title: "高级配置",
                 name: "formNumber",
                 class: "amb-design-attr-group-header"
               }, {

package/dist/es/components/design/views/assemblys/workflow/component/combination.vue.js

@@ -87,13 +87,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function changeFieldName(index, row, propDbName) {
       const item = props.fieldMap[propDbName];
-      if (item.type === "date") {
+      if (item && item.type === "date") {
         tableData.value[index].isDate = true;
       } else {
         tableData.value[index].isDate = false;
       }
-      row.propName = item.name;
-      row.dataType = item.dataType;
+      row.propName = item ? item.name : null;
+      row.dataType = item ? item.dataType : null;
       operationArr.value[index] = getOperators(item);
     }
     function savebuttonSetting() {

package/dist/es/components/design/views/design/view/components/quick-add-dialog.vue.js

@@ -343,6 +343,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       for (let item of items) {
         pageDesign.items.push(item);
       }
+      if (items) {
+        for (let item of items) {
+          setPagetemI18nKey(item, props.pageDesign);
+        }
+      }
       pageDesign.pageType = model.pageType;
     }
     function generateListOperateColumn(gridConf) {

package/dist/es/components/design/views/design/view/components/quick-add-fields.vue.js

@@ -8,13 +8,14 @@ import { useDraggable } from "vue-draggable-plus";
 const _hoisted_1 = { key: 0 };
 const _hoisted_2 = { key: 0 };
 const _hoisted_3 = { key: 0 };
-const _hoisted_4 = { key: 0 };
-const _hoisted_5 = { style: { "display": "flex" } };
-const _hoisted_6 = { key: 0 };
+const _hoisted_4 = { style: { "display": "flex" } };
+const _hoisted_5 = { key: 0 };
+const _hoisted_6 = { style: { "display": "flex" } };
 const _hoisted_7 = { key: 0 };
-const _hoisted_8 = ["title"];
-const _hoisted_9 = { key: 0 };
+const _hoisted_8 = { key: 0 };
+const _hoisted_9 = ["title"];
 const _hoisted_10 = { key: 0 };
+const _hoisted_11 = { key: 0 };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "quick-add-fields",
   props: {
@@ -26,6 +27,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { expose: __expose }) {
     const props = __props;
     const allEditState = ref(null);
+    const allExporEditState = ref(null);
     ref([]);
     const thisRef = ref(null);
     onMounted(() => {
@@ -171,6 +173,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       });
     }
+    function exporEditState() {
+      if (!props.model.fieldInfos || props.model.fieldInfos.length == 0) {
+        return;
+      }
+      const message = allExporEditState.value ? "确定全部设置为可导出吗?" : "确定要全部取消可导出吗?";
+      ElMessageBox.confirm(message, "确认", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(({ value }) => {
+        for (let f of props.model.fieldInfos) {
+          if (allExporEditState.value) {
+            if (!f.exportable) {
+              f.exportable = true;
+            }
+          } else {
+            f.exportable = false;
+          }
+        }
+      });
+    }
     function removeAll() {
       ElMessageBox.confirm("确定要全部清除吗?", "确认", {
         confirmButtonText: "确定",
@@ -310,8 +333,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_option = resolveComponent("el-option");
       const _component_el_select = resolveComponent("el-select");
       const _component_el_input = resolveComponent("el-input");
-      const _component_el_switch = resolveComponent("el-switch");
       const _component_el_checkbox = resolveComponent("el-checkbox");
+      const _component_el_switch = resolveComponent("el-switch");
       const _component_el_table = resolveComponent("el-table");
       return openBlock(), createBlock(_component_el_table, {
         size: "small",
@@ -470,8 +493,24 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             label: "导出",
             width: "120"
           }, {
+            header: withCtx(() => [
+              createElementVNode("div", _hoisted_4, [
+                createTextVNode(" 导出 "),
+                withDirectives(createVNode(_component_el_checkbox, {
+                  modelValue: allExporEditState.value,
+                  "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => allExporEditState.value = $event),
+                  value: "1",
+                  label: "全部可导出",
+                  size: "small",
+                  style: { "margin-left": "6px" },
+                  onChange: exporEditState
+                }, null, 8, ["modelValue"]), [
+                  [vShow, __props.model.pageType == "list"]
+                ])
+              ])
+            ]),
             default: withCtx((scope) => [
-              scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", _hoisted_4, toDisplayString(scope.row.exportable), 1)) : (openBlock(), createBlock(_component_el_switch, {
+              scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", _hoisted_5, toDisplayString(scope.row.exportable), 1)) : (openBlock(), createBlock(_component_el_switch, {
                 key: 1,
                 modelValue: scope.row.exportable,
                 "onUpdate:modelValue": ($event) => scope.row.exportable = $event
@@ -484,11 +523,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             width: "120"
           }, {
             header: withCtx(() => [
-              createElementVNode("div", _hoisted_5, [
+              createElementVNode("div", _hoisted_6, [
                 createTextVNode(" 组件 "),
                 withDirectives(createVNode(_component_el_checkbox, {
                   modelValue: allEditState.value,
-                  "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => allEditState.value = $event),
+                  "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => allEditState.value = $event),
                   value: "1",
                   label: "全部可编辑",
                   size: "small",
@@ -500,7 +539,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ])
             ]),
             default: withCtx((scope) => [
-              scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", _hoisted_6, toDisplayString(scope.row.componentName), 1)) : (openBlock(), createBlock(_component_el_select, {
+              scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", _hoisted_7, toDisplayString(scope.row.componentName), 1)) : (openBlock(), createBlock(_component_el_select, {
                 key: 1,
                 size: "small",
                 modelValue: scope.row.componentName,
@@ -528,7 +567,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             width: "70"
           }, {
             default: withCtx((scope) => [
-              scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", _hoisted_7, toDisplayString(scope.row.state), 1)) : (openBlock(), createBlock(_component_el_select, {
+              scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", _hoisted_8, toDisplayString(scope.row.state), 1)) : (openBlock(), createBlock(_component_el_select, {
                 key: 1,
                 size: "small",
                 disabled: !scope.row.componentName,
@@ -560,7 +599,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", {
                 key: 0,
                 title: scope.row.valid
-              }, toDisplayString(scope.row.valid), 9, _hoisted_8)) : (openBlock(), createBlock(_component_el_select, {
+              }, toDisplayString(scope.row.valid), 9, _hoisted_9)) : (openBlock(), createBlock(_component_el_select, {
                 key: 1,
                 disabled: !scope.row.componentName,
                 size: "small",
@@ -592,7 +631,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             width: "75"
           }, {
             default: withCtx((scope) => [
-              scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", _hoisted_9, toDisplayString(scope.row.width), 1)) : (openBlock(), createBlock(_component_el_select, {
+              scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", _hoisted_10, toDisplayString(scope.row.width), 1)) : (openBlock(), createBlock(_component_el_select, {
                 key: 1,
                 size: "small",
                 modelValue: scope.row.width,
@@ -620,7 +659,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             width: "70"
           }, {
             default: withCtx((scope) => [
-              scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", _hoisted_10, toDisplayString(scope.row.align), 1)) : (openBlock(), createBlock(_component_el_select, {
+              scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", _hoisted_11, toDisplayString(scope.row.align), 1)) : (openBlock(), createBlock(_component_el_select, {
                 key: 1,
                 size: "small",
                 modelValue: scope.row.align,

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

@@ -162,6 +162,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     });
     function saveForm() {
+      if (props.configure.i18nKeys && props.configure.i18nKeys.length > 0) {
+        props.configure.i18nKeys = Array.from(new Set(props.configure.i18nKeys));
+      }
       const configureCopy = JSON.parse(JSON.stringify(props.configure));
       configureCopy.tableRuntimes = {};
       beforeSaveForm(configureCopy);

package/dist/es/style.css

@@ -1292,6 +1292,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;
 }
@@ -3764,10 +3768,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;
 }
@@ -5004,10 +5004,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;
 }
@@ -5626,6 +5622,10 @@ fieldset.amb-design-item-selected {
   padding: 10px;
   font-weight: bold;
 }
+
+.el-select__wrapper.is-disabled{
+		cursor: default;
+}
 .el-tree-node__content {
   height: 34px !important;
 }
@@ -17511,28 +17511,10 @@ li[data-v-a555cba7] {
   padding-bottom: 5px;
 }
 
-.seleteSort[data-v-8aacbe0c] {
-  border-radius: 5px;
-  border: 1px solid rgba(88, 147, 239);
-}
-
 [data-v-3528c938] .el-cascader-menu {
   min-width: 120px !important;
 }
 
-.editorTool[data-v-39d5d5cf] {
-  margin-left: auto;
-}
-.editorOption[data-v-39d5d5cf] {
-  margin-right: 10px;
-  cursor: pointer;
-}
-.pppp[data-v-39d5d5cf] {
-  display: flex; /* 使用Flex布局 */
-  justify-content: flex-start;
-  align-items: center; /* 子元素在交叉轴（垂直方向）上居中对齐 */
-}
-
 .icon-set-center-body[data-v-181d1ce8]{
 	display: grid;
 	grid-template-columns:repeat(5,1fr);
@@ -17570,6 +17552,24 @@ li[data-v-a555cba7] {
 	margin-bottom: 20px;
 }
 
+.editorTool[data-v-39d5d5cf] {
+  margin-left: auto;
+}
+.editorOption[data-v-39d5d5cf] {
+  margin-right: 10px;
+  cursor: pointer;
+}
+.pppp[data-v-39d5d5cf] {
+  display: flex; /* 使用Flex布局 */
+  justify-content: flex-start;
+  align-items: center; /* 子元素在交叉轴（垂直方向）上居中对齐 */
+}
+
+.seleteSort[data-v-8aacbe0c] {
+  border-radius: 5px;
+  border: 1px solid rgba(88, 147, 239);
+}
+
 .seleteSort[data-v-1dada466] {
 	border-radius: 5px;
 	border: 1px solid rgba(88, 147, 239);
@@ -17632,15 +17632,15 @@ li[data-v-4fd4369c] {
 	margin-left: 10px;
 }
 
-[data-v-1aa6f1ab] .centered-input .el-input__inner {
-  text-align: center;
-}
-
 .seleteSort[data-v-a62867e0] {
   border-radius: 5px;
   border: 1px solid rgba(88, 147, 239);
 }
 
+[data-v-1aa6f1ab] .centered-input .el-input__inner {
+  text-align: center;
+}
+
 .row-backgroud-header-tittle[data-v-b203475d]{
 	display: flex;
 	justify-content: space-between;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-designer",
-  "version": "2.1.55",
+  "version": "2.1.61",
   "description": "AgileBuilder super page designer",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -28,7 +28,8 @@
     "@logicflow/layout": "1.2.0-alpha.16",
     "@vitejs/plugin-vue": "^5.0.4",
     "@vueuse/core": "^10.9.0",
-    "agilebuilder-ui": "1.0.87",
+    "agilebuilder-private-libs": "1.0.26",
+    "agilebuilder-ui": "1.0.90",
     "echarts": "^5.5.0",
     "element-plus": "^2.6.1",
     "font-awesome": "^4.7.0",
@@ -39,8 +40,8 @@
     "pinia": "^2.1.7",
     "qrcode": "^1.5.3",
     "quill": "^2.0.1",
-    "service-flow-designer": "2.1.53",
-    "super-page-runtime": "2.1.54",
+    "service-flow-designer": "2.1.59",
+    "super-page-runtime": "2.1.60",
     "uuid": "^9.0.1",
     "vite": "^5.1.6",
     "vite-plugin-node-stdlib-browser": "^0.2.1",
@@ -51,7 +52,7 @@
     "vue-echarts": "^6.6.9",
     "vue-router": "^4.3.0",
     "vuex": "^4.1.0",
-    "workflow-editor": "0.0.45-up"
+    "workflow-editor": "0.0.47-up"
   },
   "devDependencies": {
     "@codemirror/autocomplete": "^6.16.0",