super-page-designer 2.0.26 → 2.0.31

package/dist/es/components/design/views/assemblys/form/date-picker/datepicker-attr-base.vue.js

@@ -1,5 +1,6 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode, withDirectives, vShow } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createCommentVNode, createTextVNode, withDirectives, vShow } from "vue";
 import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
+import { getCustomFuncs } from "../../../../utils/page-event-util.js";
 import _sfc_main$2 from "../../common/common-attr-size.vue.js";
 import BindVariable from "../../common/common-variable-bind.vue.js";
 import _sfc_main$1 from "../../common/common-function-code.vue.js";
@@ -16,6 +17,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props) {
     const props = __props;
     const openCollapseItems = ref(["base"]);
+    const isTable = ref(false);
+    if (props.configure.isTable) {
+      isTable.value = true;
+    }
     function afterBindVariable(modelValue) {
       props.configure.props.base.prop = modelValue;
     }
@@ -31,10 +36,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_radio_group = resolveComponent("el-radio-group");
       const _component_el_input_number = resolveComponent("el-input-number");
       const _component_el_checkbox = resolveComponent("el-checkbox");
+      const _component_el_col = resolveComponent("el-col");
+      const _component_el_row = resolveComponent("el-row");
       const _component_el_checkbox_group = resolveComponent("el-checkbox-group");
-      const _component_el_button = resolveComponent("el-button");
       const _component_el_collapse_item = resolveComponent("el-collapse-item");
-      const _component_el_col = resolveComponent("el-col");
       const _component_el_collapse = resolveComponent("el-collapse");
       const _component_el_form = resolveComponent("el-form");
       return openBlock(), createBlock(_component_el_form, {
@@ -44,7 +49,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           createVNode(_component_el_collapse, {
             modelValue: openCollapseItems.value,
-            "onUpdate:modelValue": _cache[16] || (_cache[16] = ($event) => openCollapseItems.value = $event),
+            "onUpdate:modelValue": _cache[19] || (_cache[19] = ($event) => openCollapseItems.value = $event),
             style: { "margin-top": "6px" }
           }, {
             default: withCtx(() => [
@@ -93,7 +98,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       ]),
                       _: 1
                     }),
-                    createVNode(_component_el_form_item, {
+                    !isTable.value ? (openBlock(), createBlock(_component_el_form_item, {
+                      key: 0,
                       label: "绑定变量",
                       class: "amb-design-attr-item"
                     }, {
@@ -106,7 +112,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         }, null, 8, ["modelValue"]))
                       ]),
                       _: 1
-                    }),
+                    })) : createCommentVNode("", true),
                     createVNode(_component_el_form_item, {
                       label: "默认值",
                       class: "amb-design-attr-item"
@@ -120,7 +126,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       ]),
                       _: 1
                     }),
-                    createVNode(_component_el_form_item, {
+                    !isTable.value ? (openBlock(), createBlock(_component_el_form_item, {
+                      key: 1,
                       label: "绑定权限",
                       class: "amb-design-attr-item"
                     }, {
@@ -131,8 +138,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         }, null, 8, ["configure"]))
                       ]),
                       _: 1
-                    }),
-                    createVNode(_component_el_form_item, {
+                    })) : createCommentVNode("", true),
+                    !isTable.value ? (openBlock(), createBlock(_component_el_form_item, {
+                      key: 2,
                       label: "标题显示",
                       class: "amb-design-attr-item"
                     }, {
@@ -160,8 +168,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         }, 8, ["modelValue"])
                       ]),
                       _: 1
-                    }),
-                    createVNode(_component_el_form_item, {
+                    })) : createCommentVNode("", true),
+                    withDirectives(createVNode(_component_el_form_item, {
                       label: "标题",
                       class: "amb-design-attr-item"
                     }, {
@@ -173,7 +181,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         }, null, 8, ["modelValue"])
                       ]),
                       _: 1
-                    }),
+                    }, 512), [
+                      [vShow, __props.configure.props.base.tittleShow]
+                    ]),
                     withDirectives(createVNode(_component_el_form_item, {
                       label: "标题宽度",
                       class: "amb-design-attr-item"
@@ -345,7 +355,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_checkbox_group, {
                           modelValue: __props.configure.props.base.dateScopeDetails,
-                          "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => __props.configure.props.base.dateScopeDetails = $event),
+                          "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => __props.configure.props.base.dateScopeDetails = $event),
                           class: "ml-4"
                         }, {
                           default: withCtx(() => [
@@ -387,25 +397,50 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               ]),
                               _: 1
                             }),
-                            createVNode(_component_el_checkbox, { value: "custom" }, {
+                            createVNode(_component_el_row, null, {
                               default: withCtx(() => [
-                                createTextVNode("自定义")
+                                createVNode(_component_el_col, { span: 8 }, {
+                                  default: withCtx(() => [
+                                    createVNode(_component_el_checkbox, { value: "custom" }, {
+                                      default: withCtx(() => [
+                                        createTextVNode("自定义")
+                                      ]),
+                                      _: 1
+                                    })
+                                  ]),
+                                  _: 1
+                                }),
+                                createVNode(_component_el_col, { span: 16 }, {
+                                  default: withCtx(() => [
+                                    createVNode(_component_el_select, {
+                                      style: { "margin-left": "4px" },
+                                      clearable: "",
+                                      disabled: !__props.configure.props.base.dateScopeDetails || !__props.configure.props.base.dateScopeDetails.includes("custom"),
+                                      modelValue: __props.configure.props.base.scopeFunc,
+                                      "onUpdate:modelValue": _cache[10] || (_cache[10] = ($event) => __props.configure.props.base.scopeFunc = $event),
+                                      placeholder: "请选择自定义方法",
+                                      filterable: ""
+                                    }, {
+                                      default: withCtx(() => [
+                                        (openBlock(true), createElementBlock(Fragment, null, renderList(unref(getCustomFuncs)(), (item) => {
+                                          return openBlock(), createBlock(_component_el_option, {
+                                            key: item.value,
+                                            label: item.label,
+                                            value: item.value
+                                          }, null, 8, ["label", "value"]);
+                                        }), 128))
+                                      ]),
+                                      _: 1
+                                    }, 8, ["disabled", "modelValue"])
+                                  ]),
+                                  _: 1
+                                })
                               ]),
                               _: 1
                             })
                           ]),
                           _: 1
-                        }, 8, ["modelValue"]),
-                        createVNode(_component_el_button, null, {
-                          default: withCtx(() => [
-                            createTextVNode("选择逻辑")
-                          ]),
-                          _: 1
-                        }),
-                        createVNode(_component_el_button, {
-                          icon: _ctx.Search,
-                          circle: ""
-                        }, null, 8, ["icon"])
+                        }, 8, ["modelValue"])
                       ]),
                       _: 1
                     }, 512), [
@@ -418,7 +453,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_radio_group, {
                           modelValue: __props.configure.props.base.timestamp,
-                          "onUpdate:modelValue": _cache[11] || (_cache[11] = ($event) => __props.configure.props.base.timestamp = $event),
+                          "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => __props.configure.props.base.timestamp = $event),
                           class: "ml-4"
                         }, {
                           default: withCtx(() => [
@@ -449,7 +484,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_input, {
                           modelValue: __props.configure.props.base.format,
-                          "onUpdate:modelValue": _cache[12] || (_cache[12] = ($event) => __props.configure.props.base.format = $event),
+                          "onUpdate:modelValue": _cache[13] || (_cache[13] = ($event) => __props.configure.props.base.format = $event),
                           placeholder: "请输入"
                         }, null, 8, ["modelValue"])
                       ]),
@@ -462,7 +497,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_radio_group, {
                           modelValue: __props.configure.props.base.size,
-                          "onUpdate:modelValue": _cache[13] || (_cache[13] = ($event) => __props.configure.props.base.size = $event),
+                          "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => __props.configure.props.base.size = $event),
                           class: "ml-4"
                         }, {
                           default: withCtx(() => [
@@ -497,7 +532,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_radio_group, {
                           modelValue: __props.configure.props.base.state,
-                          "onUpdate:modelValue": _cache[14] || (_cache[14] = ($event) => __props.configure.props.base.state = $event),
+                          "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => __props.configure.props.base.state = $event),
                           class: "ml-4"
                         }, {
                           default: withCtx(() => [
@@ -544,7 +579,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_checkbox, {
                           modelValue: __props.configure.props.verification.required,
-                          "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => __props.configure.props.verification.required = $event),
+                          "onUpdate:modelValue": _cache[16] || (_cache[16] = ($event) => __props.configure.props.verification.required = $event),
                           label: "必填"
                         }, null, 8, ["modelValue"])
                       ]),
@@ -559,23 +594,34 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           default: withCtx(() => [
                             createVNode(_component_el_checkbox, {
                               label: "自定义",
-                              value: "custom"
-                            })
+                              modelValue: __props.configure.props.verification.custom,
+                              "onUpdate:modelValue": _cache[17] || (_cache[17] = ($event) => __props.configure.props.verification.custom = $event)
+                            }, null, 8, ["modelValue"])
                           ]),
                           _: 1
                         }),
                         createVNode(_component_el_col, { span: 14 }, {
                           default: withCtx(() => [
-                            createVNode(_component_el_button, null, {
+                            createVNode(_component_el_select, {
+                              style: { "margin-left": "4px" },
+                              clearable: "",
+                              disabled: !__props.configure.props.verification.custom,
+                              modelValue: __props.configure.props.verification.customFunc,
+                              "onUpdate:modelValue": _cache[18] || (_cache[18] = ($event) => __props.configure.props.verification.customFunc = $event),
+                              placeholder: "请选择校验方法",
+                              filterable: ""
+                            }, {
                               default: withCtx(() => [
-                                createTextVNode("自定义逻辑")
+                                (openBlock(true), createElementBlock(Fragment, null, renderList(unref(getCustomFuncs)(), (item) => {
+                                  return openBlock(), createBlock(_component_el_option, {
+                                    key: item.value,
+                                    label: item.label,
+                                    value: item.value
+                                  }, null, 8, ["label", "value"]);
+                                }), 128))
                               ]),
                               _: 1
-                            }),
-                            createVNode(_component_el_button, {
-                              icon: _ctx.Search,
-                              circle: ""
-                            }, null, 8, ["icon"])
+                            }, 8, ["disabled", "modelValue"])
                           ]),
                           _: 1
                         })
@@ -586,10 +632,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               })),
-              (openBlock(), createBlock(_sfc_main$2, {
+              !isTable.value ? (openBlock(), createBlock(_sfc_main$2, {
                 key: __props.configure.uuid,
                 size: __props.configure.props.size
-              }, null, 8, ["size"]))
+              }, null, 8, ["size"])) : createCommentVNode("", true)
             ]),
             _: 1
           }, 8, ["modelValue"])

package/dist/es/components/design/views/assemblys/form/date-picker/datepicker-design.vue2.js

@@ -17,12 +17,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const designClass = ref("");
     const designHeaderStyle = ref({});
     const designProperty = ref({});
-    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.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 }
+    );
     function caculateDateProps() {
       let propBase = props.configure && props.configure.props ? props.configure.props.base : {};
       propBase = propBase ? propBase : {};
@@ -143,24 +147,32 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           shortcuts.push(dateParams);
         }
         tempProps.shortcuts = shortcuts;
+        if (dateScopeDetails.includes("custom") && propBase.scopeFunc) {
+          tempProps.shortcutsFunc = propBase.scopeFunc;
+        }
       }
       Object.assign(designProperty.value, tempProps);
     }
-    watch(props.configure.props, () => {
-      caculateComponentProps(props.configure, designProperty);
-      caculateDateProps();
-      const shortcuts = designProperty.value.shortcuts;
-      designProperty.value.shortcuts = [];
-      const dateType = designProperty.value.dateType;
-      designProperty.value.dateType = "daterange";
-      setTimeout(function() {
-        if (shortcuts) {
-          designProperty.value.dateType = dateType;
-          designProperty.value.shortcuts = shortcuts;
-        }
-      }, 10);
-      props.configure.runtime.props = designProperty.value;
-    }, { immediate: true });
+    watch(
+      props.configure.props,
+      () => {
+        caculateComponentProps(props.configure, designProperty);
+        caculateDateProps();
+        const shortcuts = designProperty.value.shortcuts;
+        designProperty.value.shortcuts = [];
+        const dateType = designProperty.value.dateType;
+        designProperty.value.dateType = "daterange";
+        console.log("%c描述-205312", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", designProperty.value);
+        setTimeout(function() {
+          if (shortcuts) {
+            designProperty.value.dateType = dateType;
+            designProperty.value.shortcuts = shortcuts;
+          }
+        }, 10);
+        props.configure.runtime.props = designProperty.value;
+      },
+      { immediate: true }
+    );
     return (_ctx, _cache) => {
       const _component_el_time_picker = resolveComponent("el-time-picker");
       const _component_el_date_picker = resolveComponent("el-date-picker");

package/dist/es/components/design/views/assemblys/form/dept-tree/depttree-attr-base.vue.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode, withDirectives, vShow } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createCommentVNode, createTextVNode, withDirectives, vShow } from "vue";
 import { Search } from "@element-plus/icons-vue";
 import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
 import _sfc_main$3 from "../../common/common-attr-size.vue.js";
@@ -21,6 +21,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props) {
     const props = __props;
     const openCollapseItems = ref(["base"]);
+    const isTable = ref(false);
+    if (props.configure.isTable) {
+      isTable.value = true;
+    }
     function afterBindVariable(modelValue) {
       props.configure.props.base.prop = modelValue;
     }
@@ -134,7 +138,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       ]),
                       _: 1
                     }),
-                    createVNode(_component_el_form_item, {
+                    !isTable.value ? (openBlock(), createBlock(_component_el_form_item, {
+                      key: 0,
                       label: "绑定变量",
                       class: "amb-design-attr-item"
                     }, {
@@ -147,7 +152,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         }, null, 8, ["modelValue"]))
                       ]),
                       _: 1
-                    }),
+                    })) : createCommentVNode("", true),
                     createVNode(_component_el_form_item, {
                       label: "默认值",
                       class: "amb-design-attr-item"
@@ -161,7 +166,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       ]),
                       _: 1
                     }),
-                    createVNode(_component_el_form_item, {
+                    !isTable.value ? (openBlock(), createBlock(_component_el_form_item, {
+                      key: 1,
                       label: "绑定权限",
                       class: "amb-design-attr-item"
                     }, {
@@ -172,8 +178,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         }, null, 8, ["configure"]))
                       ]),
                       _: 1
-                    }),
-                    createVNode(_component_el_form_item, {
+                    })) : createCommentVNode("", true),
+                    !isTable.value ? (openBlock(), createBlock(_component_el_form_item, {
+                      key: 2,
                       label: "标题显示",
                       class: "amb-design-attr-item"
                     }, {
@@ -201,11 +208,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         }, 8, ["modelValue"])
                       ]),
                       _: 1
-                    }),
-                    createVNode(_component_el_form_item, {
-                      label: "标题",
-                      class: "amb-design-attr-item"
-                    }, {
+                    })) : createCommentVNode("", true),
+                    withDirectives(createVNode(_component_el_form_item, { class: "amb-design-attr-item" }, {
                       default: withCtx(() => [
                         createVNode(_component_el_input, {
                           modelValue: __props.configure.props.base.title,
@@ -214,7 +218,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         }, null, 8, ["modelValue"])
                       ]),
                       _: 1
-                    }),
+                    }, 512), [
+                      [vShow, __props.configure.props.base.tittleShow]
+                    ]),
                     withDirectives(createVNode(_component_el_form_item, {
                       label: "标题宽度",
                       class: "amb-design-attr-item"
@@ -468,10 +474,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 _: 1
               })),
-              (openBlock(), createBlock(_sfc_main$3, {
+              !isTable.value ? (openBlock(), createBlock(_sfc_main$3, {
                 key: __props.configure.uuid,
                 size: __props.configure.props.size
-              }, null, 8, ["size"]))
+              }, null, 8, ["size"])) : createCommentVNode("", true)
             ]),
             _: 1
           }, 8, ["modelValue"])

package/dist/es/components/design/views/assemblys/form/dept-tree/depttree-autoset.vue.js

@@ -32,47 +32,58 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       tempTreeType = tempTreeType ? tempTreeType : "DeptUserTree";
       return tempTreeType.includes("User") ? "user" : "dept";
     });
-    const sourceFields = [{
-      name: "ID",
-      value: "id",
-      types: ["user", "dept"]
-    }, {
-      name: "编码",
-      value: "code",
-      types: ["dept"]
-    }, {
-      name: "名称",
-      value: "name",
-      types: ["user", "dept"]
-    }, {
-      name: "登录名",
-      value: "loginName",
-      types: ["user"]
-    }, {
-      name: "Email",
-      value: "email",
-      types: ["user"]
-    }, {
-      name: "Telephone",
-      value: "电话",
-      types: ["user"]
-    }, {
-      name: "正职部门名称",
-      value: "mainDeptName",
-      types: ["user"]
-    }, {
-      name: "正职部门ID",
-      value: "mainDeptId",
-      types: ["user"]
-    }, {
-      name: "分支机构名称",
-      value: "subCompanyName",
-      types: ["user"]
-    }, {
-      name: "分支机构ID",
-      value: "subCompanyId",
-      types: ["user"]
-    }];
+    const sourceFields = [
+      {
+        name: "ID",
+        value: "id",
+        types: ["user", "dept"]
+      },
+      {
+        name: "编码",
+        value: "code",
+        types: ["dept"]
+      },
+      {
+        name: "名称",
+        value: "name",
+        types: ["user", "dept"]
+      },
+      {
+        name: "登录名",
+        value: "loginName",
+        types: ["user"]
+      },
+      {
+        name: "Email",
+        value: "email",
+        types: ["user"]
+      },
+      {
+        name: "Telephone",
+        value: "电话",
+        types: ["user"]
+      },
+      {
+        name: "正职部门名称",
+        value: "mainDeptName",
+        types: ["user"]
+      },
+      {
+        name: "正职部门ID",
+        value: "mainDeptId",
+        types: ["user"]
+      },
+      {
+        name: "分支机构名称",
+        value: "subCompanyName",
+        types: ["user"]
+      },
+      {
+        name: "分支机构ID",
+        value: "subCompanyId",
+        types: ["user"]
+      }
+    ];
     function queryIndex(rowItem) {
       let sortIndex = -1;
       const itemLen = otherFieldSets.length;
@@ -148,8 +159,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         (openBlock(), createElementBlock(Fragment, null, renderList(sourceFields, (item) => {
                           return withDirectives(createVNode(_component_el_option, {
                             key: item.name,
-                            label: item.alias,
-                            value: item.name
+                            label: item.name,
+                            value: item.value
                           }, null, 8, ["label", "value"]), [
                             [vShow, item.types.includes(treeType.value)]
                           ]);
@@ -168,7 +179,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   default: withCtx((scope) => [
                     createVNode(BindVariable, {
                       modelValue: scope.row.target,
-                      paramTypes: ["data"],
+                      paramTypes: ["data", "page"],
                       "onUpdate:modelValue": (val) => afterBindLabelVariable(val, scope.row)
                     }, null, 8, ["modelValue", "onUpdate:modelValue"])
                   ]),
@@ -181,7 +192,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   default: withCtx((scope) => [
                     createVNode(_component_el_icon, {
                       size: "14",
-                      style: { "color": "#5893EF", "cursor": "pointer", "font-weight": "bold", "margin-right": "8px" },
+                      style: { "color": "#5893ef", "cursor": "pointer", "font-weight": "bold", "margin-right": "8px" },
                       onClick: ($event) => addData(scope.row)
                     }, {
                       default: withCtx(() => [
@@ -191,7 +202,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                     }, 1032, ["onClick"]),
                     createVNode(_component_el_icon, {
                       size: "14",
-                      style: { "color": "#5893EF", "cursor": "pointer" },
+                      style: { "color": "#5893ef", "cursor": "pointer" },
                       onClick: ($event) => deleteData(scope.row)
                     }, {
                       default: withCtx(() => [