super-page-designer 2.0.89 → 2.0.93

package/dist/es/components/design/views/assemblys/workflow/workflow-node/workflownode-attr.vue2.js

@@ -0,0 +1,42 @@
+import { defineComponent, ref, openBlock, createElementBlock, createVNode, unref, isRef, createElementVNode, withDirectives, vShow } from "vue";
+import _sfc_main$1 from "./workflownode-attr-base.vue.js";
+import _sfc_main$2 from "./workflownode-attr-style.vue.js";
+import AttrHeader from "../../form/common/attr-header.vue.js";
+import _sfc_main$3 from "./workflownode-attr-event.vue.js";
+const _hoisted_1 = { class: "amb-design-attr-content" };
+const _hoisted_2 = { class: "amb-design-attr-list" };
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "workflownode-attr",
+  props: {
+    configure: {
+      type: Object,
+      default: () => ({ title: "Text", props: { type: "input-text" } })
+      // 设置默认值
+    }
+  },
+  setup(__props) {
+    let currentConfigType = ref("base");
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("div", _hoisted_1, [
+        createVNode(AttrHeader, {
+          modelValue: unref(currentConfigType),
+          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(currentConfigType) ? currentConfigType.value = $event : currentConfigType = $event)
+        }, null, 8, ["modelValue"]),
+        createElementVNode("div", _hoisted_2, [
+          withDirectives(createVNode(_sfc_main$1, { configure: __props.configure }, null, 8, ["configure"]), [
+            [vShow, unref(currentConfigType) === "base"]
+          ]),
+          withDirectives(createVNode(_sfc_main$2, { configure: __props.configure }, null, 8, ["configure"]), [
+            [vShow, unref(currentConfigType) === "style"]
+          ]),
+          withDirectives(createVNode(_sfc_main$3, { configure: __props.configure }, null, 8, ["configure"]), [
+            [vShow, unref(currentConfigType) === "event"]
+          ])
+        ])
+      ]);
+    };
+  }
+});
+export {
+  _sfc_main as default
+};

package/dist/es/components/design/views/assemblys/workflow/workflow-node/workflownode-design.vue.js

@@ -0,0 +1,4 @@
+import _sfc_main from "./workflownode-design.vue2.js";
+export {
+  _sfc_main as default
+};

package/dist/es/components/design/views/assemblys/workflow/workflow-node/workflownode-design.vue2.js

@@ -0,0 +1,58 @@
+import { defineComponent, ref, watch, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, toDisplayString } from "vue";
+import { caculateDetailComponentStyle, caculateComponentProps } from "../../../../utils/form-design-util.js";
+const _hoisted_1 = /* @__PURE__ */ createElementVNode("span", null, "xxxxxx", -1);
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "workflownode-design",
+  props: {
+    configure: Object
+  },
+  setup(__props) {
+    const props = __props;
+    const designStyle = ref({});
+    const designClass = ref("");
+    const designHeaderStyle = ref({});
+    const designProperty = ref({});
+    function getRestsParameter() {
+      let defineProps = props.configure.props ? props.configure.props : {};
+      const propsBase = defineProps.base ? defineProps.base : {};
+      propsBase.title ? propsBase.title : "";
+      Object.assign(designProperty.value, propsBase);
+    }
+    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);
+        console.log("designProperty", designProperty.value);
+        getRestsParameter();
+        props.configure.runtime.props = designProperty.value;
+      },
+      { immediate: true }
+    );
+    return (_ctx, _cache) => {
+      return openBlock(), createElementBlock("div", {
+        class: normalizeClass(designClass.value),
+        style: normalizeStyle(designStyle.value)
+      }, [
+        createElementVNode("div", {
+          style: normalizeStyle(designHeaderStyle.value)
+        }, [
+          createElementVNode("span", null, toDisplayString(designProperty.value.title), 1),
+          _hoisted_1
+        ], 4)
+      ], 6);
+    };
+  }
+});
+export {
+  _sfc_main as default
+};

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

@@ -94,7 +94,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         const systemVersion = pageDesign2.tableSysVersion ? pageDesign2.tableSysVersion : pageDesign2.systemVersion;
         queryTableFields(systemCode, systemVersion, tableName).then((tableFields) => {
           pageDesign2.modelFields = tableFields;
-          changeFeieldToMap(pageDesign2.modelFieldsMap, tableFields);
+          pageDesign2.modelFieldsMap = changeFeieldToMap(pageDesign2.modelFieldsMap, tableFields);
           pageDesignUtil.setPageContext(pageDesign2);
         });
       }
@@ -332,9 +332,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             version: pageDesign.value.workflowVersion,
             "system-code": pageDesign.value.systemCode,
             "system-publish-version": pageDesign.value.systemVersion,
+            "page-code": pageDesign.value.code,
             onBack: _ctx.goBack,
             onChangeDefVersion: workflowDefVersionChange
-          }, null, 8, ["id", "code", "version", "system-code", "system-publish-version", "onBack"])), [
+          }, null, 8, ["id", "code", "version", "system-code", "system-publish-version", "page-code", "onBack"])), [
             [vShow, clickType.value === "workflow"]
           ]) : createCommentVNode("", true),
           clickType.value === "service" ? (openBlock(), createBlock(unref(ServiceFlowDesginer), {

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

@@ -54,7 +54,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             o.name = "button-detail";
             if (option.value === "lineEditCreate") {
               options.splice(0, 0, o);
-            } else {
+            } else if (option.value != "search") {
               options.push(o);
             }
             o.index = btnIndex++;
@@ -266,6 +266,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!tableItem.items) {
         tableItem.items = [];
       }
+      let displayOrderStart = 2;
       if (model.fieldInfos) {
         const templateItem = tableItem.items[tableItem.items.length - 1];
         for (let f of model.fieldInfos) {
@@ -275,7 +276,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           const newColumn = deepCopy(templateItem);
           newColumn.uuid = getUuidv4();
           newColumn.name = f.componentName ? f.componentName : "";
+          newColumn.title = f.title;
+          newColumn.props.base.displayOrder = displayOrderStart++;
           newColumn.props.base.name = f.title;
+          newColumn.props.base.listColumnFixed = "false";
+          newColumn.dataType = f.dataType;
+          newColumn.props.base.querySettingName = f.querySettingName;
           if (f.align) {
             newColumn.props.base.alignTittle = f.align;
           }
@@ -306,6 +312,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }
       generateListOperateColumn(tableItem);
+      console.log("addList--------tableItem=", tableItem);
       if (!tableItem.props.dataOrigin) {
         tableItem.props.dataOrigin = {};
       }

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

@@ -7,12 +7,13 @@ import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
 import { useDraggable } from "vue-draggable-plus";
 const _hoisted_1 = { key: 0 };
 const _hoisted_2 = { key: 0 };
-const _hoisted_3 = { style: { "display": "flex" } };
-const _hoisted_4 = { key: 0 };
+const _hoisted_3 = { key: 0 };
+const _hoisted_4 = { style: { "display": "flex" } };
 const _hoisted_5 = { key: 0 };
-const _hoisted_6 = ["title"];
-const _hoisted_7 = { key: 0 };
+const _hoisted_6 = { key: 0 };
+const _hoisted_7 = ["title"];
 const _hoisted_8 = { key: 0 };
+const _hoisted_9 = { key: 0 };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "quick-add-fields",
   props: {
@@ -115,6 +116,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         label: "网址"
       }
     ];
+    const querySettingOptions = [
+      {
+        value: "no",
+        label: "不查询"
+      },
+      {
+        value: "normal",
+        label: "普通查询"
+      },
+      {
+        value: "advanced",
+        label: "高级查询"
+      }
+    ];
     const formComponents = getFormComponentOptions();
     const selRowUuid = ref(null);
     function onMouseEnter(obj) {
@@ -258,7 +273,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               uuid: getUuidv4(),
               fieldName: f.dbColumnName,
               title: f.alias,
-              width: 8
+              width: 8,
+              dataType: f.dataType
             };
             if (props.model.pageType == "form") {
               if (f.type == "DATE" || f.type == "TIME") {
@@ -419,12 +435,40 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ]),
             _: 1
           }),
+          createVNode(_component_el_table_column, {
+            prop: "querySettingName",
+            label: "查询",
+            width: "140"
+          }, {
+            default: withCtx((scope) => [
+              scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", _hoisted_3, toDisplayString(scope.row.querySettingName), 1)) : (openBlock(), createBlock(_component_el_select, {
+                key: 1,
+                size: "small",
+                modelValue: scope.row.querySettingName,
+                "onUpdate:modelValue": ($event) => scope.row.querySettingName = $event,
+                clearable: "",
+                filterable: "",
+                placeholder: "请选择"
+              }, {
+                default: withCtx(() => [
+                  (openBlock(), createElementBlock(Fragment, null, renderList(querySettingOptions, (o) => {
+                    return createVNode(_component_el_option, {
+                      label: o.label,
+                      value: o.value
+                    }, null, 8, ["label", "value"]);
+                  }), 64))
+                ]),
+                _: 2
+              }, 1032, ["modelValue", "onUpdate:modelValue"]))
+            ]),
+            _: 1
+          }),
           createVNode(_component_el_table_column, {
             prop: "componentName",
             width: "120"
           }, {
             header: withCtx(() => [
-              createElementVNode("div", _hoisted_3, [
+              createElementVNode("div", _hoisted_4, [
                 createTextVNode(" 组件 "),
                 withDirectives(createVNode(_component_el_checkbox, {
                   modelValue: allEditState.value,
@@ -440,7 +484,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               ])
             ]),
             default: withCtx((scope) => [
-              scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", _hoisted_4, toDisplayString(scope.row.componentName), 1)) : (openBlock(), createBlock(_component_el_select, {
+              scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", _hoisted_5, toDisplayString(scope.row.componentName), 1)) : (openBlock(), createBlock(_component_el_select, {
                 key: 1,
                 size: "small",
                 modelValue: scope.row.componentName,
@@ -468,7 +512,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             width: "70"
           }, {
             default: withCtx((scope) => [
-              scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", _hoisted_5, toDisplayString(scope.row.state), 1)) : (openBlock(), createBlock(_component_el_select, {
+              scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", _hoisted_6, toDisplayString(scope.row.state), 1)) : (openBlock(), createBlock(_component_el_select, {
                 key: 1,
                 size: "small",
                 disabled: !scope.row.componentName,
@@ -500,7 +544,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_6)) : (openBlock(), createBlock(_component_el_select, {
+              }, toDisplayString(scope.row.valid), 9, _hoisted_7)) : (openBlock(), createBlock(_component_el_select, {
                 key: 1,
                 disabled: !scope.row.componentName,
                 size: "small",
@@ -532,7 +576,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             width: "75"
           }, {
             default: withCtx((scope) => [
-              scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", _hoisted_7, toDisplayString(scope.row.width), 1)) : (openBlock(), createBlock(_component_el_select, {
+              scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", _hoisted_8, toDisplayString(scope.row.width), 1)) : (openBlock(), createBlock(_component_el_select, {
                 key: 1,
                 size: "small",
                 modelValue: scope.row.width,
@@ -560,7 +604,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             width: "70"
           }, {
             default: withCtx((scope) => [
-              scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", _hoisted_8, toDisplayString(scope.row.align), 1)) : (openBlock(), createBlock(_component_el_select, {
+              scope.row.uuid != selRowUuid.value ? (openBlock(), createElementBlock("label", _hoisted_9, toDisplayString(scope.row.align), 1)) : (openBlock(), createBlock(_component_el_select, {
                 key: 1,
                 size: "small",
                 modelValue: scope.row.align,

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

@@ -1,6 +1,7 @@
 import { ref } from "vue";
 import { defineStore } from "pinia";
 import { FuncType } from "super-page-runtime";
+import { getModelOptionsByFields } from "../components/design/utils/page-table-util.js";
 const usePageContextStore = defineStore("pageContextUtil", () => {
   const pageContext = ref({ systemCode: "", systemVersion: -1 });
   ref([]);
@@ -15,15 +16,7 @@ const usePageContextStore = defineStore("pageContextUtil", () => {
   }
   function setPageContextVarOptions(pageObject) {
     if (pageObject && pageObject.modelFields) {
-      pageContextVarOptions.value.dataOptions = [];
-      pageObject.modelFields.forEach((element) => {
-        pageContextVarOptions.value.dataOptions.push({
-          value: element.dbColumnName,
-          // element.name
-          label: element.alias,
-          alias: element.alias
-        });
-      });
+      pageContextVarOptions.value.dataOptions = getModelOptionsByFields(pageObject.modelFields);
       pageContextVarOptions.value.pageVarOptions = setVarOptions(pageObject.variables);
     }
   }