super-page-designer 2.0.23 → 2.0.26

package/dist/es/components/design/views/assemblys/form/common/bar-code-rule.vue.js

@@ -1,7 +1,11 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode, unref } from "vue";
-import { Plus, Delete } from "@element-plus/icons-vue";
+import { defineComponent, ref, onMounted, resolveComponent, openBlock, createBlock, withCtx, createElementVNode, createVNode, createTextVNode, unref, createCommentVNode, createElementBlock, Fragment, renderList, toDisplayString } from "vue";
+import { Plus, Top, Bottom, Delete } from "@element-plus/icons-vue";
 import BindVariable from "../../common/common-variable-bind.vue.js";
-const _hoisted_1 = { class: "dialog-footer" };
+import http from "agilebuilder-ui/src/utils/request";
+import { ElMessage } from "element-plus";
+const _hoisted_1 = { style: { "font-weight": "bold" } };
+const _hoisted_2 = { class: "dialog-footer" };
+const _hoisted_3 = { class: "dialog-footer" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "bar-code-rule",
   props: {
@@ -13,25 +17,164 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   emits: ["close", "remove"],
   setup(__props, { emit: __emit }) {
     const props = __props;
-    const emit = __emit;
-    ref(false);
-    function remove(row) {
-      emit("remove", row);
-    }
+    const baseAPI = window["$vueApp"].config.globalProperties.baseAPI;
+    const emits = __emit;
+    const ruleSelectOptions = ref(null);
+    const ruleOutsFiledOptions = ref({});
+    const selectedRule = ref("");
+    const innerVisible = ref(false);
+    onMounted(() => {
+      if (props.ruleList && props.ruleList.length > 0) {
+        props.ruleList.forEach((rule) => {
+          if (!ruleOutsFiledOptions.value[rule.code]) {
+            if (rule.type === "group") {
+              getOptionsByGroupCode(rule.code);
+            } else {
+              getOptionsByRuleCode(rule.code);
+            }
+          }
+        });
+      }
+      getAllRules();
+    });
     function afterBindVariable(modelValue, row) {
       row.pageVariable = modelValue;
     }
-    function add() {
-      props.ruleList.push({});
+    function getAllRules() {
+      getRuleSelectOptions().then((res) => {
+        ruleSelectOptions.value = res;
+      });
+    }
+    function openRuleSelectDialog() {
+      if (!ruleSelectOptions.value) {
+        getRuleSelectOptions().then((res) => {
+          innerVisible.value = true;
+          ruleSelectOptions.value = res;
+        });
+      } else {
+        innerVisible.value = true;
+      }
+    }
+    function addRule() {
+      innerVisible.value = false;
+      const index = props.ruleList.findIndex((rule) => rule.code === selectedRule.value);
+      if (index === -1) {
+        const ruleOption = findRule(selectedRule.value);
+        props.ruleList.push({ type: ruleOption.type ?? "rule", code: ruleOption.value, outs: [] });
+        if (!ruleOutsFiledOptions.value[ruleOption.value]) {
+          if (ruleOption.type === "group") {
+            getOptionsByGroupCode(ruleOption.value);
+          } else {
+            getOptionsByRuleCode(ruleOption.value);
+          }
+        }
+      } else {
+        ElMessage.warning("已经添加过的规则分组或者规则");
+      }
+      selectedRule.value = "";
+    }
+    function getRuleSelectOptions() {
+      return http.get(baseAPI + "/dc/setting-barcode-analysis/select-options");
+    }
+    function getOptionsByGroupCode(groupCode) {
+      http.get(baseAPI + "/dc/setting-barcode-analysis/by-group/" + groupCode).then((res) => {
+        const options = [];
+        res.forEach((item) => {
+          const outs = JSON.parse(item.barcodeAnalysisOuts);
+          options.push({ label: item.name, options: outs, ruleCode: item.code });
+        });
+        ruleOutsFiledOptions.value[groupCode] = options;
+      });
+    }
+    function getOptionsByRuleCode(ruleCode) {
+      http.get(baseAPI + "/dc/setting-barcode-analysis/by-code/" + ruleCode).then((res) => {
+        const outs = JSON.parse(res.barcodeAnalysisOuts);
+        ruleOutsFiledOptions.value[ruleCode] = { label: res.name, options: outs, ruleCode: res.code };
+      });
+    }
+    function deleteRule(index) {
+      props.ruleList.splice(index, 1);
+    }
+    function addValueSet(rule) {
+      rule.outs.push({ pageVariable: "", returnedValue: "" });
+    }
+    function getRuleName(code) {
+      const option = findRule(code);
+      if (option) {
+        return option.label;
+      }
+      return code;
+    }
+    function findRule(value) {
+      if (ruleSelectOptions.value) {
+        for (const category of ruleSelectOptions.value) {
+          for (const option of category.options) {
+            if (option.value === value) {
+              return option;
+            }
+          }
+        }
+        return null;
+      }
+    }
+    function getLabel(value, ruleCode) {
+      if (ruleOutsFiledOptions.value[ruleCode]) {
+        for (const group of ruleOutsFiledOptions.value[ruleCode]) {
+          for (const item of group.options) {
+            if (item.code === value) {
+              return group.label;
+            }
+          }
+        }
+      }
+      return "";
+    }
+    function ruleGroupOutsChange(value, groupCode, row) {
+      for (const group of ruleOutsFiledOptions.value[groupCode]) {
+        for (const item of group.options) {
+          if (item.code === value) {
+            row.ruleCode = group.ruleCode;
+          }
+        }
+      }
+    }
+    function removeOuts(index, outs) {
+      outs.splice(index, 1);
+    }
+    function move(index, direction) {
+      if (direction === "up") {
+        if (index === 0) {
+          return;
+        }
+        const temp = props.ruleList[index];
+        props.ruleList[index] = props.ruleList[index - 1];
+        props.ruleList[index - 1] = temp;
+      } else {
+        if (index === props.ruleList.length - 1) {
+          return;
+        }
+        const temp = props.ruleList[index];
+        props.ruleList[index] = props.ruleList[index + 1];
+        props.ruleList[index + 1] = temp;
+      }
+    }
+    function confirm() {
+      emits("close");
     }
     return (_ctx, _cache) => {
       const _component_el_button = resolveComponent("el-button");
       const _component_el_row = resolveComponent("el-row");
+      const _component_el_empty = resolveComponent("el-empty");
+      const _component_el_divider = resolveComponent("el-divider");
+      const _component_el_col = resolveComponent("el-col");
+      const _component_el_tooltip = resolveComponent("el-tooltip");
+      const _component_el_button_group = resolveComponent("el-button-group");
       const _component_el_table_column = resolveComponent("el-table-column");
       const _component_el_option = resolveComponent("el-option");
+      const _component_el_option_group = resolveComponent("el-option-group");
       const _component_el_select = resolveComponent("el-select");
-      const _component_el_form_item = resolveComponent("el-form-item");
       const _component_el_table = resolveComponent("el-table");
+      const _component_el_scrollbar = resolveComponent("el-scrollbar");
       const _component_el_dialog = resolveComponent("el-dialog");
       return openBlock(), createBlock(_component_el_dialog, {
         "model-value": "",
@@ -42,9 +185,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }, {
         footer: withCtx(() => [
-          createElementVNode("div", _hoisted_1, [
+          createElementVNode("div", _hoisted_3, [
             createVNode(_component_el_button, {
-              onClick: _cache[0] || (_cache[0] = ($event) => _ctx.$emit("close"))
+              onClick: _cache[2] || (_cache[2] = ($event) => _ctx.$emit("close"))
             }, {
               default: withCtx(() => [
                 createTextVNode("取消")
@@ -53,7 +196,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }),
             createVNode(_component_el_button, {
               type: "primary",
-              onClick: _cache[1] || (_cache[1] = ($event) => _ctx.$emit("close"))
+              onClick: confirm
             }, {
               default: withCtx(() => [
                 createTextVNode(" 确定 ")
@@ -69,7 +212,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 icon: unref(Plus),
                 plain: "",
                 type: "primary",
-                onClick: add
+                onClick: openRuleSelectDialog
               }, {
                 default: withCtx(() => [
                   createTextVNode(" 添加 ")
@@ -79,110 +222,266 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ]),
             _: 1
           }),
-          createVNode(_component_el_table, {
-            data: __props.ruleList,
-            style: { "width": "100%" }
+          !__props.ruleList || __props.ruleList.length <= 0 ? (openBlock(), createBlock(_component_el_empty, {
+            key: 0,
+            description: ""
+          })) : createCommentVNode("", true),
+          createVNode(_component_el_scrollbar, {
+            "max-height": "400px",
+            noresize: true
           }, {
             default: withCtx(() => [
-              createVNode(_component_el_table_column, {
-                type: "selection",
-                width: "55"
-              }),
-              createVNode(_component_el_table_column, {
-                label: "序号",
-                type: "index"
-              }),
-              createVNode(_component_el_table_column, {
-                prop: "name",
-                label: "规则组"
-              }, {
-                default: withCtx((scope) => [
-                  createVNode(_component_el_select, {
-                    modelValue: scope.row.rules,
-                    "onUpdate:modelValue": ($event) => scope.row.rules = $event
-                  }, {
-                    default: withCtx(() => [
-                      createVNode(_component_el_option, {
-                        label: "规则组1",
-                        value: "pageVariable"
-                      }),
-                      createVNode(_component_el_option, {
-                        label: "规则组2",
-                        value: "modelData"
-                      })
-                    ]),
-                    _: 2
-                  }, 1032, ["modelValue", "onUpdate:modelValue"])
-                ]),
-                _: 1
-              }),
-              createVNode(_component_el_table_column, {
-                prop: "address",
-                label: "返回值"
-              }, {
-                default: withCtx((scope) => [
-                  createVNode(_component_el_select, {
-                    modelValue: scope.row.returnedValue,
-                    "onUpdate:modelValue": ($event) => scope.row.returnedValue = $event
-                  }, {
-                    default: withCtx(() => [
-                      createVNode(_component_el_option, {
-                        label: "返回值1",
-                        value: "pageVariable"
-                      }),
-                      createVNode(_component_el_option, {
-                        label: "返回值2",
-                        value: "modelData"
-                      })
-                    ]),
-                    _: 2
-                  }, 1032, ["modelValue", "onUpdate:modelValue"])
-                ]),
-                _: 1
-              }),
-              createVNode(_component_el_table_column, {
-                prop: "address",
-                label: "设置到"
-              }, {
-                default: withCtx((scope) => [
-                  createVNode(_component_el_form_item, {
-                    label: "绑定变量",
-                    class: "amb-design-attr-item"
-                  }, {
-                    default: withCtx(() => [
-                      createVNode(BindVariable, {
-                        modelValue: scope.row.pageVariable,
-                        paramTypes: ["data", "page"],
-                        "onUpdate:modelValue": (val) => afterBindVariable(val, scope.row)
-                      }, null, 8, ["modelValue", "onUpdate:modelValue"])
-                    ]),
-                    _: 2
-                  }, 1024)
-                ]),
-                _: 1
-              }),
-              createVNode(_component_el_table_column, {
-                prop: "address",
-                label: "操作"
+              (openBlock(true), createElementBlock(Fragment, null, renderList(__props.ruleList, (ruleOrGroup, index) => {
+                return openBlock(), createBlock(_component_el_row, { key: index }, {
+                  default: withCtx(() => [
+                    createVNode(_component_el_col, { span: 20 }, {
+                      default: withCtx(() => [
+                        createVNode(_component_el_divider, { "content-position": "left" }, {
+                          default: withCtx(() => [
+                            createTextVNode(toDisplayString(getRuleName(ruleOrGroup.code)), 1)
+                          ]),
+                          _: 2
+                        }, 1024)
+                      ]),
+                      _: 2
+                    }, 1024),
+                    createVNode(_component_el_col, {
+                      span: 4,
+                      style: { "display": "flex", "align-self": "center", "justify-content": "flex-end" }
+                    }, {
+                      default: withCtx(() => [
+                        createVNode(_component_el_button_group, { class: "ml-4" }, {
+                          default: withCtx(() => [
+                            createVNode(_component_el_tooltip, {
+                              class: "box-item",
+                              effect: "dark",
+                              content: "向上",
+                              placement: "top"
+                            }, {
+                              default: withCtx(() => [
+                                createVNode(_component_el_button, {
+                                  type: "primary",
+                                  disabled: index === 0,
+                                  icon: unref(Top),
+                                  onClick: ($event) => move(index, "up")
+                                }, null, 8, ["disabled", "icon", "onClick"])
+                              ]),
+                              _: 2
+                            }, 1024),
+                            createVNode(_component_el_tooltip, {
+                              class: "box-item",
+                              effect: "dark",
+                              content: "向下",
+                              placement: "top"
+                            }, {
+                              default: withCtx(() => [
+                                createVNode(_component_el_button, {
+                                  type: "primary",
+                                  disabled: index === __props.ruleList.length - 1,
+                                  icon: unref(Bottom),
+                                  onClick: ($event) => move(index, "down")
+                                }, null, 8, ["disabled", "icon", "onClick"])
+                              ]),
+                              _: 2
+                            }, 1024),
+                            createVNode(_component_el_tooltip, {
+                              class: "box-item",
+                              effect: "dark",
+                              content: "删除",
+                              placement: "top"
+                            }, {
+                              default: withCtx(() => [
+                                createVNode(_component_el_button, {
+                                  type: "danger",
+                                  icon: unref(Delete),
+                                  onClick: ($event) => deleteRule(index)
+                                }, null, 8, ["icon", "onClick"])
+                              ]),
+                              _: 2
+                            }, 1024)
+                          ]),
+                          _: 2
+                        }, 1024)
+                      ]),
+                      _: 2
+                    }, 1024),
+                    createVNode(_component_el_table, {
+                      data: ruleOrGroup.outs,
+                      style: { "width": "100%" }
+                    }, {
+                      default: withCtx(() => [
+                        createVNode(_component_el_table_column, {
+                          type: "selection",
+                          width: "55"
+                        }),
+                        createVNode(_component_el_table_column, {
+                          label: "序号",
+                          type: "index"
+                        }),
+                        createVNode(_component_el_table_column, {
+                          prop: "address",
+                          label: "返回值"
+                        }, {
+                          default: withCtx((scope) => [
+                            ruleOrGroup.type === "group" ? (openBlock(), createBlock(_component_el_select, {
+                              key: 0,
+                              size: "small",
+                              onChange: ($event) => ruleGroupOutsChange($event, ruleOrGroup.code, scope.row),
+                              modelValue: scope.row.returnedValue,
+                              "onUpdate:modelValue": ($event) => scope.row.returnedValue = $event,
+                              placeholder: "请选择"
+                            }, {
+                              label: withCtx(({ label, value }) => [
+                                createElementVNode("span", null, toDisplayString(getLabel(value, ruleOrGroup.code)) + ": ", 1),
+                                createElementVNode("span", _hoisted_1, toDisplayString(label), 1)
+                              ]),
+                              default: withCtx(() => [
+                                (openBlock(true), createElementBlock(Fragment, null, renderList(ruleOutsFiledOptions.value[ruleOrGroup.code], (group) => {
+                                  return openBlock(), createBlock(_component_el_option_group, {
+                                    key: group.label,
+                                    label: group.label
+                                  }, {
+                                    default: withCtx(() => [
+                                      (openBlock(true), createElementBlock(Fragment, null, renderList(group.options, (item) => {
+                                        return openBlock(), createBlock(_component_el_option, {
+                                          key: item.code,
+                                          label: item.fieldName,
+                                          value: item.code
+                                        }, null, 8, ["label", "value"]);
+                                      }), 128))
+                                    ]),
+                                    _: 2
+                                  }, 1032, ["label"]);
+                                }), 128))
+                              ]),
+                              _: 2
+                            }, 1032, ["onChange", "modelValue", "onUpdate:modelValue"])) : (openBlock(), createBlock(_component_el_select, {
+                              key: 1,
+                              size: "small",
+                              modelValue: scope.row.returnedValue,
+                              "onUpdate:modelValue": ($event) => scope.row.returnedValue = $event,
+                              placeholder: "请选择"
+                            }, {
+                              default: withCtx(() => [
+                                ruleOutsFiledOptions.value[ruleOrGroup.code] ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(ruleOutsFiledOptions.value[ruleOrGroup.code].options, (item) => {
+                                  return openBlock(), createBlock(_component_el_option, {
+                                    key: item.code,
+                                    label: item.fieldName,
+                                    value: item.code
+                                  }, null, 8, ["label", "value"]);
+                                }), 128)) : createCommentVNode("", true)
+                              ]),
+                              _: 2
+                            }, 1032, ["modelValue", "onUpdate:modelValue"]))
+                          ]),
+                          _: 2
+                        }, 1024),
+                        createVNode(_component_el_table_column, {
+                          prop: "address",
+                          label: "设置到"
+                        }, {
+                          default: withCtx((scope) => [
+                            createVNode(BindVariable, {
+                              modelValue: scope.row.pageVariable,
+                              paramTypes: ["data", "page"],
+                              "onUpdate:modelValue": (val) => afterBindVariable(val, scope.row)
+                            }, null, 8, ["modelValue", "onUpdate:modelValue"])
+                          ]),
+                          _: 1
+                        }),
+                        createVNode(_component_el_table_column, {
+                          label: "操作",
+                          align: "right"
+                        }, {
+                          header: withCtx(() => [
+                            createVNode(_component_el_button, {
+                              icon: unref(Plus),
+                              plain: "",
+                              type: "primary",
+                              onClick: ($event) => addValueSet(ruleOrGroup)
+                            }, {
+                              default: withCtx(() => [
+                                createTextVNode(" 添加 ")
+                              ]),
+                              _: 2
+                            }, 1032, ["icon", "onClick"])
+                          ]),
+                          default: withCtx((scope) => [
+                            createVNode(_component_el_button, {
+                              style: { "margin-right": "7px" },
+                              icon: unref(Delete),
+                              plain: "",
+                              type: "primary",
+                              onClick: ($event) => removeOuts(scope.$index, ruleOrGroup.outs)
+                            }, {
+                              default: withCtx(() => [
+                                createTextVNode(" 删除 ")
+                              ]),
+                              _: 2
+                            }, 1032, ["icon", "onClick"])
+                          ]),
+                          _: 2
+                        }, 1024)
+                      ]),
+                      _: 2
+                    }, 1032, ["data"])
+                  ]),
+                  _: 2
+                }, 1024);
+              }), 128))
+            ]),
+            _: 1
+          }),
+          createVNode(_component_el_dialog, {
+            modelValue: innerVisible.value,
+            "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => innerVisible.value = $event),
+            width: "500",
+            title: "选择规则",
+            "append-to-body": ""
+          }, {
+            footer: withCtx(() => [
+              createElementVNode("div", _hoisted_2, [
+                createVNode(_component_el_button, {
+                  type: "primary",
+                  onClick: addRule
+                }, {
+                  default: withCtx(() => [
+                    createTextVNode(" 添加 ")
+                  ]),
+                  _: 1
+                })
+              ])
+            ]),
+            default: withCtx(() => [
+              createVNode(_component_el_select, {
+                modelValue: selectedRule.value,
+                "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => selectedRule.value = $event),
+                placeholder: "请选择"
               }, {
-                default: withCtx((scope) => [
-                  createVNode(_component_el_button, {
-                    icon: unref(Delete),
-                    plain: "",
-                    type: "primary",
-                    onClick: ($event) => remove(scope.row)
-                  }, {
-                    default: withCtx(() => [
-                      createTextVNode(" 删除 ")
-                    ]),
-                    _: 2
-                  }, 1032, ["icon", "onClick"])
+                default: withCtx(() => [
+                  (openBlock(true), createElementBlock(Fragment, null, renderList(ruleSelectOptions.value, (group) => {
+                    return openBlock(), createBlock(_component_el_option_group, {
+                      key: group.label,
+                      label: group.label
+                    }, {
+                      default: withCtx(() => [
+                        (openBlock(true), createElementBlock(Fragment, null, renderList(group.options, (item) => {
+                          return openBlock(), createBlock(_component_el_option, {
+                            key: item.value,
+                            label: item.label,
+                            value: item.value
+                          }, null, 8, ["label", "value"]);
+                        }), 128))
+                      ]),
+                      _: 2
+                    }, 1032, ["label"]);
+                  }), 128))
                 ]),
                 _: 1
-              })
+              }, 8, ["modelValue"])
             ]),
             _: 1
-          }, 8, ["data"])
+          }, 8, ["modelValue"])
         ]),
         _: 1
       }, 8, ["before-close"]);

package/dist/es/components/design/views/assemblys/form/input-text/inputtext-attr-base.vue.js

@@ -27,8 +27,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
+    console.log("%c描述-120122", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", props.configure);
     if (!props.configure.props.base) {
-      props.configure.props.base = {};
+      props.configure.props.base = { prop: "" };
     }
     if (!props.configure.props.preSuffix) {
       props.configure.props.preSuffix = {};

package/dist/es/components/design/views/assemblys/form/input-text/inputtext-design.vue2.js

@@ -23,9 +23,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       let defineProps = props.configure.props ? props.configure.props : {};
       const tempProps = {};
       if (defineProps["scan"] && defineProps["scan"]["enable"]) {
-        tempProps["enable"] = true;
-      } else {
-        tempProps["enable"] = false;
+        tempProps["scan"] = defineProps["scan"];
       }
       const preSuffix = defineProps.preSuffix ? defineProps.preSuffix : {};
       if (preSuffix.preIconType || preSuffix.preText || preSuffix.sufIconType || preSuffix.sufText) {
@@ -39,18 +37,26 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       Object.assign(designProperty.value, tempProps);
     }
-    watch(props.configure.style, () => {
-      caculateDetailComponentStyle(props.configure, designStyle, designClass, designHeaderStyle);
-      console.log("%c描述-102351", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", designStyle.value);
-      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);
-      getRestsParameter();
-      props.configure.runtime.props = designProperty.value;
-    }, { immediate: true });
+    watch(
+      props.configure.style,
+      () => {
+        caculateDetailComponentStyle(props.configure, designStyle, designClass, designHeaderStyle);
+        console.log("%c描述-102351", "color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px", designStyle.value);
+        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);
+        getRestsParameter();
+        props.configure.runtime.props = designProperty.value;
+      },
+      { immediate: true }
+    );
     return (_ctx, _cache) => {
       const _component_el_input = resolveComponent("el-input");
       const _component_el_form_item = resolveComponent("el-form-item");