@jeecg/online 3.4.3-beta → 3.4.4-beta

package/AuthFieldConfig.js

@@ -166,5 +166,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     }, 8, ["onRegister"])
   ]);
 }
-var AuthFieldConfig = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-b6df4cb4"]]);
+var AuthFieldConfig = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-63e05357"]]);
 export { AuthFieldConfig as default };

package/CgformCopyList.js

@@ -10,6 +10,7 @@ import AuthManagerDrawer from "./AuthManagerDrawer.js";
 import AuthSetterModal from "./AuthSetterModal.js";
 import { C as CgformPageType, u as useCgformList } from "./useCgformList.js";
 import { _ as _export_sfc } from "./index.js";
+import "/@/components/Icon";
 import "/@/components/Modal";
 import "/@/components/Form/index";
 import "/@/hooks/web/useMessage";
@@ -38,6 +39,7 @@ import "./omit.js";
 import "./_baseClone.js";
 import "./_baseSlice.js";
 import "./LinkTableFieldConfigModal.js";
+import "./FieldExtendJsonModal.js";
 import "./CheckDictTable.js";
 import "/@/components/jeecg/JPrompt";
 import "/@/hooks/web/useDesign";
@@ -89,7 +91,7 @@ import "./LeftUser.js";
 import "./AuthFieldTree.js";
 import "./AuthButtonTree.js";
 import "./AuthDataTree.js";
-import "/@/hooks/web/useCopyModal";
+import "./clipboard.js";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
 const _sfc_main = defineComponent({
   name: "CgformCopyList",

package/CgformModal.js

@@ -38,6 +38,7 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 import { defineComponent, ref, computed, provide, reactive, nextTick, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createVNode, createTextVNode, createElementBlock, Fragment, renderList, toDisplayString, createCommentVNode, createElementVNode, toRaw } from "vue";
+import { Icon } from "/@/components/Icon";
 import { BasicModal, useModalInner, useModal } from "/@/components/Modal";
 import { BasicForm, useForm } from "/@/components/Form/index";
 import { useMessage } from "/@/hooks/web/useMessage";
@@ -100,7 +101,8 @@ const _sfc_main = defineComponent({
     ForeignKeyTable,
     IndexTable,
     QueryTable,
-    ExtendConfigModal
+    ExtendConfigModal,
+    Icon
   },
   emits: ["success", "register"],
   props: {
@@ -547,6 +549,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_CheckDictTable = resolveComponent("CheckDictTable");
   const _component_ForeignKeyTable = resolveComponent("ForeignKeyTable");
   const _component_IndexTable = resolveComponent("IndexTable");
+  const _component_Icon = resolveComponent("Icon");
+  const _component_a_tooltip = resolveComponent("a-tooltip");
   const _component_QueryTable = resolveComponent("QueryTable");
   const _component_a_tabs = resolveComponent("a-tabs");
   const _component_a_spin = resolveComponent("a-spin");
@@ -717,10 +721,23 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                     _: 1
                   }),
                   createVNode(_component_a_tab_pane, {
-                    tab: "\u67E5\u8BE2\u914D\u7F6E",
                     key: "queryTable",
                     forceRender: ""
                   }, {
+                    tab: withCtx(() => [
+                      createElementVNode("span", null, [
+                        createTextVNode(" \u4E2A\u6027\u67E5\u8BE2\u914D\u7F6E "),
+                        createVNode(_component_a_tooltip, null, {
+                          title: withCtx(() => [
+                            createTextVNode("\u5141\u8BB8\u81EA\u5B9A\u4E49\uFF0C\u67E5\u8BE2\u8868\u5355\u5B57\u6BB5\u63A7\u4EF6\u7C7B\u578B\uFF01")
+                          ]),
+                          default: withCtx(() => [
+                            createVNode(_component_Icon, { icon: "bx:help-circle" })
+                          ]),
+                          _: 1
+                        })
+                      ])
+                    ]),
                     default: withCtx(() => [
                       createVNode(_component_QueryTable, {
                         ref: "queryTable",

package/CgreportModal.js

@@ -601,6 +601,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           createVNode(_component_a_tabs, {
             activeKey: activeKey.value,
             "onUpdate:activeKey": _cache[0] || (_cache[0] = ($event) => activeKey.value = $event),
+            animated: "",
             onChange: unref(handleChangeTabs)
           }, {
             default: withCtx(() => [

package/CheckDictTable.js

@@ -237,5 +237,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   }, 16, ["class", "maxHeight", "loading", "columns", "dataSource"]);
 }
-var CheckDictTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-074f2007"]]);
+var CheckDictTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-8470723a"]]);
 export { CheckDictTable as default };

package/DetailForm.js

@@ -493,9 +493,11 @@ const _hoisted_14 = { class: "ant-upload-list ant-upload-list-text" };
 const _hoisted_15 = { class: "" };
 const _hoisted_16 = { class: "ant-upload-list-item ant-upload-list-item-done ant-upload-list-item-list-type-text" };
 const _hoisted_17 = { class: "ant-upload-list-item-info" };
-const _hoisted_18 = ["href"];
-const _hoisted_19 = { class: "ant-upload-list-item-card-actions" };
-const _hoisted_20 = {
+const _hoisted_18 = { class: "ant-upload-span" };
+const _hoisted_19 = { class: "ant-upload-text-icon" };
+const _hoisted_20 = ["href"];
+const _hoisted_21 = { class: "ant-upload-list-item-card-actions" };
+const _hoisted_22 = {
   key: 4,
   class: "item-content"
 };
@@ -570,15 +572,17 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                         createElementVNode("span", null, [
                           createElementVNode("div", _hoisted_16, [
                             createElementVNode("div", _hoisted_17, [
-                              createElementVNode("span", null, [
-                                createVNode(_component_paper_clip_outlined),
+                              createElementVNode("span", _hoisted_18, [
+                                createElementVNode("div", _hoisted_19, [
+                                  createVNode(_component_paper_clip_outlined)
+                                ]),
                                 createElementVNode("a", {
                                   href: url,
                                   target: "_blank",
                                   rel: "noopener noreferrer",
-                                  class: "ant-upload-list-item-name ant-upload-list-item-name-icon-count-1"
-                                }, toDisplayString(_ctx.getFilename(url)), 9, _hoisted_18),
-                                createElementVNode("span", _hoisted_19, [
+                                  class: "ant-upload-list-item-name"
+                                }, toDisplayString(_ctx.getFilename(url)), 9, _hoisted_20),
+                                createElementVNode("span", _hoisted_21, [
                                   createVNode(_component_download_outlined, {
                                     onClick: ($event) => _ctx.handleDownloadFile(url)
                                   }, null, 8, ["onClick"])
@@ -590,7 +594,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                       ]);
                     }), 256))
                   ])
-                ])) : (openBlock(), createElementBlock("div", _hoisted_20, toDisplayString(_ctx.detailFormData[item.field]), 1))
+                ])) : (openBlock(), createElementBlock("div", _hoisted_22, toDisplayString(_ctx.detailFormData[item.field]), 1))
               ])
             ]),
             _: 2
@@ -601,5 +605,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     })
   ], 2);
 }
-var DetailForm = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-3491a563"]]);
+var DetailForm = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-47915cc7"]]);
 export { DetailForm as default };

package/EnhanceJsHistory.js

@@ -221,7 +221,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   }, 8, ["onRegister", "confirmLoading", "onCancel"]);
 }
-var EnhanceJsHistory = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-3e3ee46a"]]);
+var EnhanceJsHistory = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-0e8e9411"]]);
 var EnhanceJsHistory$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": EnhanceJsHistory

package/EnhanceJsModal.js

@@ -124,6 +124,13 @@ const _sfc_main = defineComponent({
         } catch (e) {
           console.error(e);
         }
+        setTimeout(() => {
+          if (type == "list") {
+            listEditorRef.value.refresh();
+          } else {
+            formEditorRef.value.refresh();
+          }
+        }, 150);
       });
     }
     function onShowHistory() {

package/ExtendConfigModal.js

@@ -147,5 +147,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     _: 1
   }, 8, ["onRegister", "onOk", "onCancel"]);
 }
-var ExtendConfigModal = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-63fff65e"]]);
+var ExtendConfigModal = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-1eeac864"]]);
 export { ExtendConfigModal as default };

package/FieldExtendJsonModal.js

@@ -0,0 +1,270 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { defineComponent, ref, reactive, toRaw, toRefs, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createVNode } from "vue";
+import { BasicModal, useModalInner } from "/@/components/Modal";
+import { BasicForm, useForm } from "/@/components/Form/index";
+import { _ as _export_sfc } from "./index.js";
+import { p as pick } from "./pick.js";
+import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "/@/hooks/web/useMessage";
+import "vue-router";
+import "./_flatRest.js";
+import "./isArray.js";
+import "./toString.js";
+import "./_arrayPush.js";
+const _sfc_main = defineComponent({
+  name: "FieldExtendJsonModal",
+  components: {
+    BasicModal,
+    BasicForm
+  },
+  emits: ["success", "register"],
+  setup(_p, { emit }) {
+    const spinningLoading = ref(false);
+    function initExtendConfig() {
+      extendConfig.uploadnum = 0;
+      extendConfig.showLength = "";
+      extendConfig.popupMulti = true;
+      extendConfig.multiSelect = true;
+      extendConfig.store = "";
+      extendConfig.text = "";
+      extendConfig.orderRule = "";
+      extendConfig.validateError = "";
+    }
+    const extendConfig = reactive({
+      uploadnum: 0,
+      showLength: "",
+      popupMulti: true,
+      store: "",
+      text: "",
+      multiSelect: true,
+      orderRule: "",
+      validateError: ""
+    });
+    const fieldShowType = ref("");
+    const rowKey = ref("");
+    const sortFlag = ref("0");
+    const formSchemas = [
+      {
+        label: "rowKey",
+        field: "rowKey",
+        component: "Input",
+        show: false
+      },
+      {
+        label: "\u6587\u4EF6\u4E0A\u4F20\u6570\u91CF",
+        field: "uploadnum",
+        component: "InputNumber",
+        componentProps: {
+          style: {
+            width: "100%"
+          }
+        },
+        ifShow: () => {
+          return fieldShowType.value === "file" || fieldShowType.value === "image";
+        }
+      },
+      {
+        label: "\u662F\u5426\u591A\u9009",
+        field: "popupMulti",
+        component: "RadioGroup",
+        defaultValue: true,
+        componentProps: {
+          options: [
+            { label: "\u5426", value: false },
+            { label: "\u662F", value: true }
+          ]
+        },
+        ifShow: () => {
+          return fieldShowType.value === "popup";
+        }
+      },
+      {
+        label: "\u662F\u5426\u591A\u9009",
+        field: "multiSelect",
+        component: "RadioGroup",
+        defaultValue: true,
+        componentProps: {
+          options: [
+            { label: "\u5426", value: false },
+            { label: "\u662F", value: true }
+          ]
+        },
+        ifShow: () => {
+          return fieldShowType.value === "sel_user" || fieldShowType.value === "sel_depart";
+        }
+      },
+      {
+        label: "\u5B58\u50A8\u5B57\u6BB5",
+        field: "store",
+        component: "Input",
+        ifShow: () => {
+          return fieldShowType.value === "sel_user" || fieldShowType.value === "sel_depart";
+        }
+      },
+      {
+        label: "\u5C55\u793A\u5B57\u6BB5",
+        field: "text",
+        component: "Input",
+        ifShow: () => {
+          return fieldShowType.value === "sel_user" || fieldShowType.value === "sel_depart";
+        }
+      },
+      {
+        label: "\u9ED8\u8BA4\u6392\u5E8F",
+        field: "orderRule",
+        component: "RadioGroup",
+        defaultValue: "",
+        componentProps: {
+          options: [
+            { label: "\u964D\u5E8F", value: "desc" },
+            { label: "\u5347\u5E8F", value: "asc" },
+            { label: "\u4E0D\u9ED8\u8BA4\u6392\u5E8F", value: "" }
+          ]
+        },
+        ifShow: () => {
+          return sortFlag.value === "1";
+        }
+      },
+      {
+        label: "\u6821\u9A8C\u63D0\u793A",
+        field: "validateError",
+        component: "Input",
+        componentProps: {
+          placeholder: "\u8BF7\u8F93\u5165\u6821\u9A8C\u63D0\u793A\u6587\u672C"
+        }
+      }
+    ];
+    const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
+      schemas: formSchemas,
+      showActionButtonGroup: false,
+      labelAlign: "right",
+      labelWidth: 100
+    });
+    const [registerModal, { closeModal }] = useModalInner((data) => __async(this, null, function* () {
+      console.log("extend json", data);
+      initExtendConfig();
+      if (data.jsonStr) {
+        let json = JSON.parse(data.jsonStr);
+        Object.keys(json).map((k) => {
+          console.log("\u6269\u5C55\u53C2\u6570:" + k + "=" + json[k]);
+          extendConfig[k] = json[k];
+        });
+      }
+      fieldShowType.value = data.fieldShowType;
+      rowKey.value = data.id;
+      sortFlag.value = data.sortFlag;
+      let temp = toRaw(extendConfig);
+      yield resetFields();
+      yield setFieldsValue(__spreadProps(__spreadValues({}, temp), {
+        rowKey: data.id
+      }));
+    }));
+    function handleSubmit() {
+      return __async(this, null, function* () {
+        let data = yield validate();
+        console.log("datga", data);
+        let type = fieldShowType.value;
+        let obj = {};
+        if (type === "file" || type === "image") {
+          if (data.uploadnum && data.uploadnum > 0) {
+            obj.uploadnum = data.uploadnum;
+          }
+        } else if (type === "textarea" || type === "text") {
+          if (data.showLength && data.showLength > 0) {
+            obj.showLength = data.showLength;
+          }
+        } else if (type === "sel_user" || type === "sel_depart") {
+          obj = pick(data, "store", "text", "multiSelect");
+        } else if (type === "popup") {
+          obj.popupMulti = data.popupMulti;
+        }
+        if (sortFlag.value === "1" && data.orderRule) {
+          obj.orderRule = data.orderRule;
+        }
+        if (data.validateError) {
+          obj.validateError = data.validateError;
+        }
+        console.log("obj....", obj);
+        for (let key in obj) {
+          if (obj[key] === "") {
+            delete obj[key];
+          }
+        }
+        console.log(obj);
+        emit("success", obj, data.rowKey);
+        closeModal();
+      });
+    }
+    return __spreadValues({
+      spinningLoading,
+      registerModal,
+      registerForm,
+      fieldShowType,
+      rowKey,
+      handleSubmit
+    }, toRefs(extendConfig));
+  }
+});
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_BasicForm = resolveComponent("BasicForm");
+  const _component_a_spin = resolveComponent("a-spin");
+  const _component_BasicModal = resolveComponent("BasicModal");
+  return openBlock(), createBlock(_component_BasicModal, mergeProps({ wrapClassName: "field-extend-config-modal" }, _ctx.$attrs, {
+    title: "\u6269\u5C55\u53C2\u6570\u914D\u7F6E",
+    onRegister: _ctx.registerModal,
+    keyboard: "",
+    canFullscreen: false,
+    cancelText: "\u5173\u95ED",
+    onOk: _ctx.handleSubmit
+  }), {
+    default: withCtx(() => [
+      createVNode(_component_a_spin, { spinning: _ctx.spinningLoading }, {
+        default: withCtx(() => [
+          createVNode(_component_BasicForm, { onRegister: _ctx.registerForm }, null, 8, ["onRegister"])
+        ]),
+        _: 1
+      }, 8, ["spinning"])
+    ]),
+    _: 1
+  }, 16, ["onRegister", "onOk"]);
+}
+var FieldExtendJsonModal = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export { FieldExtendJsonModal as default };