super-page-designer 2.0.51 → 2.0.54

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

@@ -1,9 +1,10 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, unref, createTextVNode, createCommentVNode } from "vue";
+import { defineComponent, ref, onMounted, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode, createCommentVNode } from "vue";
 import { Plus } from "@element-plus/icons-vue";
 import _sfc_main$1 from "./page-attr-permissions.vue.js";
 import _sfc_main$2 from "./component/setting-form-rule-base-input.vue.js";
 import _sfc_main$3 from "./component/weight-field-input.vue.js";
 import _sfc_main$4 from "../workflow/component/combination.vue.js";
+import http from "agilebuilder-ui/src/utils/request";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = { class: "amb-design-attr-item-inline" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -37,19 +38,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     ]);
     ref({
-      "FIRST_TASK_ID": {
+      FIRST_TASK_ID: {
         dbColumnName: "FIRST_TASK_ID",
         label: "该流程的第一个任务的id",
         type: "TEXT",
         value: "FIRST_TASK_ID"
       },
-      "ID": {
+      ID: {
         dbColumnName: "ID",
         label: "id",
         type: "LONG",
         value: "ID"
       },
-      "AUDIT_REPORT_NO": {
+      AUDIT_REPORT_NO: {
         dbColumnName: "AUDIT_REPORT_NO",
         label: "审核报告编号",
         type: "TEXT",
@@ -57,6 +58,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     });
     const combinationVisible = ref(false);
+    const formNoRules = ref([]);
     function closeCombination() {
       combinationVisible.value = false;
     }
@@ -77,6 +79,38 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       console.log("event", event.target.value);
       event.target.value = event.target.value.trim();
     }
+    function initFormNoRules() {
+      let url = window["$vueApp"].config.globalProperties.baseAPI + "/mms/systems/getByCode/" + props.configure.systemCode;
+      if (props.configure.systemVersion) {
+        url += "?publishVersion=" + props.configure.systemVersion;
+      }
+      console.log("url------------------------------", url);
+      http.get(url).then((res) => {
+        if (res) {
+          queryFormNoRules(res.id);
+        }
+      });
+    }
+    function queryFormNoRules(systemId) {
+      let url = window["$vueApp"].config.globalProperties.baseAPI + "/mms/setting-form-rule-base/list/" + systemId;
+      const param = {
+        pagination: { currentPage: 1, pageSize: 1e3, showTotal: true },
+        searchForm: [],
+        dynamicColumnInfo: [],
+        sorts: [
+          {
+            prop: "ruleCode",
+            order: "asc"
+          }
+        ]
+      };
+      http.post(url, param).then((res) => {
+        formNoRules.value = res.data;
+      });
+    }
+    onMounted(() => {
+      initFormNoRules();
+    });
     return (_ctx, _cache) => {
       const _component_el_option = resolveComponent("el-option");
       const _component_el_select = resolveComponent("el-select");
@@ -108,28 +142,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createElementVNode("div", _hoisted_2, [
                           createVNode(_component_el_select, {
-                            modelValue: _ctx.configure.props.flexJustify,
-                            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.configure.props.flexJustify = $event),
-                            placeholder: "默认",
-                            clearable: ""
+                            modelValue: _ctx.configure.props.formNoRuleCode,
+                            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.configure.props.formNoRuleCode = $event),
+                            placeholder: "请选择",
+                            clearable: "",
+                            filterable: ""
                           }, {
                             default: withCtx(() => [
-                              createVNode(_component_el_option, {
-                                label: "start",
-                                value: "start"
-                              }),
-                              createVNode(_component_el_option, {
-                                label: "center",
-                                value: "center"
-                              }),
-                              createVNode(_component_el_option, {
-                                label: "space-between",
-                                value: "space-between"
-                              }),
-                              createVNode(_component_el_option, {
-                                label: "space-around",
-                                value: "space-around"
-                              })
+                              (openBlock(true), createElementBlock(Fragment, null, renderList(formNoRules.value, (item) => {
+                                return openBlock(), createBlock(_component_el_option, {
+                                  label: item.ruleCode + " " + (item.ruleName === item.ruleCode ? "" : "(" + item.ruleName + ")"),
+                                  value: item.ruleCode
+                                }, null, 8, ["label", "value"]);
+                              }), 256))
                             ]),
                             _: 1
                           }, 8, ["modelValue"]),

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

@@ -29,13 +29,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const selectTableDialog = ref(null);
     const refVariableDialog = ref(null);
     const workflows = ref([]);
-    const linkWorkflowCode = props.configure.props.linkWorkflowCode && props.configure.props.linkWorkflowVersion ? props.configure.props.linkWorkflowCode + ":" + props.configure.props.linkWorkflowVersion : null;
+    const linkWorkflowCode = props.configure.props.linkWorkflowCode ? props.configure.props.linkWorkflowCode : null;
     const linkWorkflowCodeInfo = ref(linkWorkflowCode);
     function selectWorkflow(value) {
       linkWorkflowCodeInfo.value = value;
       if (value && value.indexOf(":") > 0) {
         props.configure.props.linkWorkflowCode = value.substring(0, value.lastIndexOf(":"));
         props.configure.props.linkWorkflowVersion = parseInt(value.substring(value.lastIndexOf(":") + 1));
+      } else {
+        props.configure.props.linkWorkflowCode = value;
+        props.configure.props.linkWorkflowVersion = 1;
       }
       props.configure.workflowCode = props.configure.props.linkWorkflowCode;
       props.configure.workflowVersion = props.configure.props.linkWorkflowVersion;
@@ -443,13 +446,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                           default: withCtx(() => [
                             (openBlock(true), createElementBlock(Fragment, null, renderList(workflows.value, (item) => {
                               return openBlock(), createBlock(_component_el_option, {
-                                key: item.codeVersion,
+                                key: item.code,
                                 label: item.name,
-                                value: item.codeVersion
+                                value: item.code
                               }, {
                                 default: withCtx(() => [
                                   createElementVNode("span", _hoisted_4, toDisplayString(item.name), 1),
-                                  createElementVNode("span", _hoisted_5, toDisplayString(item.code) + "(V" + toDisplayString(item.definitionVersion) + ") ", 1)
+                                  createElementVNode("span", _hoisted_5, toDisplayString(item.code), 1)
                                 ]),
                                 _: 2
                               }, 1032, ["label", "value"]);
@@ -460,8 +463,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       ]),
                       _: 1
                     })) : createCommentVNode("", true),
-                    _ctx.configure.props.activeWorkflow && _ctx.configure.props.workflowSource && _ctx.configure.props.workflowSource === "create" ? (openBlock(), createBlock(_component_el_form_item, {
+                    _ctx.configure.props.activeWorkflow && _ctx.configure.props.workflowSource && _ctx.configure.props.workflowSource === "link" ? (openBlock(), createBlock(_component_el_form_item, {
                       key: 2,
+                      label: "流程编码",
+                      style: { "margin-top": "18px", "margin-bottom": "-12px" }
+                    }, {
+                      default: withCtx(() => [
+                        createTextVNode(toDisplayString(_ctx.configure.props.linkWorkflowCode), 1)
+                      ]),
+                      _: 1
+                    })) : createCommentVNode("", true),
+                    _ctx.configure.props.activeWorkflow && _ctx.configure.props.workflowSource && _ctx.configure.props.workflowSource === "create" ? (openBlock(), createBlock(_component_el_form_item, {
+                      key: 3,
                       label: "流程名称",
                       style: { "margin-top": "18px", "margin-bottom": "-12px" }
                     }, {
@@ -471,12 +484,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       _: 1
                     })) : createCommentVNode("", true),
                     _ctx.configure.props.activeWorkflow && _ctx.configure.props.workflowSource && _ctx.configure.props.workflowSource === "create" ? (openBlock(), createBlock(_component_el_form_item, {
-                      key: 3,
+                      key: 4,
                       label: "流程编码",
                       style: { "margin-top": "18px", "margin-bottom": "-12px" }
                     }, {
                       default: withCtx(() => [
-                        createTextVNode(toDisplayString(_ctx.configure.props.createWorkflowCode) + "(V1) ", 1)
+                        createTextVNode(toDisplayString(_ctx.configure.props.createWorkflowCode), 1)
                       ]),
                       _: 1
                     })) : createCommentVNode("", true)

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, watch, openBlock, createElementBlock, createElementVNode, normalizeClass, withDirectives, createVNode, vShow } from "vue";
+import { defineComponent, ref, watch, openBlock, createElementBlock, createElementVNode, normalizeClass, withDirectives, createVNode, vShow, createBlock, createCommentVNode } from "vue";
 import _sfc_main$1 from "./page-attr-base.vue.js";
 import _sfc_main$2 from "./page-attr-style.vue.js";
 import "@element-plus/icons";
@@ -94,9 +94,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           withDirectives(createVNode(_sfc_main$3, { configure: __props.configure }, null, 8, ["configure"]), [
             [vShow, typeEventClass.value]
           ]),
-          withDirectives(createVNode(_sfc_main$4, { configure: __props.configure }, null, 8, ["configure"]), [
-            [vShow, typeAdviceClass.value]
-          ])
+          typeAdviceClass.value ? (openBlock(), createBlock(_sfc_main$4, {
+            key: 0,
+            configure: __props.configure
+          }, null, 8, ["configure"])) : createCommentVNode("", true)
         ])
       ]);
     };

package/dist/es/components/design/views/assemblys/workflow/workflow-button/workflowbutton-attr-base.vue.js

@@ -1,6 +1,7 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createTextVNode } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, unref, createCommentVNode, createTextVNode } from "vue";
 import { getFormComponentOptions } from "../../../../utils/assemblys-config.js";
 import _sfc_main$1 from "../../common/common-function-code.vue.js";
+import { View, Hide } from "@element-plus/icons-vue";
 const _hoisted_1 = { style: { "padding": "8px 0px 0px 0px" } };
 const _hoisted_2 = { style: { "padding": "8px 0px 0px 0px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -10,7 +11,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     default: () => ({ props: {} })
   },
   setup(__props) {
+    const props = __props;
     const openCollapseItems = ref([]);
+    if (!props.configure.props.base.showActivityName && props.configure.props.base.showActivityName !== false) {
+      props.configure.props.base.showActivityName = true;
+    }
     return (_ctx, _cache) => {
       const _component_el_option = resolveComponent("el-option");
       const _component_el_select = resolveComponent("el-select");
@@ -19,6 +24,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_checkbox = resolveComponent("el-checkbox");
       const _component_el_col = resolveComponent("el-col");
       const _component_el_row = resolveComponent("el-row");
+      const _component_el_switch = resolveComponent("el-switch");
+      const _component_el_color_picker = resolveComponent("el-color-picker");
+      const _component_el_space = resolveComponent("el-space");
       const _component_el_collapse_item = resolveComponent("el-collapse-item");
       const _component_el_radio = resolveComponent("el-radio");
       const _component_el_radio_group = resolveComponent("el-radio-group");
@@ -31,7 +39,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         default: withCtx(() => [
           createVNode(_component_el_collapse, {
             modelValue: openCollapseItems.value,
-            "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => openCollapseItems.value = $event),
+            "onUpdate:modelValue": _cache[8] || (_cache[8] = ($event) => openCollapseItems.value = $event),
             style: { "margin-top": "6px" }
           }, {
             default: withCtx(() => [
@@ -118,6 +126,30 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                         })
                       ]),
                       _: 1
+                    }),
+                    createVNode(_component_el_form_item, {
+                      label: "环节名称",
+                      class: "amb-design-attr-item"
+                    }, {
+                      default: withCtx(() => [
+                        createVNode(_component_el_space, { wrap: "" }, {
+                          default: withCtx(() => [
+                            createVNode(_component_el_switch, {
+                              modelValue: __props.configure.props.base.showActivityName,
+                              "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => __props.configure.props.base.showActivityName = $event),
+                              "active-action-icon": unref(View),
+                              "inactive-action-icon": unref(Hide)
+                            }, null, 8, ["modelValue", "active-action-icon", "inactive-action-icon"]),
+                            __props.configure.props.base.showActivityName ? (openBlock(), createBlock(_component_el_color_picker, {
+                              key: 0,
+                              modelValue: __props.configure.props.base.activityNameColor,
+                              "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => __props.configure.props.base.activityNameColor = $event)
+                            }, null, 8, ["modelValue"])) : createCommentVNode("", true)
+                          ]),
+                          _: 1
+                        })
+                      ]),
+                      _: 1
                     })
                   ])
                 ]),
@@ -137,7 +169,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_radio_group, {
                           modelValue: __props.configure.props.base.text,
-                          "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => __props.configure.props.base.text = $event),
+                          "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.configure.props.base.text = $event),
                           class: "ml-4"
                         }, {
                           default: withCtx(() => [
@@ -166,7 +198,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_radio_group, {
                           modelValue: __props.configure.props.base.size,
-                          "onUpdate:modelValue": _cache[3] || (_cache[3] = ($event) => __props.configure.props.base.size = $event),
+                          "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => __props.configure.props.base.size = $event),
                           class: "ml-4"
                         }, {
                           default: withCtx(() => [
@@ -201,7 +233,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_radio_group, {
                           modelValue: __props.configure.props.base.plain,
-                          "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => __props.configure.props.base.plain = $event),
+                          "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => __props.configure.props.base.plain = $event),
                           class: "ml-4"
                         }, {
                           default: withCtx(() => [
@@ -230,7 +262,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       default: withCtx(() => [
                         createVNode(_component_el_radio_group, {
                           modelValue: __props.configure.props.base.round,
-                          "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => __props.configure.props.base.round = $event),
+                          "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => __props.configure.props.base.round = $event),
                           class: "ml-4"
                         }, {
                           default: withCtx(() => [

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

@@ -332,9 +332,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, null, 8, ["id", "code", "version", "system-code", "system-publish-version", "onBack"])), [
             [vShow, clickType.value === "workflow"]
           ]) : createCommentVNode("", true),
-          withDirectives(createVNode(unref(ServiceFlowDesginer), { pageContext: pageDesign.value }, null, 8, ["pageContext"]), [
-            [vShow, clickType.value === "service"]
-          ]),
+          clickType.value === "service" ? (openBlock(), createBlock(unref(ServiceFlowDesginer), {
+            key: 1,
+            pageContext: pageDesign.value
+          }, null, 8, ["pageContext"])) : createCommentVNode("", true),
           withDirectives(createVNode(_sfc_main$2, {
             ref_key: "pageEventContainerRef",
             ref: pageEventContainerRef,

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

@@ -34,6 +34,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const cacheComponent = {};
     function changeAssembly(configure) {
+      console.log("%c描述-103213", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", configure);
       if (!configure || !configure.name || configure.name == "page") {
         dynamicConfigure.value = props.pageInfo;
         dynamicComponent.value = _sfc_main$1;
@@ -89,8 +90,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           key: "attr_" + dynamicConfigure.value.uuid,
           indexObj: indexObj.value,
           pageDesign: __props.pageInfo,
-          configure: dynamicConfigure.value
-        }, null, 8, ["indexObj", "pageDesign", "configure"]))
+          configure: dynamicConfigure.value,
+          onChangeAssembly: changeAssembly
+        }, null, 40, ["indexObj", "pageDesign", "configure"]))
       ], 4);
     };
   }

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

@@ -125,12 +125,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }
     });
-    function revocation() {
-      $emits("revocation");
-    }
-    function regain() {
-      $emits("regain");
-    }
     function pageDesignClick(evt) {
       $emits("onSelectWidget", -1);
     }
@@ -339,25 +333,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 ]),
                 withDirectives(createVNode(_component_el_divider, { direction: "vertical" }, null, 512), [
                   [vShow, _ctx.selAsselbyType === "assembly"]
-                ]),
-                createElementVNode("label", {
-                  class: "amb-page-type",
-                  style: { "margin-left": "0px" }
-                }, [
-                  createElementVNode("span", {
-                    class: "iconfont icon-chexiaozuo",
-                    style: { "font-size": "23px" },
-                    onClick: revocation,
-                    title: "撤销"
-                  })
-                ]),
-                createElementVNode("label", { class: "amb-page-type" }, [
-                  createElementVNode("span", {
-                    class: "iconfont icon-chexiaoyou",
-                    style: { "font-size": "23px" },
-                    onClick: regain,
-                    title: "恢复"
-                  })
                 ])
               ]),
               createElementVNode("div", _hoisted_4, [

package/dist/es/stores/table-store.d.ts

@@ -0,0 +1,10 @@
+export declare const tableField: import('pinia').StoreDefinition<"dataOptions", import('pinia')._UnwrapAll<Pick<{
+    fieldList: import('vue').Ref<any[]>;
+    addFieldList: (tableFields: any) => void;
+}, "fieldList">>, Pick<{
+    fieldList: import('vue').Ref<any[]>;
+    addFieldList: (tableFields: any) => void;
+}, never>, Pick<{
+    fieldList: import('vue').Ref<any[]>;
+    addFieldList: (tableFields: any) => void;
+}, "addFieldList">>;

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

@@ -0,0 +1,20 @@
+import { ref } from "vue";
+import { defineStore } from "pinia";
+const tableField = defineStore("dataOptions", () => {
+  const fieldList = ref([]);
+  function addFieldList(tableFields) {
+    let arr = [];
+    tableFields.forEach((item) => {
+      arr.push({
+        value: item.name,
+        label: item.alias,
+        alias: item.alias
+      });
+    });
+    fieldList.value = arr;
+  }
+  return { fieldList, addFieldList };
+});
+export {
+  tableField
+};