@jeecg/online 3.5.3-vite4 → 3.6.2-beta

package/useOnlineTest-e4bd8be3.mjs

@@ -0,0 +1,42 @@
+import { ref as n } from "vue";
+function J(h, g, p) {
+  const a = n(!1), o = n([]), i = n([]);
+  function c() {
+  }
+  function f(e) {
+  }
+  function l(e) {
+  }
+  function s(e, t, D) {
+  }
+  function u(e, t) {
+  }
+  function r() {
+  }
+  function d(e) {
+  }
+  function m(e) {
+  }
+  function T(e, t) {
+  }
+  function b(e) {
+  }
+  return {
+    aiTestMode: a,
+    aiTestTable: o,
+    aiTableList: i,
+    initVirtualData: c,
+    genButtons: f,
+    genEnhanceJavaData: l,
+    genEnhanceJsData: s,
+    genEnhanceSqlData: u,
+    setTaleConfig: r,
+    tableJsonGetHelper: d,
+    fieldsJsonGetHelper: m,
+    refreshCacheTableName: T,
+    getCacheTableName: b
+  };
+}
+export {
+  J as u
+};

package/{useSchemas-fc8d97ce.mjs → useSchemas-0433a403.mjs}

@@ -1,12 +1,12 @@
-import { computed as m, h as r } from "vue";
-import { Input as d, Button as b } from "ant-design-vue";
-import { FolderOpenOutlined as f } from "@ant-design/icons-vue";
-import { bindMapFormSchema as p } from "/@/utils/common/compUtils";
-import { usePermission as h } from "/@/hooks/web/usePermission";
+import { computed as m, h as p } from "vue";
+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 P } from "/@/utils/helper/validator";
-const { isDisabledAuth: c } = h();
-function I(s, t) {
-  const e = p(
+const { isDisabledAuth: h } = f();
+function I(i, r, l) {
+  const e = s(
     {
       // 一列
       one: {
@@ -34,7 +34,7 @@ function I(s, t) {
       }
     },
     "three"
-  ), n = [
+  ), o = [
     { label: "", field: "id", component: "Input", show: !1 },
     { label: "", field: "tableVersion", component: "Input", show: !1 },
     e({
@@ -43,8 +43,8 @@ function I(s, t) {
       component: "Input",
       required: !0,
       // 如果版本号为1 表示未曾修改 未曾同步 可以修改表名
-      dynamicDisabled: ({ model: o }) => o.tableVersion && o.tableVersion != 1,
-      dynamicRules: ({ model: o, schema: a }) => P.duplicateCheckRule("onl_cgform_head", "table_name", o, a, !0)
+      dynamicDisabled: ({ model: t }) => t.tableVersion && t.tableVersion != 1,
+      dynamicRules: ({ model: t, schema: a }) => P.duplicateCheckRule("onl_cgform_head", "table_name", t, a, !0)
     }),
     e({
       label: "表描述",
@@ -63,7 +63,7 @@ function I(s, t) {
           { label: "主表", value: 2 },
           { label: "附表", value: 3 }
         ],
-        onChange: t.onTableTypeChange
+        onChange: l.onTableTypeChange
       }
     }),
     // 此处为占位符，用于将 relationType 顶到最右边
@@ -73,7 +73,7 @@ function I(s, t) {
       component: "InputNumber",
       render: () => "",
       colProps: { xs: 0, sm: 17 },
-      ifShow: l
+      ifShow: n
     },
     e({
       label: "",
@@ -92,7 +92,7 @@ function I(s, t) {
         labelCol: { xs: 0, sm: 0 },
         wrapperCol: { xs: 24, sm: 24 }
       },
-      ifShow: l
+      ifShow: n
     }),
     e({
       label: "序号",
@@ -108,7 +108,7 @@ function I(s, t) {
         labelCol: { xs: 24, sm: 7 },
         wrapperCol: { xs: 24, sm: 24 - 7 }
       },
-      ifShow: l
+      ifShow: n
     }),
     e({
       label: "表单分类",
@@ -137,7 +137,7 @@ function I(s, t) {
       field: "idSequence",
       component: "Input",
       componentProps: {},
-      ifShow: l
+      ifShow: n
     }),
     e({
       label: "显示复选框",
@@ -159,13 +159,30 @@ function I(s, t) {
       componentProps: {
         options: [
           { label: "默认主题", value: "normal" },
-          { label: "ERP主题(一对多)", value: "erp" }
-          // { label: '内嵌子表主题(一对多)', value: 'innerTable' },
-          // { label: 'TAB主题(一对多)', value: 'tab' },
+          { label: "ERP主题(一对多)", value: "erp" },
+          { label: "内嵌子表主题(一对多)", value: "innerTable" },
+          { label: "TAB主题(一对多)", value: "tab" }
         ]
       },
       // 单表时禁用该字段
-      dynamicDisabled: ({ model: o }) => o.tableType === 1
+      dynamicDisabled: ({ model: t }) => t.tableType === 1,
+      // update-begin--author:liaozhiyang---date:20231123---for：【QQYUN-7073】提示ERP、内嵌子表不支持联合查询
+      dynamicRules() {
+        return [
+          {
+            validator({}, t) {
+              const a = r.value;
+              if (t === "erp") {
+                if (a.joinQuery)
+                  return Promise.reject("ERP不支持联合查询功能");
+              } else if (t === "innerTable" && a.joinQuery)
+                return Promise.reject("内嵌子表不支持联合查询功能");
+              return Promise.resolve();
+            }
+          }
+        ];
+      }
+      // update-end--author:liaozhiyang---date:20231123---for：【QQYUN-7073】提示ERP、内嵌子表不支持联合查询
     }),
     e({
       label: "表单风格",
@@ -231,13 +248,13 @@ function I(s, t) {
           { label: "是", value: "Y" },
           { label: "否", value: "N" }
         ],
-        onChange: t.onIsTreeChange
+        onChange: l.onIsTreeChange
       },
-      dynamicRules({ model: o }) {
+      dynamicRules({ model: t }) {
         return [
           {
             validator({}, a) {
-              return a === "Y" && (o.tableType == 2 || o.tableType == 3) ? Promise.reject("主表和附表不支持树类型！") : Promise.resolve();
+              return a === "Y" && (t.tableType == 2 || t.tableType == 3) ? Promise.reject("主表和附表不支持树类型！") : Promise.resolve();
             }
           }
         ];
@@ -256,7 +273,7 @@ function I(s, t) {
       label: "树表单父ID",
       field: "treeParentIdField",
       component: "Input",
-      ifShow: l
+      ifShow: n
     }),
     e({
       label: "是否有子节点字段",
@@ -269,7 +286,7 @@ function I(s, t) {
       field: "treeFieldname",
       required: !0,
       component: "Input",
-      ifShow: l
+      ifShow: n
     }),
     e(
       {
@@ -281,13 +298,13 @@ function I(s, t) {
           placeholder: " ",
           allowClear: !1
         },
-        ifShow: t.ifShowOfSubTableStr
+        ifShow: l.ifShowOfSubTableStr
       },
       "one"
     )
   ];
-  function l({ field: o, model: a }) {
-    switch (o) {
+  function n({ field: t, model: a }) {
+    switch (t) {
       case "relationType":
       case "tabOrderNum":
         return a.tableType === 3;
@@ -300,10 +317,10 @@ function I(s, t) {
     }
     return !0;
   }
-  return { formSchemas: n };
+  return { formSchemas: o };
 }
-function g(s, t) {
-  const e = p(
+function g(i, r) {
+  const l = s(
     {
       left: {
         colProps: { xs: 24, sm: 7 },
@@ -326,7 +343,7 @@ function g(s, t) {
   );
   return { formSchemas: [
     // 弹窗
-    e(
+    l(
       {
         label: "弹窗默认全屏",
         field: "modelFullscreen",
@@ -341,7 +358,7 @@ function g(s, t) {
       },
       "left"
     ),
-    e(
+    l(
       {
         label: "弹窗宽度",
         field: "modalMinWidth",
@@ -354,7 +371,7 @@ function g(s, t) {
       "right"
     ),
     //----------------------------表单评论 begin-----------------------------------------
-    e(
+    l(
       {
         label: "开启表单评论",
         field: "commentStatus",
@@ -370,7 +387,7 @@ function g(s, t) {
       "left"
     ),
     // 此处为占位符
-    e(
+    l(
       {
         label: "",
         field: "commentStatus",
@@ -380,7 +397,7 @@ function g(s, t) {
       "right"
     ),
     // 启用联合查询
-    e(
+    l(
       {
         label: "启用联合查询",
         field: "joinQuery",
@@ -391,13 +408,13 @@ function g(s, t) {
             { label: "关闭", value: 0 }
           ],
           buttonStyle: "solid",
-          onChange: t.onJoinQueryChange
+          onChange: r.onJoinQueryChange
         }
       },
       "left"
     ),
     // 此处为占位符
-    e(
+    l(
       {
         label: "",
         field: "joinQuery",
@@ -407,7 +424,7 @@ function g(s, t) {
       "right"
     ),
     // 积木报表打印
-    e(
+    l(
       {
         label: "集成积木报表",
         field: "reportPrintShow",
@@ -418,12 +435,12 @@ function g(s, t) {
             { label: "关闭", value: 0 }
           ],
           buttonStyle: "solid",
-          onChange: t.onReportPrintShowChange
+          onChange: r.onReportPrintShowChange
         }
       },
       "left"
     ),
-    e(
+    l(
       {
         label: "报表地址",
         field: "reportPrintUrl",
@@ -431,49 +448,53 @@ function g(s, t) {
         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({}, o) {
-              return /\/jmreport\/view\/{积木报表ID}/.test(o) ? Promise.reject("请将{积木报表ID}替换为真实的积木报表ID！") : Promise.resolve();
+            validator({}, n) {
+              return /\/jmreport\/view\/{积木报表ID}/.test(n) ? Promise.reject("请将{积木报表ID}替换为真实的积木报表ID！") : Promise.resolve();
             }
           }
         ]
       },
       "right"
     ),
-    e(
-      {
-        label: "集成设计表单",
-        field: "isDesForm",
-        component: "RadioButtonGroup",
-        componentProps: {
-          options: [
-            { label: "开启", value: "Y" },
-            { label: "关闭", value: "N" }
-          ],
-          buttonStyle: "solid",
-          onChange: t.onIsDesformChange
-        }
-      },
-      "left"
-    ),
-    e(
-      {
-        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先注释集成设计表单功能
     // 列表操作列
-    e(
+    l(
       {
         label: "固定操作列",
         field: "tableFixedAction",
@@ -489,7 +510,7 @@ function g(s, t) {
       },
       "left"
     ),
-    e(
+    l(
       {
         label: "固定方式",
         field: "tableFixedActionType",
@@ -502,16 +523,16 @@ function g(s, t) {
           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(s, t, e) {
-  const n = p(
+function T(i, r, l) {
+  const e = s(
     {
       // 一列
       one: {
@@ -539,32 +560,31 @@ function T(s, t, e) {
       }
     },
     "one"
-  ), l = m(() => e.value ? "one" : "tow");
+  ), o = m(() => l.value ? "one" : "tow");
   return { formSchemas: m(() => [
-    n(
+    e(
       {
         label: "代码生成目录",
         field: "projectPath",
-        render: ({ model: a, field: i }) => r(
-          d.Search,
+        render: ({ model: t, field: a }) => p(
+          c.Search,
           {
-            value: a[i],
+            value: t[a],
             onChange: (u) => {
-              a[i] = u.target.value, t.onProjectPathChange(u);
+              t[a] = u.target.value, r.onProjectPathChange(u);
             },
-            onSearch: t.onProjectPathSearch,
-            disabled: c("online:codeGenerate:projectPath")
+            onSearch: r.onProjectPathSearch
           },
           {
-            enterButton: () => r(
-              b,
+            enterButton: () => p(
+              d,
               {
                 preIcon: "ant-design:folder-open",
-                disabled: c("online:codeGenerate:projectPath")
+                disabled: h("online:codeGenerate:projectPath")
               },
               {
                 default: () => "浏览",
-                icon: () => r(f)
+                icon: () => p(b)
               }
             )
           }
@@ -573,29 +593,29 @@ function T(s, t, e) {
         required: !0
         // 如果版本号为1 表示未曾修改 未曾同步 可以修改表名
       },
-      e.value ? "one" : "towOne"
+      l.value ? "one" : "towOne"
     ),
-    n(
+    e(
       {
         label: "页面风格",
         field: "jspMode",
         component: "Select",
         componentProps: {
-          options: t.jspModeOptions.value
+          options: r.jspModeOptions.value
         }
       },
-      l.value
+      o.value
     ),
-    n(
+    e(
       {
         label: "功能说明",
         field: "ftlDescription",
         component: "Input"
       },
-      l.value
+      o.value
     ),
     { label: "数据模型", field: "jformType", component: "Input", show: !1 },
-    n(
+    e(
       {
         label: "表名",
         field: "tableName_tmp",
@@ -603,9 +623,9 @@ function T(s, t, e) {
         dynamicDisabled: !0,
         component: "Input"
       },
-      l.value
+      o.value
     ),
-    n(
+    e(
       {
         label: "实体类名",
         field: "entityName",
@@ -615,18 +635,18 @@ function T(s, t, e) {
           placeholder: "请输入实体类名(首字母大写)"
         }
       },
-      l.value
+      o.value
     ),
-    n(
+    e(
       {
         label: "包名(小写)",
         field: "entityPackage",
         required: !0,
         component: "Input"
       },
-      l.value
+      o.value
     ),
-    n(
+    e(
       {
         label: "代码分层样式",
         field: "packageStyle",
@@ -639,9 +659,9 @@ function T(s, t, e) {
           ]
         }
       },
-      l.value
+      o.value
     ),
-    n(
+    e(
       {
         label: "页面代码",
         field: "vueStyle",
@@ -657,7 +677,7 @@ function T(s, t, e) {
           ]
         }
       },
-      l.value
+      o.value
     ),
     { label: "需要生成的代码", field: "codeTypes", component: "Input", show: !1 }
   ]) };

package/{useTableSync-dc333087.mjs → useTableSync-774c3774.mjs}

@@ -1,18 +1,18 @@
 var p = (f, v, e) => new Promise((o, u) => {
   var n = (t) => {
     try {
-      s(e.next(t));
+      r(e.next(t));
     } catch (b) {
       u(b);
     }
   }, m = (t) => {
     try {
-      s(e.throw(t));
+      r(e.throw(t));
     } catch (b) {
       u(b);
     }
-  }, s = (t) => t.done ? o(t.value) : Promise.resolve(t.value).then(n, m);
-  s((e = e.apply(f, v)).next());
+  }, r = (t) => t.done ? o(t.value) : Promise.resolve(t.value).then(n, m);
+  r((e = e.apply(f, v)).next());
 });
 import { inject as h, ref as y, computed as g, nextTick as w } from "vue";
 import { V as N } from "./cgform.data-cbdd88c3.mjs";
@@ -23,23 +23,27 @@ function L(f) {
     normal: e != null && e.value ? 430 : 260,
     // 没有 toolbar 的表格高度
     noToolbar: e != null && e.value ? 480 : 320
-  })), s = g(() => ["id"].concat(f.value.map((l) => l.key))), t = g(() => ({
+  })), r = g(() => ["id"].concat(f.value.map((l) => l.key))), t = g(() => ({
     // 针对Online表单对虚拟滚动做出优化
     // 虚拟滚动配置，y轴（行数）大于xx条数据时启用虚拟滚动
+    // update-begin--author:liaozhiyang---date:20231025---for：【QQYUN-6808】online编辑字段多了卡顿
     scrollY: {
+      enabled: !0,
       gt: 15
     },
     // 列数
     scrollX: {
+      enabled: !0,
       gt: 20
     }
+    // update-begin--author:liaozhiyang---date:20231025---for：【QQYUN-6808】online编辑字段多了卡顿
   }));
   function b(l) {
     return p(this, null, function* () {
       let a = o.value;
       if (yield a.fullValidateTable())
         throw { code: N, activeKey: l };
-      let T = a.getTableData().map((c) => A(c, s.value)), D = a.getDeleteData().map((c) => c.id);
+      let T = a.getTableData().map((c) => A(c, r.value)), D = a.getDeleteData().map((c) => c.id);
       return { tableData: T, deleteIds: D };
     });
   }
@@ -50,17 +54,17 @@ function L(f) {
   }
   function E(l) {
     let a = o.value, x = l.value.tableRef, T = l.value.getRemoveIds(), D = x.getXTable().internalData.tableFullData, c = a.getXTable().internalData.tableFullData;
-    return D.forEach((r) => {
+    return D.forEach((s) => {
       let F = !1;
       if (c.forEach((d) => {
-        if (r.id === d.id) {
+        if (s.id === d.id) {
           let i = d.dbFieldName, I = d.dbFieldTxt;
-          (r.dbFieldName !== i || r.dbFieldTxt !== I) && a.setValues([
+          (s.dbFieldName !== i || s.dbFieldTxt !== I) && a.setValues([
             {
               rowKey: d.id,
               values: {
-                dbFieldName: r.dbFieldName,
-                dbFieldTxt: r.dbFieldTxt
+                dbFieldName: s.dbFieldName,
+                dbFieldTxt: s.dbFieldTxt
               }
             }
           ]), F = !0;
@@ -69,14 +73,14 @@ function L(f) {
             i === d.id && (a.removeRowsById(i), F = !0);
           });
       }), !F) {
-        let d = Object.assign({}, r);
+        let d = Object.assign({}, s);
         f.value.forEach((i) => {
           i.key !== "dbFieldName" && i.key !== "dbFieldTxt" && (d[i.key] = i.defaultValue);
         }), a.addRows(d);
       }
     }), w();
   }
-  return { tables: v, tableRef: o, loading: u, dataSource: n, columnKeys: s, tableHeight: m, tableProps: t, syncTable: E, validateData: b, setDataSource: k };
+  return { tables: v, tableRef: o, loading: u, dataSource: n, columnKeys: r, tableHeight: m, tableProps: t, syncTable: E, validateData: b, setDataSource: k };
 }
 export {
   L as u