@jeecg/online 3.4.3-beta → 3.4.4-RC

package/OnlineSelectCascade.js

@@ -18,7 +18,7 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import { defineComponent, ref, watch, resolveComponent, openBlock, createElementBlock, Fragment, createTextVNode, createVNode, withCtx, renderList, createBlock, createElementVNode, toDisplayString } from "vue";
+import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, withCtx, createElementBlock, Fragment, renderList, createElementVNode, toDisplayString } from "vue";
 import { defHttp } from "/@/utils/http/axios";
 import { useMessage } from "/@/hooks/web/useMessage";
 import { _ as _export_sfc } from "./index.js";
@@ -38,7 +38,7 @@ const _sfc_main = defineComponent({
     condition: { type: String, default: "" },
     value: { type: String, default: "" },
     isNumber: { type: Boolean, default: false },
-    placeholder: { type: String, default: "\u8BF7\u9009\u62E91" }
+    placeholder: { type: String, default: "\u8BF7\u9009\u62E9" }
   },
   emits: ["change", "next"],
   setup(props, { emit }) {
@@ -198,34 +198,31 @@ const _hoisted_1 = ["title"];
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_a_select_option = resolveComponent("a-select-option");
   const _component_a_select = resolveComponent("a-select");
-  return openBlock(), createElementBlock(Fragment, null, [
-    createTextVNode(" 111 "),
-    createVNode(_component_a_select, {
-      placeholder: _ctx.placeholder,
-      value: _ctx.selectedValue,
-      onChange: _ctx.handleChange,
-      allowClear: "",
-      style: { "width": "100%" }
-    }, {
-      default: withCtx(() => [
-        (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.dictOptions, (item, index) => {
-          return openBlock(), createBlock(_component_a_select_option, {
-            key: index,
-            value: item.store
-          }, {
-            default: withCtx(() => [
-              createElementVNode("span", {
-                style: { "display": "inline-block", "width": "100%" },
-                title: item.label
-              }, toDisplayString(item.label), 9, _hoisted_1)
-            ]),
-            _: 2
-          }, 1032, ["value"]);
-        }), 128))
-      ]),
-      _: 1
-    }, 8, ["placeholder", "value", "onChange"])
-  ], 64);
+  return openBlock(), createBlock(_component_a_select, {
+    placeholder: _ctx.placeholder,
+    value: _ctx.selectedValue,
+    onChange: _ctx.handleChange,
+    allowClear: "",
+    style: { "width": "100%" }
+  }, {
+    default: withCtx(() => [
+      (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.dictOptions, (item, index) => {
+        return openBlock(), createBlock(_component_a_select_option, {
+          key: index,
+          value: item.store
+        }, {
+          default: withCtx(() => [
+            createElementVNode("span", {
+              style: { "display": "inline-block", "width": "100%" },
+              title: item.label
+            }, toDisplayString(item.label), 9, _hoisted_1)
+          ]),
+          _: 2
+        }, 1032, ["value"]);
+      }), 128))
+    ]),
+    _: 1
+  }, 8, ["placeholder", "value", "onChange"]);
 }
 var OnlineSelectCascade = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export { OnlineSelectCascade as default };

package/PageAttributeTable.js

@@ -22,6 +22,7 @@ import { JVxeTypes } from "/@/components/jeecg/JVxeTable/types";
 import { u as useTableSync } from "./useTableSync.js";
 import LinkTableConfigModal from "./LinkTableConfigModal.js";
 import LinkTableFieldConfigModal from "./LinkTableFieldConfigModal.js";
+import FieldExtendJsonModal from "./FieldExtendJsonModal.js";
 import { useModal } from "/@/components/Modal";
 import { _ as _export_sfc } from "./index.js";
 import "./cgform.data.js";
@@ -49,25 +50,25 @@ const commonPageOptions = [
   { title: "\u5355\u9009\u6846", value: "radio" },
   { title: "\u591A\u9009\u6846", value: "checkbox" },
   { title: "\u5F00\u5173", value: "switch" },
-  { title: "\u65E5\u671F(yyyy-MM-dd)", value: "date" },
-  { title: "\u65E5\u671F\uFF08yyyy-MM-dd HH:mm:ss\uFF09", value: "datetime" },
-  { title: "\u65F6\u95F4\uFF08HH:mm:ss\uFF09", value: "time" },
+  { title: "\u65E5\u671F(\u5E74\u6708\u65E5)", value: "date" },
+  { title: "\u65E5\u671F(\u5E74\u6708\u65E5\u65F6\u5206\u79D2)", value: "datetime" },
+  { title: "\u65F6\u95F4(HH:mm:ss)", value: "time" },
   { title: "\u6587\u4EF6", value: "file" },
   { title: "\u56FE\u7247", value: "image" },
   { title: "\u591A\u884C\u6587\u672C", value: "textarea" },
-  { title: "\u4E0B\u62C9\u591A\u9009\u6846", value: "list_multi" },
-  { title: "\u4E0B\u62C9\u641C\u7D22\u6846", value: "sel_search" },
-  { title: "Popup\u5F39\u6846", value: "popup" },
-  { title: "\u5173\u8054\u8BB0\u5F55", value: "link_table" },
-  { title: "\u4ED6\u8868\u5B57\u6BB5", value: "link_table_field" },
-  { title: "\u5206\u7C7B\u5B57\u5178\u6811", value: "cat_tree" },
-  { title: "\u90E8\u95E8\u9009\u62E9", value: "sel_depart" },
-  { title: "\u7528\u6237\u9009\u62E9", value: "sel_user" },
   { title: "\u5BCC\u6587\u672C", value: "umeditor" },
   { title: "MarkDown", value: "markdown" },
+  { title: "\u7528\u6237\u9009\u62E9", value: "sel_user" },
+  { title: "\u90E8\u95E8\u9009\u62E9", value: "sel_depart" },
+  { title: "\u5173\u8054\u8BB0\u5F55", value: "link_table" },
+  { title: "\u4ED6\u8868\u5B57\u6BB5", value: "link_table_field" },
   { title: "\u7701\u5E02\u533A\u7EC4\u4EF6", value: "pca" },
-  { title: "\u8054\u52A8\u7EC4\u4EF6", value: "link_down" },
-  { title: "\u81EA\u5B9A\u4E49\u6811\u63A7\u4EF6", value: "sel_tree" }
+  { title: "Popup\u5F39\u6846", value: "popup" },
+  { title: "\u4E0B\u62C9\u591A\u9009\u6846", value: "list_multi" },
+  { title: "\u4E0B\u62C9\u641C\u7D22\u6846", value: "sel_search" },
+  { title: "\u5206\u7C7B\u5B57\u5178\u6811", value: "cat_tree" },
+  { title: "\u81EA\u5B9A\u4E49\u6811\u63A7\u4EF6", value: "sel_tree" },
+  { title: "\u8054\u52A8\u7EC4\u4EF6", value: "link_down" }
 ];
 const subTablePageOptions = [
   { title: "\u6587\u672C\u6846", value: "text" },
@@ -84,13 +85,15 @@ const subTablePageOptions = [
   { title: "popup\u5F39\u51FA\u6846", value: "popup" },
   { title: "\u90E8\u95E8\u9009\u62E9", value: "sel_depart" },
   { title: "\u7528\u6237\u9009\u62E9", value: "sel_user" },
+  { title: "\u7701\u5E02\u533A\u7EC4\u4EF6", value: "pca" },
   { title: "\u591A\u884C\u6587\u672C", value: "textarea" }
 ];
 const _sfc_main = defineComponent({
   name: "PageAttributeTable",
   components: {
     LinkTableConfigModal,
-    LinkTableFieldConfigModal
+    LinkTableFieldConfigModal,
+    FieldExtendJsonModal
   },
   setup() {
     const columns = ref([
@@ -146,8 +149,9 @@ const _sfc_main = defineComponent({
         title: "\u63A7\u4EF6\u957F\u5EA6",
         key: "fieldLength",
         width: 120,
+        titleHelp: { message: "\u6B64\u957F\u5EA6\u53EA\u5BF9\u5B50\u8868\u5217\u5B57\u6BB5\u5BBD\u5EA6\u6709\u6548\uFF01" },
         type: JVxeTypes.inputNumber,
-        defaultValue: 120,
+        defaultValue: 200,
         placeholder: "\u8BF7\u8F93\u5165${title}",
         validateRules: [{ required: true, message: "${title}\u4E0D\u80FD\u4E3A\u7A7A" }]
       },
@@ -181,21 +185,21 @@ const _sfc_main = defineComponent({
         defaultValue: ""
       },
       {
-        title: "\u6269\u5C55\u53C2\u6570",
-        key: "fieldExtendJson",
-        width: 120,
+        title: "\u5B9A\u4E49\u8F6C\u6362\u5668",
+        key: "converter",
+        width: 150,
         type: JVxeTypes.input,
         defaultValue: ""
       },
       {
-        title: "\u5B9A\u4E49\u8F6C\u6362\u5668",
-        key: "converter",
-        width: 150,
+        title: "\u6269\u5C55\u53C2\u6570",
+        key: "fieldExtendJson",
+        width: 120,
         type: JVxeTypes.input,
         defaultValue: ""
       },
       {
-        title: "\u4E2A\u6027\u914D\u7F6E",
+        title: "\u66F4\u591A\u914D\u7F6E",
         minWidth: 100,
         key: "fieldConfig",
         type: JVxeTypes.slot,
@@ -247,11 +251,19 @@ const _sfc_main = defineComponent({
     }
     const [registerModal, { openModal }] = useModal();
     const [registerFieldModal, { openModal: openFieldModal }] = useModal();
+    const [registerExtJsonModal, { openModal: openExtJsonModal }] = useModal();
     function showConfigButton(props) {
-      if (props.row.fieldShowType.indexOf("link_table") >= 0) {
+      if (props.row.dbFieldName == "id") {
+        return false;
+      } else {
         return true;
+      }
+    }
+    function openConfig(props) {
+      if (props.row.fieldShowType.indexOf("link_table") >= 0) {
+        showFieldConfig(props);
       } else {
-        return false;
+        showExtJsonConfig(props);
       }
     }
     function showFieldConfig(props) {
@@ -384,6 +396,27 @@ const _sfc_main = defineComponent({
         checkTable.value.tableRef.setValues(tableValues);
       }
     }
+    function showExtJsonConfig(props) {
+      let jsonStr = props.row.fieldExtendJson || "";
+      let id = props.rowId;
+      let fieldShowType = props.row.fieldShowType || "";
+      let sortFlag = props.row.sortFlag || "0";
+      openExtJsonModal(true, {
+        jsonStr,
+        fieldShowType,
+        sortFlag,
+        id
+      });
+    }
+    function handleExtJson(data, rowKey) {
+      let values;
+      if (data && Object.keys(data).length > 0) {
+        values = [{ rowKey, values: { fieldExtendJson: JSON.stringify(data) } }];
+      } else {
+        values = [{ rowKey, values: { fieldExtendJson: "" } }];
+      }
+      tableRef.value.setValues(values);
+    }
     return __spreadProps(__spreadValues({}, setup), {
       columns,
       enableQuery,
@@ -391,6 +424,9 @@ const _sfc_main = defineComponent({
       changePageType,
       showConfigButton,
       showFieldConfig,
+      registerExtJsonModal,
+      handleExtJson,
+      openConfig,
       registerModal,
       handleConfigData,
       registerFieldModal,
@@ -403,6 +439,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_JVxeTable = resolveComponent("JVxeTable");
   const _component_link_table_config_modal = resolveComponent("link-table-config-modal");
   const _component_link_table_field_config_modal = resolveComponent("link-table-field-config-modal");
+  const _component_FieldExtendJsonModal = resolveComponent("FieldExtendJsonModal");
   return openBlock(), createElementBlock(Fragment, null, [
     createVNode(_component_JVxeTable, mergeProps({
       ref: "tableRef",
@@ -421,10 +458,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           type: "primary",
           size: "small",
           ghost: "",
-          onClick: ($event) => _ctx.showFieldConfig(props)
+          onClick: ($event) => _ctx.openConfig(props)
         }, {
           default: withCtx(() => [
-            createTextVNode("\u6253\u5F00\u914D\u7F6E")
+            createTextVNode("\u9AD8\u7EA7\u914D\u7F6E")
           ]),
           _: 2
         }, 1032, ["onClick"])) : createCommentVNode("", true)
@@ -438,8 +475,12 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     createVNode(_component_link_table_field_config_modal, {
       onRegister: _ctx.registerFieldModal,
       onSuccess: _ctx.handleFieldConfigData
+    }, null, 8, ["onRegister", "onSuccess"]),
+    createVNode(_component_FieldExtendJsonModal, {
+      onRegister: _ctx.registerExtJsonModal,
+      onSuccess: _ctx.handleExtJson
     }, null, 8, ["onRegister", "onSuccess"])
   ], 64);
 }
-var PageAttributeTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-eb3d4aa4"]]);
+var PageAttributeTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-58928976"]]);
 export { PageAttributeTable as default };

package/README.md

@@ -15,4 +15,9 @@ yarn add @jeecg/online
 JeecgBoot 在线低代码功能
  1、在线表单开发
  2、在线报表开发
-```
+ 3、在线代码生成
+```
+
+## 官网
+
+- http://www.jeecg.com