@jeecg/online 3.6.0-beta → 3.6.2-beta

package/{useSchemas-43429d80.mjs → useSchemas-0433a403.mjs}

@@ -3,9 +3,9 @@ import { Input as c, Button as d } from "ant-design-vue";
 import { FolderOpenOutlined as b } from "@ant-design/icons-vue";
 import { bindMapFormSchema as s } from "/@/utils/common/compUtils";
 import { usePermission as f } from "/@/hooks/web/usePermission";
-import { rules as h } from "/@/utils/helper/validator";
-const { isDisabledAuth: P } = f();
-function I(i, a, o) {
+import { rules as P } from "/@/utils/helper/validator";
+const { isDisabledAuth: h } = f();
+function I(i, r, l) {
   const e = s(
     {
       // 一列
@@ -34,7 +34,7 @@ function I(i, a, o) {
       }
     },
     "three"
-  ), l = [
+  ), o = [
     { label: "", field: "id", component: "Input", show: !1 },
     { label: "", field: "tableVersion", component: "Input", show: !1 },
     e({
@@ -44,7 +44,7 @@ function I(i, a, o) {
       required: !0,
       // 如果版本号为1 表示未曾修改 未曾同步 可以修改表名
       dynamicDisabled: ({ model: t }) => t.tableVersion && t.tableVersion != 1,
-      dynamicRules: ({ model: t, schema: n }) => h.duplicateCheckRule("onl_cgform_head", "table_name", t, n, !0)
+      dynamicRules: ({ model: t, schema: a }) => P.duplicateCheckRule("onl_cgform_head", "table_name", t, a, !0)
     }),
     e({
       label: "表描述",
@@ -63,7 +63,7 @@ function I(i, a, o) {
           { label: "主表", value: 2 },
           { label: "附表", value: 3 }
         ],
-        onChange: o.onTableTypeChange
+        onChange: l.onTableTypeChange
       }
     }),
     // 此处为占位符，用于将 relationType 顶到最右边
@@ -73,7 +73,7 @@ function I(i, a, o) {
       component: "InputNumber",
       render: () => "",
       colProps: { xs: 0, sm: 17 },
-      ifShow: r
+      ifShow: n
     },
     e({
       label: "",
@@ -92,7 +92,7 @@ function I(i, a, o) {
         labelCol: { xs: 0, sm: 0 },
         wrapperCol: { xs: 24, sm: 24 }
       },
-      ifShow: r
+      ifShow: n
     }),
     e({
       label: "序号",
@@ -108,7 +108,7 @@ function I(i, a, o) {
         labelCol: { xs: 24, sm: 7 },
         wrapperCol: { xs: 24, sm: 24 - 7 }
       },
-      ifShow: r
+      ifShow: n
     }),
     e({
       label: "表单分类",
@@ -137,7 +137,7 @@ function I(i, a, o) {
       field: "idSequence",
       component: "Input",
       componentProps: {},
-      ifShow: r
+      ifShow: n
     }),
     e({
       label: "显示复选框",
@@ -171,11 +171,11 @@ function I(i, a, o) {
         return [
           {
             validator({}, t) {
-              const n = a.value;
+              const a = r.value;
               if (t === "erp") {
-                if (n.joinQuery)
+                if (a.joinQuery)
                   return Promise.reject("ERP不支持联合查询功能");
-              } else if (t === "innerTable" && n.joinQuery)
+              } else if (t === "innerTable" && a.joinQuery)
                 return Promise.reject("内嵌子表不支持联合查询功能");
               return Promise.resolve();
             }
@@ -248,13 +248,13 @@ function I(i, a, o) {
           { label: "是", value: "Y" },
           { label: "否", value: "N" }
         ],
-        onChange: o.onIsTreeChange
+        onChange: l.onIsTreeChange
       },
       dynamicRules({ model: t }) {
         return [
           {
-            validator({}, n) {
-              return n === "Y" && (t.tableType == 2 || t.tableType == 3) ? Promise.reject("主表和附表不支持树类型！") : Promise.resolve();
+            validator({}, a) {
+              return a === "Y" && (t.tableType == 2 || t.tableType == 3) ? Promise.reject("主表和附表不支持树类型！") : Promise.resolve();
             }
           }
         ];
@@ -273,7 +273,7 @@ function I(i, a, o) {
       label: "树表单父ID",
       field: "treeParentIdField",
       component: "Input",
-      ifShow: r
+      ifShow: n
     }),
     e({
       label: "是否有子节点字段",
@@ -286,7 +286,7 @@ function I(i, a, o) {
       field: "treeFieldname",
       required: !0,
       component: "Input",
-      ifShow: r
+      ifShow: n
     }),
     e(
       {
@@ -298,29 +298,29 @@ function I(i, a, o) {
           placeholder: " ",
           allowClear: !1
         },
-        ifShow: o.ifShowOfSubTableStr
+        ifShow: l.ifShowOfSubTableStr
       },
       "one"
     )
   ];
-  function r({ field: t, model: n }) {
+  function n({ field: t, model: a }) {
     switch (t) {
       case "relationType":
       case "tabOrderNum":
-        return n.tableType === 3;
+        return a.tableType === 3;
       case "treeParentIdField":
       case "treeIdField":
       case "treeFieldname":
-        return n.isTree === "Y";
+        return a.isTree === "Y";
       case "idSequence":
-        return n.idType === "SEQUENCE";
+        return a.idType === "SEQUENCE";
     }
     return !0;
   }
-  return { formSchemas: l };
+  return { formSchemas: o };
 }
-function g(i, a) {
-  const o = s(
+function g(i, r) {
+  const l = s(
     {
       left: {
         colProps: { xs: 24, sm: 7 },
@@ -343,7 +343,7 @@ function g(i, a) {
   );
   return { formSchemas: [
     // 弹窗
-    o(
+    l(
       {
         label: "弹窗默认全屏",
         field: "modelFullscreen",
@@ -358,7 +358,7 @@ function g(i, a) {
       },
       "left"
     ),
-    o(
+    l(
       {
         label: "弹窗宽度",
         field: "modalMinWidth",
@@ -371,7 +371,7 @@ function g(i, a) {
       "right"
     ),
     //----------------------------表单评论 begin-----------------------------------------
-    o(
+    l(
       {
         label: "开启表单评论",
         field: "commentStatus",
@@ -387,7 +387,7 @@ function g(i, a) {
       "left"
     ),
     // 此处为占位符
-    o(
+    l(
       {
         label: "",
         field: "commentStatus",
@@ -397,7 +397,7 @@ function g(i, a) {
       "right"
     ),
     // 启用联合查询
-    o(
+    l(
       {
         label: "启用联合查询",
         field: "joinQuery",
@@ -408,13 +408,13 @@ function g(i, a) {
             { label: "关闭", value: 0 }
           ],
           buttonStyle: "solid",
-          onChange: a.onJoinQueryChange
+          onChange: r.onJoinQueryChange
         }
       },
       "left"
     ),
     // 此处为占位符
-    o(
+    l(
       {
         label: "",
         field: "joinQuery",
@@ -424,7 +424,7 @@ function g(i, a) {
       "right"
     ),
     // 积木报表打印
-    o(
+    l(
       {
         label: "集成积木报表",
         field: "reportPrintShow",
@@ -435,12 +435,12 @@ function g(i, a) {
             { label: "关闭", value: 0 }
           ],
           buttonStyle: "solid",
-          onChange: a.onReportPrintShowChange
+          onChange: r.onReportPrintShowChange
         }
       },
       "left"
     ),
-    o(
+    l(
       {
         label: "报表地址",
         field: "reportPrintUrl",
@@ -448,49 +448,53 @@ function g(i, a) {
         componentProps: {
           style: "width: 80%"
         },
-        dynamicDisabled: ({ model: l }) => !l.reportPrintShow,
-        dynamicRules: ({ model: l }) => [
-          { required: !!l.reportPrintShow, message: "请输入报表地址！" },
+        dynamicDisabled: ({ model: o }) => !o.reportPrintShow,
+        dynamicRules: ({ model: o }) => [
+          { required: !!o.reportPrintShow, message: "请输入报表地址！" },
           {
-            validator({}, r) {
-              return /\/jmreport\/view\/{积木报表ID}/.test(r) ? Promise.reject("请将{积木报表ID}替换为真实的积木报表ID！") : Promise.resolve();
+            validator({}, n) {
+              return /\/jmreport\/view\/{积木报表ID}/.test(n) ? Promise.reject("请将{积木报表ID}替换为真实的积木报表ID！") : Promise.resolve();
             }
           }
         ]
       },
       "right"
     ),
-    o(
-      {
-        label: "集成设计表单",
-        field: "isDesForm",
-        component: "RadioButtonGroup",
-        componentProps: {
-          options: [
-            { label: "开启", value: "Y" },
-            { label: "关闭", value: "N" }
-          ],
-          buttonStyle: "solid",
-          onChange: a.onIsDesformChange
-        }
-      },
-      "left"
-    ),
-    o(
-      {
-        label: "表单编码",
-        field: "desFormCode",
-        component: "Input",
-        componentProps: {
-          style: "width: 80%"
-        },
-        dynamicDisabled: ({ model: l }) => l.isDesForm !== "Y",
-        dynamicRules: ({ model: l }) => [{ required: l.isDesForm === "Y", message: "请输入表单编码！" }]
-      },
-      "right"
-    ),
+    // update-begin--author:liaozhiyang---date:20231213---for：【QQYUN-7421】vue3先注释集成设计表单功能
+    // mapFormSchema(
+    //   {
+    //     label: '集成设计表单',
+    //     field: 'isDesForm',
+    //     component: 'RadioButtonGroup',
+    //     componentProps: {
+    //       options: [
+    //         { label: '开启', value: 'Y' },
+    //         { label: '关闭', value: 'N' },
+    //       ],
+    //       buttonStyle: 'solid',
+    //       onChange: handlers.onIsDesformChange,
+    //     },
+    //   },
+    //   'left'
+    // ),
+    // mapFormSchema(
+    //   {
+    //     label: '表单编码',
+    //     field: 'desFormCode',
+    //     component: 'Input',
+    //     componentProps: {
+    //       style: 'width: 80%',
+    //     },
+    //     dynamicDisabled: ({ model }) => model.isDesForm !== 'Y',
+    //     dynamicRules: ({ model }) => {
+    //       return [{ required: model.isDesForm === 'Y', message: '请输入表单编码！' }];
+    //     },
+    //   },
+    //   'right'
+    // ),
+    // update-end--author:liaozhiyang---date:20231213---for：【QQYUN-7421】vue3先注释集成设计表单功能
     // 列表操作列
-    o(
+    l(
       {
         label: "固定操作列",
         field: "tableFixedAction",
@@ -506,7 +510,7 @@ function g(i, a) {
       },
       "left"
     ),
-    o(
+    l(
       {
         label: "固定方式",
         field: "tableFixedActionType",
@@ -519,15 +523,15 @@ function g(i, a) {
           style: "width: 80%"
         },
         defaultValue: "right",
-        dynamicDisabled: ({ model: l }) => !l.tableFixedAction,
-        dynamicRules: ({ model: l }) => [{ required: !!l.tableFixedAction, message: "请选择固定方式！" }]
+        dynamicDisabled: ({ model: o }) => !o.tableFixedAction,
+        dynamicRules: ({ model: o }) => [{ required: !!o.tableFixedAction, message: "请选择固定方式！" }]
       },
       "right"
     )
     //--------------------------表单评论 end-----------------------------------------
   ] };
 }
-function T(i, a, o) {
+function T(i, r, l) {
   const e = s(
     {
       // 一列
@@ -556,27 +560,27 @@ function T(i, a, o) {
       }
     },
     "one"
-  ), l = m(() => o.value ? "one" : "tow");
+  ), o = m(() => l.value ? "one" : "tow");
   return { formSchemas: m(() => [
     e(
       {
         label: "代码生成目录",
         field: "projectPath",
-        render: ({ model: t, field: n }) => p(
+        render: ({ model: t, field: a }) => p(
           c.Search,
           {
-            value: t[n],
+            value: t[a],
             onChange: (u) => {
-              t[n] = u.target.value, a.onProjectPathChange(u);
+              t[a] = u.target.value, r.onProjectPathChange(u);
             },
-            onSearch: a.onProjectPathSearch
+            onSearch: r.onProjectPathSearch
           },
           {
             enterButton: () => p(
               d,
               {
                 preIcon: "ant-design:folder-open",
-                disabled: P("online:codeGenerate:projectPath")
+                disabled: h("online:codeGenerate:projectPath")
               },
               {
                 default: () => "浏览",
@@ -589,7 +593,7 @@ function T(i, a, o) {
         required: !0
         // 如果版本号为1 表示未曾修改 未曾同步 可以修改表名
       },
-      o.value ? "one" : "towOne"
+      l.value ? "one" : "towOne"
     ),
     e(
       {
@@ -597,10 +601,10 @@ function T(i, a, o) {
         field: "jspMode",
         component: "Select",
         componentProps: {
-          options: a.jspModeOptions.value
+          options: r.jspModeOptions.value
         }
       },
-      l.value
+      o.value
     ),
     e(
       {
@@ -608,7 +612,7 @@ function T(i, a, o) {
         field: "ftlDescription",
         component: "Input"
       },
-      l.value
+      o.value
     ),
     { label: "数据模型", field: "jformType", component: "Input", show: !1 },
     e(
@@ -619,7 +623,7 @@ function T(i, a, o) {
         dynamicDisabled: !0,
         component: "Input"
       },
-      l.value
+      o.value
     ),
     e(
       {
@@ -631,7 +635,7 @@ function T(i, a, o) {
           placeholder: "请输入实体类名(首字母大写)"
         }
       },
-      l.value
+      o.value
     ),
     e(
       {
@@ -640,7 +644,7 @@ function T(i, a, o) {
         required: !0,
         component: "Input"
       },
-      l.value
+      o.value
     ),
     e(
       {
@@ -655,7 +659,7 @@ function T(i, a, o) {
           ]
         }
       },
-      l.value
+      o.value
     ),
     e(
       {
@@ -673,7 +677,7 @@ function T(i, a, o) {
           ]
         }
       },
-      l.value
+      o.value
     ),
     { label: "需要生成的代码", field: "codeTypes", component: "Input", show: !1 }
   ]) };

package/JModalTip-e1938b49.mjs

@@ -1,46 +0,0 @@
-import { computed as i, openBlock as n, createElementBlock as c, createElementVNode as t, createCommentVNode as d, pushScopeId as p, popScopeId as l } from "vue";
-import { _ as r } from "./index-b70302f2.mjs";
-import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
-import "/@/hooks/web/useMessage";
-import "vue-router";
-const _ = {
-  name: "JModalTip",
-  props: {
-    visible: {
-      type: Boolean,
-      default: !1
-    }
-  },
-  emits: ["save", "cancel"],
-  setup(e) {
-    return {
-      flag: i(() => e.visible)
-    };
-  }
-}, m = (e) => (p("data-v-812981d3"), e = e(), l(), e), v = {
-  key: 0,
-  class: "jeecg-update-tip-bar"
-}, u = { class: "container" }, f = { class: "outer" }, $ = { class: "inner" }, g = /* @__PURE__ */ m(() => /* @__PURE__ */ t("span", { class: "tip" }, "正在修改表单数据 ···", -1));
-function k(e, o, h, s, y, I) {
-  return s.flag ? (n(), c("div", v, [
-    t("div", u, [
-      t("div", f, [
-        t("div", $, [
-          g,
-          t("div", {
-            class: "cancel",
-            onClick: o[0] || (o[0] = (a) => e.$emit("cancel"))
-          }, "取消"),
-          t("div", {
-            class: "save",
-            onClick: o[1] || (o[1] = (a) => e.$emit("save"))
-          }, "保存")
-        ])
-      ])
-    ])
-  ])) : d("", !0);
-}
-const S = /* @__PURE__ */ r(_, [["render", k], ["__scopeId", "data-v-812981d3"]]);
-export {
-  S as default
-};