@jeecg/online 1.0.1 → 3.4.3-beta

package/EnhanceJsHistory.js

@@ -35,7 +35,7 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 import { formatToDate } from "/@/utils/dateUtil";
-import { defineComponent, ref, nextTick, resolveComponent, openBlock, createBlock, withCtx, createVNode, normalizeClass, createElementVNode, toDisplayString, createTextVNode } from "vue";
+import { defineComponent, ref, nextTick, resolveComponent, openBlock, createBlock, withCtx, createVNode, createTextVNode, normalizeClass, createElementVNode, toDisplayString } from "vue";
 import { BasicModal, useModalInner } from "/@/components/Modal";
 import { JCodeEditor } from "/@/components/Form";
 import "/@/store";
@@ -126,9 +126,7 @@ const _sfc_main = defineComponent({
     };
   }
 });
-const _hoisted_1 = /* @__PURE__ */ createTextVNode("\u4FDD\u5B58\u65F6\u95F4");
-const _hoisted_2 = ["onClick"];
-const _hoisted_3 = /* @__PURE__ */ createTextVNode("\u5173\u95ED");
+const _hoisted_1 = ["onClick"];
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_a_divider = resolveComponent("a-divider");
   const _component_a_list_item = resolveComponent("a-list-item");
@@ -152,7 +150,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     footer: withCtx(() => [
       createVNode(_component_a_button, { onClick: _ctx.onCancel }, {
         default: withCtx(() => [
-          _hoisted_3
+          createTextVNode("\u5173\u95ED")
         ]),
         _: 1
       }, 8, ["onClick"])
@@ -173,7 +171,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                       createElementVNode("div", null, [
                         createVNode(_component_a_divider, { style: { "margin": "0" } }, {
                           default: withCtx(() => [
-                            _hoisted_1
+                            createTextVNode("\u4FDD\u5B58\u65F6\u95F4")
                           ]),
                           _: 1
                         })
@@ -186,7 +184,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                         default: withCtx(() => [
                           createElementVNode("a", {
                             onClick: ($event) => _ctx.fullCode(item)
-                          }, toDisplayString(_ctx.getFormatDate(item.date)), 9, _hoisted_2)
+                          }, toDisplayString(_ctx.getFormatDate(item.date)), 9, _hoisted_1)
                         ]),
                         _: 2
                       }, 1032, ["class"])
@@ -223,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-3b0bad10"]]);
+var EnhanceJsHistory = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-3e3ee46a"]]);
 var EnhanceJsHistory$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": EnhanceJsHistory

package/EnhanceJsModal.js

@@ -18,7 +18,7 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import { defineComponent, ref, reactive, resolveComponent, openBlock, createBlock, withCtx, createVNode, createCommentVNode, createTextVNode } from "vue";
+import { defineComponent, ref, reactive, resolveComponent, openBlock, createBlock, withCtx, createVNode, createTextVNode, createCommentVNode } from "vue";
 import { BasicModal, useModalInner, useModal } from "/@/components/Modal";
 import { JCodeEditor } from "/@/components/Form";
 import { u as useOnlineTest } from "./useOnlineTest.js";
@@ -26,11 +26,11 @@ import { E as EnhanceJsHistory, u as useEnhanceStore } from "./EnhanceJsHistory.
 import { g as getEnhanceJsByCode, s as saveEnhanceJs } from "./enhance.api.js";
 import { useMessage } from "/@/hooks/web/useMessage";
 import { _ as _export_sfc } from "./index.js";
-import "/@/utils/http/axios";
-import "/@/utils/cache";
 import "/@/utils/dateUtil";
 import "/@/store";
 import "pinia";
+import "/@/utils/cache";
+import "/@/utils/http/axios";
 import "/@/utils/is";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
 import "vue-router";
@@ -56,7 +56,7 @@ const _sfc_main = defineComponent({
       show(data.row);
     }));
     const [registerEnhanceJsHistory, enhanceJsHistory] = useModal();
-    const { aiTestMode, genEnhanceJsData } = useOnlineTest({}, {}, null);
+    const { aiTestMode, genEnhanceJsData } = useOnlineTest();
     function show(row) {
       code.value = row.id;
       codeChange.value = false;
@@ -80,10 +80,7 @@ const _sfc_main = defineComponent({
     }
     function onSubmit() {
       return __async(this, null, function* () {
-        yield Promise.all([
-          saveEnhanceJsByType("form"),
-          saveEnhanceJsByType("list")
-        ]);
+        yield Promise.all([saveEnhanceJsByType("form"), saveEnhanceJsByType("list")]);
         closeModal();
         $message.success("\u4FDD\u5B58\u6210\u529F");
       });
@@ -169,10 +166,6 @@ const _sfc_main = defineComponent({
     };
   }
 });
-const _hoisted_1 = /* @__PURE__ */ createTextVNode("\u5173\u95ED");
-const _hoisted_2 = /* @__PURE__ */ createTextVNode("\u786E\u5B9A");
-const _hoisted_3 = /* @__PURE__ */ createTextVNode("\u67E5\u770B\u5386\u53F2\u7248\u672C");
-const _hoisted_4 = /* @__PURE__ */ createTextVNode("\u751F\u6210\u6D4B\u8BD5\u6570\u636E");
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_JCodeEditor = resolveComponent("JCodeEditor");
   const _component_a_tab_pane = resolveComponent("a-tab-pane");
@@ -192,7 +185,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         default: withCtx(() => [
           createVNode(_component_a_button, { onClick: _ctx.onCancel }, {
             default: withCtx(() => [
-              _hoisted_1
+              createTextVNode("\u5173\u95ED")
             ]),
             _: 1
           }, 8, ["onClick"]),
@@ -201,7 +194,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             onClick: _ctx.onSubmit
           }, {
             default: withCtx(() => [
-              _hoisted_2
+              createTextVNode("\u786E\u5B9A")
             ]),
             _: 1
           }, 8, ["onClick"])
@@ -215,7 +208,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             onClick: _ctx.onShowHistory
           }, {
             default: withCtx(() => [
-              _hoisted_3
+              createTextVNode("\u67E5\u770B\u5386\u53F2\u7248\u672C")
             ]),
             _: 1
           }, 8, ["onClick"])) : createCommentVNode("", true),
@@ -224,7 +217,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             onClick: _ctx.onGenTestData
           }, {
             default: withCtx(() => [
-              _hoisted_4
+              createTextVNode("\u751F\u6210\u6D4B\u8BD5\u6570\u636E")
             ]),
             _: 1
           }, 8, ["onClick"])) : createCommentVNode("", true)

package/EnhanceSqlModal.js

@@ -34,7 +34,7 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import { defineComponent, ref, reactive, computed, resolveComponent, openBlock, createBlock, withCtx, createVNode, createElementBlock, createCommentVNode, normalizeProps, guardReactiveProps, createTextVNode, nextTick } from "vue";
+import { defineComponent, ref, reactive, computed, resolveComponent, openBlock, createBlock, withCtx, createVNode, createTextVNode, createElementBlock, createCommentVNode, normalizeProps, guardReactiveProps, nextTick } from "vue";
 import { BasicModal, useModalInner, useModal } from "/@/components/Modal";
 import { BasicForm, useForm } from "/@/components/Form";
 import { BasicTable, TableAction } from "/@/components/Table";
@@ -43,15 +43,14 @@ import { u as useOnlineTest } from "./useOnlineTest.js";
 import { b as useSqlFormSchemas, c as useSqlColumns } from "./enhance.data.js";
 import { c as getEnhanceSqlByCode, e as saveEnhanceSql, f as doEnhanceSqlBatchDelete } from "./enhance.api.js";
 import { _ as _export_sfc } from "./index.js";
-import "/@/utils/http/axios";
-import "/@/hooks/web/useMessage";
-import "/@/utils/cache";
 import "./cgform.data.js";
 import "/@/utils/dict";
 import "/@/utils/dict/JDictSelectUtil";
 import "/@/utils/uuid";
+import "/@/utils/http/axios";
 import "/@/utils/is";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
+import "/@/hooks/web/useMessage";
 import "vue-router";
 const _sfc_main = defineComponent({
   name: "EnhanceSqlModal",
@@ -83,7 +82,7 @@ const _sfc_main = defineComponent({
       tableName.value = data.row.tableName;
       reload();
     }));
-    const { aiTestMode, genEnhanceSqlData } = useOnlineTest({}, { reload }, null);
+    const { aiTestMode, genEnhanceSqlData } = useOnlineTest();
     const [registerFormModal, formModal] = useModal();
     const isUpdate = ref(false);
     const formModalProps = reactive({
@@ -187,15 +186,10 @@ const _sfc_main = defineComponent({
     }
   }
 });
-const _hoisted_1 = /* @__PURE__ */ createTextVNode("\u65B0\u589E");
-const _hoisted_2 = /* @__PURE__ */ createTextVNode(" \u5220\u9664 ");
-const _hoisted_3 = /* @__PURE__ */ createTextVNode(" \u6279\u91CF\u64CD\u4F5C ");
-const _hoisted_4 = /* @__PURE__ */ createTextVNode("\u5173\u95ED");
-const _hoisted_5 = {
+const _hoisted_1 = {
   key: 0,
   style: { "float": "left" }
 };
-const _hoisted_6 = /* @__PURE__ */ createTextVNode("\u751F\u6210\u6D4B\u8BD5\u6570\u636E");
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_a_button = resolveComponent("a-button");
   const _component_a_icon = resolveComponent("a-icon");
@@ -217,14 +211,14 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     footer: withCtx(() => [
       createVNode(_component_a_button, { onClick: _ctx.onCancel }, {
         default: withCtx(() => [
-          _hoisted_4
+          createTextVNode("\u5173\u95ED")
         ]),
         _: 1
       }, 8, ["onClick"]),
-      _ctx.aiTestMode ? (openBlock(), createElementBlock("div", _hoisted_5, [
+      _ctx.aiTestMode ? (openBlock(), createElementBlock("div", _hoisted_1, [
         createVNode(_component_a_button, { onClick: _ctx.onGenEnhanceSqlData }, {
           default: withCtx(() => [
-            _hoisted_6
+            createTextVNode("\u751F\u6210\u6D4B\u8BD5\u6570\u636E")
           ]),
           _: 1
         }, 8, ["onClick"])
@@ -242,7 +236,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             preIcon: "ant-design:plus"
           }, {
             default: withCtx(() => [
-              _hoisted_1
+              createTextVNode("\u65B0\u589E")
             ]),
             _: 1
           }, 8, ["onClick"]),
@@ -256,7 +250,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                   }, {
                     default: withCtx(() => [
                       createVNode(_component_a_icon, { type: "delete" }),
-                      _hoisted_2
+                      createTextVNode(" \u5220\u9664 ")
                     ]),
                     _: 1
                   }, 8, ["onClick"])
@@ -267,7 +261,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             default: withCtx(() => [
               createVNode(_component_a_button, { style: { "margin-left": "8px" } }, {
                 default: withCtx(() => [
-                  _hoisted_3,
+                  createTextVNode(" \u6279\u91CF\u64CD\u4F5C "),
                   createVNode(_component_a_icon, { type: "down" })
                 ]),
                 _: 1

package/ExtendConfigModal.js

@@ -27,6 +27,8 @@ import { _ as _export_sfc } from "./index.js";
 import "ant-design-vue";
 import "@ant-design/icons-vue";
 import "/@/utils/common/compUtils";
+import "/@/hooks/web/usePermission";
+import "/@/utils/helper/validator";
 import "/@/components/jeecg/OnLine/JPopupOnlReport.vue";
 import "vue-router";
 var ExtendConfigModal_vue_vue_type_style_index_0_scoped_true_lang = "";
@@ -47,7 +49,7 @@ const _sfc_main = defineComponent({
       onJoinQueryChange,
       onReportPrintShowChange
     });
-    const [registerForm, { resetFields, setFieldsValue, clearValidate, validate }] = useForm({
+    const [registerForm, { resetFields, setFieldsValue, getFieldsValue, clearValidate, validate }] = useForm({
       schemas: formSchemas,
       showActionButtonGroup: false,
       labelAlign: "right"
@@ -74,7 +76,7 @@ const _sfc_main = defineComponent({
     function onIsDesformChange(value) {
       if (value === "Y") {
         let { themeTemplate } = props.parentForm.getFieldsValue(["themeTemplate"]);
-        if (themeTemplate === "erp") {
+        if ("erp" === themeTemplate) {
           props.parentForm.setFieldsValue({ themeTemplate: "normal" });
           $message.warning("\u8BF7\u6CE8\u610F\uFF1Aerp\u98CE\u683C\u4E0D\u652F\u6301\u5BF9\u63A5\u8868\u5355\u8BBE\u8BA1\uFF0C\u5DF2\u81EA\u52A8\u6539\u4E3A\u9ED8\u8BA4\u98CE\u683C\uFF01");
         }
@@ -82,33 +84,40 @@ const _sfc_main = defineComponent({
         clearValidate("desFormCode");
       }
     }
+    const defaultReportPrintUrl = `{{ window._CONFIG['domianURL'] }}/jmreport/view/{\u79EF\u6728\u62A5\u8868ID}`;
     function onReportPrintShowChange(value) {
-      if (value === 0) {
+      return __async(this, null, function* () {
+        let reportPrintUrl = getFieldsValue()["reportPrintUrl"];
+        if (value === 0) {
+          if (reportPrintUrl === defaultReportPrintUrl) {
+            yield setFieldsValue({ reportPrintUrl: "" });
+          }
+        } else if (value === 1) {
+          if (reportPrintUrl === "") {
+            yield setFieldsValue({ reportPrintUrl: defaultReportPrintUrl });
+          }
+        }
         clearValidate("reportPrintUrl");
-      }
+      });
     }
     function onJoinQueryChange(value) {
       if (value === 1) {
-        let {
-          themeTemplate,
-          isTree,
-          tableType
-        } = props.parentForm.getFieldsValue(["themeTemplate", "isTree", "tableType"]);
-        if (themeTemplate === "erp") {
+        let { themeTemplate, isTree, tableType } = props.parentForm.getFieldsValue(["themeTemplate", "isTree", "tableType"]);
+        if ("erp" === themeTemplate) {
           $message.warning("\u8BF7\u6CE8\u610F\uFF1Aerp\u98CE\u683C\u4E0D\u652F\u6301\u8054\u5408\u67E5\u8BE2\uFF0C\u914D\u7F6E\u65E0\u6548!");
           setFieldsValue({ joinQuery: 0 });
         }
-        if (themeTemplate === "innerTable") {
+        if ("innerTable" === themeTemplate) {
           $message.warning("\u8BF7\u6CE8\u610F\uFF1A\u5185\u5D4C\u98CE\u683C\u4E0D\u652F\u6301\u8054\u5408\u67E5\u8BE2\uFF0C\u914D\u7F6E\u65E0\u6548!");
           setFieldsValue({ joinQuery: 0 });
         }
-        if (tableType === 1) {
+        if (1 === tableType) {
           $message.warning("\u8BF7\u6CE8\u610F\uFF1A\u5355\u8868\u4E0D\u652F\u6301\u8054\u5408\u67E5\u8BE2\uFF0C\u914D\u7F6E\u65E0\u6548!");
           setFieldsValue({ joinQuery: 0 });
-        } else if (tableType === 3) {
+        } else if (3 === tableType) {
           $message.warning("\u8BF7\u6CE8\u610F\uFF1A\u5F53\u524D\u8868\u4E3A\u9644\u8868\uFF0C\u8BF7\u5728\u5BF9\u5E94\u4E3B\u8868\u914D\u7F6E!");
           setFieldsValue({ joinQuery: 0 });
-        } else if (isTree === "Y") {
+        } else if ("Y" === isTree) {
           $message.warning("\u8BF7\u6CE8\u610F\uFF1A\u6811\u5F62\u5217\u8868\u4E0D\u652F\u6301\u8054\u5408\u67E5\u8BE2\uFF0C\u914D\u7F6E\u65E0\u6548!");
           setFieldsValue({ joinQuery: 0 });
         }
@@ -138,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-5fbb254e"]]);
+var ExtendConfigModal = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-63fff65e"]]);
 export { ExtendConfigModal as default };

package/ForeignKeyTable.js

@@ -17,7 +17,7 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-import { defineComponent, ref, resolveComponent, openBlock, createBlock } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, mergeProps } from "vue";
 import { JVxeTypes } from "/@/components/jeecg/JVxeTable/types";
 import { u as useTableSync } from "./useTableSync.js";
 import { _ as _export_sfc } from "./index.js";
@@ -26,6 +26,7 @@ import "/@/utils/dict";
 import "/@/utils/dict/JDictSelectUtil";
 import "/@/utils/uuid";
 import "./pick.js";
+import "./_flatRest.js";
 import "./isArray.js";
 import "./toString.js";
 import "./_arrayPush.js";
@@ -62,7 +63,7 @@ const _sfc_main = defineComponent({
 });
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_JVxeTable = resolveComponent("JVxeTable");
-  return openBlock(), createBlock(_component_JVxeTable, {
+  return openBlock(), createBlock(_component_JVxeTable, mergeProps({
     ref: "tableRef",
     rowNumber: "",
     keyboardEdit: "",
@@ -72,7 +73,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     dataSource: _ctx.dataSource,
     disabled: !_ctx.actionButton,
     disabledRows: { dbFieldName: ["id", "has_child"] }
-  }, null, 8, ["maxHeight", "loading", "columns", "dataSource", "disabled"]);
+  }, _ctx.tableProps), null, 16, ["maxHeight", "loading", "columns", "dataSource", "disabled"]);
 }
 var ForeignKeyTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export { ForeignKeyTable as default };

package/FormSchemaFactory.js

@@ -37,20 +37,22 @@ var __async = (__this, __arguments, generator) => {
 import { UploadTypeEnum } from "/@/components/Form/src/jeecg/components/JUpload";
 const SUBMIT_FLOW_KEY = "jeecg_submit_form_and_flow";
 const SUBMIT_FLOW_ID = "flow_submit_id";
+const ONL_FORM_TABLE_NAME = "online_form_table_name";
 const VALIDATE_FAILED = "validate-failed";
 const SETUP = "setup";
 const ENHANCEJS = "EnhanceJS";
 const FORM_VIEW_TO_QUERY_VIEW = {
-  "password": "text",
-  "file": "text",
-  "image": "text",
-  "textarea": "text",
-  "umeditor": "text",
-  "markdown": "text",
-  "checkbox": "list_multi",
-  "radio": "list"
+  password: "text",
+  file: "text",
+  image: "text",
+  textarea: "text",
+  umeditor: "text",
+  markdown: "text",
+  checkbox: "list_multi",
+  radio: "list"
 };
 const POP_CONTAINER = ".jeecg-online-modal .ant-modal-content";
+const ONL_AUTH_PRE = "online_";
 class IFormSchema {
   constructor(key, data) {
     this._data = data;
@@ -70,6 +72,7 @@ class IFormSchema {
     this.schemaProp = {};
     this.searchForm = false;
     this.disabled = false;
+    this.popContainer = "";
     this.handleWidgetAttr(data);
   }
   getFormItemSchema() {
@@ -81,7 +84,13 @@ class IFormSchema {
     let fs = {
       field: this.field,
       label: this.label,
-      component: "Input"
+      labelLength: 4,
+      component: "Input",
+      itemProps: {
+        labelCol: {
+          class: "online-form-label"
+        }
+      }
     };
     let rules = this.getRule();
     if (rules.length > 0 && this.onlyValidator) {
@@ -154,12 +163,12 @@ class IFormSchema {
         rules.push({ required: true, message: msg });
       }
     }
-    if (view == "sel_user") {
+    if ("sel_user" == view) {
       if (pattern === "only" && this.onlyValidator) {
         rules.push({ validator: this.onlyValidator });
       }
     }
-    if (view === "list" || view === "radio" || view === "markdown" || view === "pca" || view.indexOf("sel") >= 0 || view === "time") {
+    if ("list" === view || "radio" === view || "markdown" === view || "pca" === view || view.indexOf("sel") >= 0 || "time" === view) {
       return rules;
     }
     if (view.indexOf("upload") >= 0 || view.indexOf("file") >= 0 || view.indexOf("image") >= 0) {
@@ -192,17 +201,17 @@ class IFormSchema {
         schema.componentProps.disabled = true;
       }
       if (!schema.componentProps.hasOwnProperty("onChange")) {
-        schema.componentProps["onChange"] = (value) => {
+        schema.componentProps["onChange"] = (value, formData) => {
           if (value instanceof Event) {
             value = value.target.value;
           }
           if (value instanceof Array) {
             value = value.join(",");
           }
-          if (!this.formRef.value.$formValueChange) {
+          if (!this.formRef || !this.formRef.value || !this.formRef.value.$formValueChange) {
             console.log("\u5F53\u524D\u8868\u5355\u65E0\u6CD5\u89E6\u53D1change\u4E8B\u4EF6,field\uFF1A" + this.field);
           } else {
-            this.formRef.value.$formValueChange(this.field, value);
+            this.formRef.value.$formValueChange(this.field, value, formData);
           }
         };
       }
@@ -232,6 +241,8 @@ class IFormSchema {
   getPopContainer() {
     if (this.searchForm === true) {
       return "body";
+    } else if (this.popContainer) {
+      return `.${this.popContainer} .ant-modal-content`;
     } else {
       return POP_CONTAINER;
     }
@@ -245,6 +256,14 @@ class IFormSchema {
       }
     }
   }
+  setCustomPopContainer(modalClass) {
+    this.popContainer = modalClass;
+  }
+  getLinkFieldInfo() {
+    return "";
+  }
+  setOtherInfo(_arg) {
+  }
 }
 class InputWidget extends IFormSchema {
   getItem() {
@@ -276,6 +295,9 @@ class DateWidget extends IFormSchema {
         valueFormat: this.format,
         style: {
           width: "100%"
+        },
+        getPopupContainer: (_node) => {
+          return this.getModalAsContainer();
         }
       }
     });
@@ -285,23 +307,48 @@ class SelectWidget extends IFormSchema {
   constructor(key, data) {
     super(key, data);
     this.options = this.getOptions(data["enum"]);
+    this.dictTable = data["dictTable"];
+    this.dictText = data["dictText"];
+    this.dictCode = data["dictCode"];
   }
   getItem() {
     let item = super.getItem();
+    let component = this.getFormComponent();
+    let componentProps = this.getComponentProps();
     return Object.assign({}, item, {
-      component: "Select",
-      componentProps: {
-        options: this.options,
-        allowClear: true,
-        style: {
-          width: "100%"
-        },
-        getPopupContainer: (_node) => {
-          return this.getModalAsContainer();
-        }
-      }
+      component,
+      componentProps
     });
   }
+  getFormComponent() {
+    if (this.options.length > 0) {
+      return "Select";
+    } else {
+      return "JDictSelectTag";
+    }
+  }
+  getComponentProps() {
+    let props = {
+      allowClear: true,
+      style: {
+        width: "100%"
+      },
+      getPopupContainer: (_node) => {
+        return this.getModalAsContainer();
+      }
+    };
+    if (this.options.length > 0) {
+      props["options"] = this.options;
+    } else {
+      if (!this.dictTable) {
+        props["dictCode"] = this.dictCode;
+      } else {
+        let temp = `${this.dictTable},${this.dictText},${this.dictCode}`;
+        props["dictCode"] = encodeURI(temp);
+      }
+    }
+    return props;
+  }
   getOptions(array) {
     if (!array || array.length == 0) {
       return [];
@@ -496,9 +543,10 @@ class TreeCategoryWidget extends IFormSchema {
         multiple: this.multi,
         pid: pidValue,
         back: this.textField,
-        onChange: (_val, backVal) => {
+        onChange: (val, backVal) => {
           if (this.formRef) {
             this.formRef.value.setFieldsValue(backVal);
+            this.formRef.value.$formValueChange(this.field, val);
           }
         }
       };
@@ -572,7 +620,11 @@ class EditorWidget extends IFormSchema {
     let item = super.getItem();
     return Object.assign({}, item, {
       component: "JEditor",
-      componentProps: {}
+      componentProps: {
+        options: {
+          auto_focus: false
+        }
+      }
     });
   }
 }
@@ -852,6 +904,83 @@ class NumberWidget extends IFormSchema {
     return props;
   }
 }
+class LinkTableWidget extends IFormSchema {
+  constructor(key, data) {
+    super(key, data);
+    this.dictTable = data.dictTable;
+    this.dictText = data.dictText;
+    this.dictCode = data.dictCode;
+    this.view = data.view;
+    this.componentString = "";
+    this.linkFields = [];
+  }
+  getItem() {
+    let item = super.getItem();
+    const componentProps = this.getComponentProps();
+    return Object.assign({}, item, {
+      component: this.componentString,
+      componentProps
+    });
+  }
+  getComponentProps() {
+    let props = {
+      textField: this.dictText,
+      tableName: this.dictTable,
+      valueField: this.dictCode
+    };
+    let extend = this.getExtendData();
+    if (extend.multiSelect) {
+      props["multi"] = true;
+    } else {
+      props["multi"] = false;
+    }
+    if (extend.imageField) {
+      props["imageField"] = extend.imageField;
+    } else {
+      props["imageField"] = "";
+    }
+    if (extend.showType == "select") {
+      this.componentString = "LinkTableSelect";
+      let popContainer = this.getPopContainer();
+      props["popContainer"] = popContainer;
+    } else {
+      this.componentString = "LinkTableCard";
+    }
+    if (this.linkFields.length > 0) {
+      props["linkFields"] = this.linkFields;
+    }
+    return props;
+  }
+  setOtherInfo(arr) {
+    this.linkFields = arr;
+  }
+}
+class LinkTableFieldWidget extends IFormSchema {
+  constructor(key, data) {
+    super(key, data);
+    this.dictTable = data["dictTable"];
+    this.dictText = data["dictText"];
+  }
+  getItem() {
+    let item = super.getItem();
+    return Object.assign({}, item, {
+      componentProps: {
+        readOnly: true,
+        allowClear: false,
+        disabled: true,
+        style: {
+          background: "none",
+          color: "rgba(0, 0, 0, 0.85)",
+          border: "none"
+        }
+      }
+    });
+  }
+  getLinkFieldInfo() {
+    let arr = [this.dictTable, `${this.field},${this.dictText}`];
+    return arr;
+  }
+}
 class FormSchemaFactory {
   static createFormSchema(key, data) {
     let view = data.view;
@@ -899,6 +1028,10 @@ class FormSchemaFactory {
         return new TreeSelectWidget(key, data);
       case "switch":
         return new SwitchWidget(key, data);
+      case "link_table":
+        return new LinkTableWidget(key, data);
+      case "link_table_field":
+        return new LinkTableFieldWidget(key, data);
       case "slot":
         return new SlotWidget(key, data);
       case "hidden":
@@ -914,9 +1047,9 @@ class FormSchemaFactory {
   static createSlotFormSchema(key, data) {
     let slotFs = new SlotWidget(key, data);
     let view = data.view;
-    if (view == "date") {
+    if ("date" == view) {
       slotFs.groupDate();
-    } else if (view == "datetime") {
+    } else if ("datetime" == view) {
       slotFs.groupDatetime();
     } else {
       let type = data.type;
@@ -935,4 +1068,4 @@ class FormSchemaFactory {
     };
   }
 }
-export { ENHANCEJS as E, FormSchemaFactory as F, SUBMIT_FLOW_KEY as S, VALIDATE_FAILED as V, SUBMIT_FLOW_ID as a, FORM_VIEW_TO_QUERY_VIEW as b, SETUP as c };
+export { ENHANCEJS as E, FormSchemaFactory as F, ONL_FORM_TABLE_NAME as O, SUBMIT_FLOW_KEY as S, VALIDATE_FAILED as V, ONL_AUTH_PRE as a, SUBMIT_FLOW_ID as b, FORM_VIEW_TO_QUERY_VIEW as c, SETUP as d };