gds-plus-design-vue 1.1.33 → 1.1.35

package/lib/{index.7c69f2f8.mjs → index.9ee2019b.mjs}

@@ -630,7 +630,7 @@ const constantRouterMap = [{
     {
       path: "login",
       name: "login",
-      component: () => import("./main.03cd6bf3.mjs"),
+      component: () => import("./main.cc2d8da0.mjs"),
       meta: {
         title: "\u767B\u5F55",
         transKey: "gd.login.title"
@@ -1370,7 +1370,7 @@ var _sfc_render$5Y = function() {
   null,
   null
 );
-const UserLogo = __component__$5Y.exports, sidebarMenus_vue_vue_type_style_index_0_scoped_8f957443_lang = "";
+const UserLogo = __component__$5Y.exports, sidebarMenus_vue_vue_type_style_index_0_scoped_6b8e5f8b_lang = "";
 var timeOut$2 = null;
 const _sfc_main$5X = {
   props: {
@@ -1598,7 +1598,7 @@ var _sfc_render$5X = function() {
     return [t.modeList.includes(r.code) ? a("div", { staticClass: "gd-menus-item", class: o != 0 && r.show ? "gd-menus-itembj" : "", attrs: { id: `gd-menus-item-${r.code}` } }, [r.show && t.modeMenus === "multiple" ? a("div", { staticClass: "divider" }, [a("div", { staticClass: "dividerl" }, [a("i", { staticClass: "gd-icons icons-menu", class: r.icon })]), a("span", { staticClass: "gdtitle", attrs: { title: t.$i18nt(`Dynamics.${r.transkey}`, r.name) } }, [t._v(" " + t._s(t.$i18nt(`Dynamics.${r.transkey}`, r.name)) + " ")])]) : t._e(), t._l(r.children, function(l) {
       return [!l.hidden && l.show ? a("div", [l.type == 1 ? a("div", { staticClass: "item-list" }, [a("div", { staticClass: "item", class: l.path === t.activeKey ? "itemactive" : "", on: { click: function(d) {
         return t.goPath(l, 1, r);
-      } } }, [l.meta && l.meta.icon && l.meta.icon !== "none" ? a("div", { staticClass: "iteml" }, [a("i", { staticClass: "gd-icons icons-menu", class: l.meta.icon })]) : t._e(), a("div", { staticClass: "gdtitle line1", attrs: { title: t.$i18nt(`Dynamics.${l.transKey}`, l.meta.title) } }, [t._v(" " + t._s(t.$i18nt(`Dynamics.${l.transKey}`, l.meta.title)) + " ")]), t.getUserFavoriteMenu.includes(l.id) ? a("div", { staticClass: "item-collected" }, [t.getUserFavoriteMenu.includes(l.id) ? a("i", { staticClass: "gd-icons gd-icon-star-full", style: t.cstyle, on: { click: function(d) {
+      } } }, [l.meta && l.meta.icon && l.meta.icon !== "none" ? a("div", { staticClass: "iteml" }, [a("i", { staticClass: "gd-icons icons-menu", class: l.meta.icon })]) : t._e(), a("div", { staticClass: "gdtitle line1", attrs: { title: t.$i18nt(`Dynamics.${l.transkey}`, l.meta.title) } }, [t._v(" " + t._s(t.$i18nt(`Dynamics.${l.transkey}`, l.meta.title)) + " ")]), t.getUserFavoriteMenu.includes(l.id) ? a("div", { staticClass: "item-collected" }, [t.getUserFavoriteMenu.includes(l.id) ? a("i", { staticClass: "gd-icons gd-icon-star-full", style: t.cstyle, on: { click: function(d) {
         return d.stopPropagation(), t.collectMenu(l, 2);
       } } }) : a("i", { staticClass: "gd-icons gd-icon-star", style: t.cstyle, on: { click: function(d) {
         return d.stopPropagation(), t.collectMenu(l, 2);
@@ -1627,7 +1627,7 @@ var _sfc_render$5X = function() {
   _sfc_staticRenderFns$5X,
   !1,
   null,
-  "8f957443",
+  "6b8e5f8b",
   null,
   null
 );
@@ -13404,7 +13404,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
     }).default;
   });
 })(vuedraggable_umd);
-const draggable = /* @__PURE__ */ getDefaultExportFromCjs(vuedraggable_umd.exports), viewList_vue_vue_type_style_index_0_scoped_e090a514_lang = "", _sfc_main$5v = {
+const draggable = /* @__PURE__ */ getDefaultExportFromCjs(vuedraggable_umd.exports), viewList_vue_vue_type_style_index_0_scoped_e7c62c46_lang = "", _sfc_main$5v = {
   props: {
     table: {
       type: Object,
@@ -13698,7 +13698,11 @@ var _sfc_render$5v = function() {
       t.$set(t.selItem, "align", l);
     }, expression: "selItem.align" } }, t._l(t.alignList, function(l) {
       return a("el-option", { key: l.code, attrs: { placeholder: t.$i18nt("gd.placeholder.select", "\u8BF7\u9009\u62E9"), label: t.$i18nt(l.transkey, l.name), value: l.code } });
-    }), 1)], 1), a("el-form-item", { attrs: { label: t.$i18nt("gd.view.sorting", "\u5F00\u542F\u6392\u5E8F") } }, [a("el-switch", { attrs: { "active-color": t.primaryColor }, model: { value: t.selItem.orderconfig, callback: function(l) {
+    }), 1)], 1), t.selItem.effecttype === "datepicker" ? a("el-form-item", { attrs: { label: t.$i18nt("gd.page.displayFormat", "\u663E\u793A\u683C\u5F0F") } }, [a("el-select", { model: { value: t.selItem.format, callback: function(l) {
+      t.$set(t.selItem, "format", l);
+    }, expression: "selItem.format" } }, [t._l(t.getDictionary("time_longshort"), function(l) {
+      return [a("el-option", { attrs: { placeholder: t.$i18nt("gd.placeholder.select", "\u8BF7\u9009\u62E9"), label: t.$i18nt(l.transkey, l.name), value: l.code } })];
+    })], 2)], 1) : t._e(), a("el-form-item", { attrs: { label: t.$i18nt("gd.view.sorting", "\u5F00\u542F\u6392\u5E8F") } }, [a("el-switch", { attrs: { "active-color": t.primaryColor }, model: { value: t.selItem.orderconfig, callback: function(l) {
       t.$set(t.selItem, "orderconfig", l);
     }, expression: "selItem.orderconfig" } })], 1), t.selItem.effecttype != "participants" ? a("el-form-item", { attrs: { label: t.$i18nt("gd.view.gather", "\u5F00\u542F\u6C47\u603B") } }, [a("el-switch", { attrs: { "active-color": t.primaryColor, disabled: !["double", "currency", "inputnumber"].includes(t.selItem.effecttype) }, model: { value: t.selItem.gatherconfig, callback: function(l) {
       t.$set(t.selItem, "gatherconfig", l);
@@ -13726,7 +13730,7 @@ var _sfc_render$5v = function() {
   _sfc_staticRenderFns$5v,
   !1,
   null,
-  "e090a514",
+  "e7c62c46",
   null,
   null
 );
@@ -14563,7 +14567,7 @@ var _sfc_render$5q = function() {
   null,
   null
 );
-const QueryRules = __component__$5q.exports, viewQuery_vue_vue_type_style_index_0_scoped_4237e52a_lang = "", intervalList = [
+const QueryRules = __component__$5q.exports, viewQuery_vue_vue_type_style_index_0_scoped_58a81ecb_lang = "", intervalList = [
   {
     name: "\u4ECA\u5929",
     keyI18n: "gd.view.today",
@@ -14688,6 +14692,10 @@ const QueryRules = __component__$5q.exports, viewQuery_vue_vue_type_style_index_
   },
   components: { draggable, FieldFiltering, QueryRules, EffectTypeIcon },
   computed: {
+    getEffectList() {
+      const s = this.record.isvirtualtable == 1 ? "virtual_table_effect_type" : "code_gen_effect_type";
+      return this.getDictionary(s);
+    },
     intervalData() {
       let s = this.options.defaultInterval.filter((t) => t.type === "interval")[0];
       return s || {};
@@ -14700,8 +14708,11 @@ const QueryRules = __component__$5q.exports, viewQuery_vue_vue_type_style_index_
       return this.selItem.options || {};
     },
     fieldFormat() {
-      const t = this.getDictionary("time_longshort").filter((a) => String(a.code) === String(this.selItem.fieldformat))[0];
-      return t ? t.name : "yyyy-MM-dd hh:mm:ss";
+      const s = this.timeLongshort.filter((t) => String(t.code) === String(this.options.fieldFormat))[0];
+      return s ? s.name : "yyyy-MM-dd hh:mm:ss";
+    },
+    timeLongshort() {
+      return this.getDictionary("time_longshort");
     },
     height() {
       let s = this.fullscreen ? 190 : 340;
@@ -14710,6 +14721,22 @@ const QueryRules = __component__$5q.exports, viewQuery_vue_vue_type_style_index_
     ...mapGetters(["tablePageSize", "tableSize", "screenHeight", "tableLists", "primaryColor"])
   },
   methods: {
+    hasTimePicker(s) {
+      const t = this.timeLongshort.filter((r) => r.code == s.fieldFormat)[0], a = t ? t.name : "yyyy-MM-dd";
+      return ["hh:mm:ss", "hh:mm", "mm:ss"].includes(a);
+    },
+    pickerType(s) {
+      const t = this.timeLongshort.filter((o) => o.code == s.fieldFormat)[0], a = t ? t.name : "yyyy-MM-dd";
+      let r = "date";
+      return a === "yyyy-MM-dd hh:mm:ss" ? r = "datetime" : a === "yyyy-MM" ? r = "month" : a === "yyyy" && (r = "year"), r;
+    },
+    changeFormat(s) {
+      this.disabledInterval(s) && (s.displayStyle = 1), s.defaultValue = "";
+    },
+    disabledInterval(s) {
+      const t = this.timeLongshort.filter((o) => o.code == s.fieldFormat)[0], a = t ? t.name : "yyyy-MM-dd";
+      return !["yyyy-MM-dd hh:mm:ss", "yyyy-MM-dd"].includes(a);
+    },
     selDateDefault(s, t) {
       let a = this.options.defaultInterval[t];
       this.options.defaultInterval[t].value = a.value !== s.val ? s.val : "";
@@ -14735,7 +14762,7 @@ const QueryRules = __component__$5q.exports, viewQuery_vue_vue_type_style_index_
         });
       });
       let r = this.selectedRowKeys.filter((l) => !a.includes(l)), o = this.loadFieldData.filter((l) => r.includes(l.id));
-      this.list = t.concat(o), this.visible = !1;
+      console.log(o, t), this.list = t.concat(o), this.visible = !1;
     },
     init(s) {
       this.list = [...s];
@@ -14753,6 +14780,7 @@ const QueryRules = __component__$5q.exports, viewQuery_vue_vue_type_style_index_
         const a = {
           fieldFiltering: !0,
           effectType: "",
+          fieldFormat: "",
           displayStyle: 0,
           defaultValue: "",
           defaultValueList: [],
@@ -14774,7 +14802,8 @@ const QueryRules = __component__$5q.exports, viewQuery_vue_vue_type_style_index_
           { ...a },
           {
             columnName: o.columnname,
-            effectType: o.effecttype
+            effectType: o.effecttype,
+            fieldFormat: String(o.fieldformat)
           }
         ), o.querywhether === "Y")).filter((o) => !(o.effecttype == "about" && o.columnname == (o.relations + "_abouttable").toLowerCase() || o.effecttype == "image" || o.effecttype == "file"));
         this.loadFieldData = [...r], s({ pageNo: 1, pageSize: 40, totalRows: 0, rows: r });
@@ -14809,11 +14838,19 @@ var _sfc_render$5p = function() {
       return t.popoverItem(r);
     } } }, [a("el-popover", { attrs: { placement: "right", trigger: "click" } }, [a("div", { staticClass: "bitem", attrs: { slot: "reference" }, slot: "reference" }, [a("i", { staticClass: "el-icon-rank active-color drag-move" }), a("EffectTypeIcon", { attrs: { effectType: r.effecttype } }), a("div", { staticClass: "sku" }, [t._v(" " + t._s(r.columnname) + " ")]), a("el-divider", { attrs: { direction: "vertical" } }), a("div", { staticClass: "spu line1" }, [a("span", [t._v(t._s(t.$i18nt(`Dynamics.${r.transkey}`, r.columncomment)))])]), r.options.fieldFiltering ? t._e() : a("i", { staticClass: "el-icon-warning" }), a("i", { staticClass: "el-icon-delete", on: { click: function(l) {
       return l.stopPropagation(), t.del(r);
-    } } })], 1), a("div", { staticClass: "bconfig" }, [a("el-form-item", { attrs: { label: t.$i18nt("gd.field.effectType", "\u4F5C\u7528\u7C7B\u578B") } }, [a("el-input", { attrs: { placeholder: t.$i18nt("gd.placeholder.input", "\u8BF7\u8F93\u5165"), disabled: "" }, model: { value: t.options.effectType, callback: function(l) {
+    } } })], 1), a("div", { staticClass: "bconfig" }, [a("el-form-item", { attrs: { label: t.$i18nt("gd.field.effectType", "\u4F5C\u7528\u7C7B\u578B") } }, [a("el-select", { staticStyle: { width: "100%" }, attrs: { disabled: "" }, model: { value: t.options.effectType, callback: function(l) {
       t.$set(t.options, "effectType", l);
-    }, expression: "options.effectType" } })], 1), t.selItem.effecttype === "datepicker" ? a("el-form-item", { attrs: { label: "\u64CD\u4F5C\u7B26" } }, [a("el-radio-group", { attrs: { size: "mini" }, model: { value: t.options.displayStyle, callback: function(l) {
+    }, expression: "options.effectType" } }, [t._l(t.getEffectList, function(l) {
+      return [a("el-option", { attrs: { label: t.$i18nt(`Dynamics.${l.transkey}`, l.name), value: l.code } })];
+    })], 2)], 1), r.effecttype === "datepicker" ? a("el-form-item", { attrs: { label: t.$i18nt("gd.page.displayFormat", "\u663E\u793A\u683C\u5F0F") } }, [a("el-select", { staticStyle: { width: "100%" }, on: { change: function(l) {
+      return t.changeFormat(t.options);
+    } }, model: { value: t.options.fieldFormat, callback: function(l) {
+      t.$set(t.options, "fieldFormat", l);
+    }, expression: "options.fieldFormat" } }, [t._l(t.getDictionary("time_longshort"), function(l) {
+      return [a("el-option", { attrs: { placeholder: t.$i18nt("gd.placeholder.select", "\u8BF7\u9009\u62E9"), label: t.$i18nt(l.transkey, l.name), value: l.code } })];
+    })], 2)], 1) : t._e(), t.selItem.effecttype === "datepicker" ? a("el-form-item", { attrs: { label: "\u64CD\u4F5C\u7B26" } }, [a("el-radio-group", { attrs: { size: "mini" }, model: { value: t.options.displayStyle, callback: function(l) {
       t.$set(t.options, "displayStyle", l);
-    }, expression: "options.displayStyle" } }, [a("el-radio-button", { attrs: { label: 0 } }, [t._v(t._s(t.$i18nt("gd.field.operationInterval", "\u533A\u95F4\u8303\u56F4")))]), a("el-radio-button", { attrs: { label: 1 } }, [t._v(t._s(t.$i18nt("gd.field.operationEqual", "\u7B49\u4E8E")))])], 1)], 1) : t._e(), [
+    }, expression: "options.displayStyle" } }, [a("el-radio-button", { attrs: { label: 0, disabled: t.disabledInterval(t.options) } }, [t._v(" " + t._s(t.$i18nt("gd.field.operationInterval", "\u533A\u95F4\u8303\u56F4")) + " ")]), a("el-radio-button", { attrs: { label: 1 } }, [t._v(t._s(t.$i18nt("gd.field.operationEqual", "\u7B49\u4E8E")))])], 1)], 1) : t._e(), [
       "switch",
       "select",
       "radio",
@@ -14833,19 +14870,21 @@ var _sfc_render$5p = function() {
       t.$set(t.options, "defaultValue", l);
     }, expression: "options.defaultValue" } })] : ["inputnumber", "double", "currency"].includes(t.selItem.effecttype) ? [a("el-input", { attrs: { "controls-position": "right", placeholder: t.$i18nt("gd.placeholder.input", "\u8BF7\u8F93\u5165") }, model: { value: t.options.defaultValue, callback: function(l) {
       t.$set(t.options, "defaultValue", l);
-    }, expression: "options.defaultValue" } })] : ["datepicker"].includes(t.selItem.effecttype) ? [a("div", { directives: [{ name: "show", rawName: "v-show", value: t.options.displayStyle == 1, expression: "options.displayStyle == 1" }] }, [a("el-date-picker", { attrs: { type: t.fieldFormat === "yyyy-MM-dd hh:mm:ss" ? "datetime" : "date", "value-format": t.fieldFormat, format: t.fieldFormat, placeholder: t.$i18nt("gd.placeholder.select", "\u8BF7\u9009\u62E9"), disabled: t.equalData.value !== "" }, model: { value: t.options.defaultValue, callback: function(l) {
+    }, expression: "options.defaultValue" } })] : ["datepicker"].includes(t.selItem.effecttype) ? [a("div", { directives: [{ name: "show", rawName: "v-show", value: t.options.displayStyle == 1, expression: "options.displayStyle == 1" }] }, [t.hasTimePicker(t.options) ? a("el-time-picker", { attrs: { "value-format": t.fieldFormat, format: t.fieldFormat, placeholder: t.$i18nt("gd.placeholder.select", "\u8BF7\u9009\u62E9"), disabled: t.equalData.value !== "" }, model: { value: t.options.defaultValue, callback: function(l) {
+      t.$set(t.options, "defaultValue", l);
+    }, expression: "options.defaultValue" } }) : a("el-date-picker", { attrs: { type: t.pickerType(t.options), "value-format": t.fieldFormat, format: t.fieldFormat, placeholder: t.$i18nt("gd.placeholder.select", "\u8BF7\u9009\u62E9"), disabled: t.equalData.value !== "" }, model: { value: t.options.defaultValue, callback: function(l) {
       t.$set(t.options, "defaultValue", l);
     }, expression: "options.defaultValue" } })], 1), a("div", { directives: [{ name: "show", rawName: "v-show", value: t.options.displayStyle != 1, expression: "options.displayStyle != 1" }] }, [a("el-date-picker", { staticStyle: { width: "320px" }, attrs: { type: "datetimerange", "range-separator": "~", "start-placeholder": t.$i18nt("el.datepicker.startDate", "\u5F00\u59CB\u65E5\u671F"), "end-placeholder": t.$i18nt("el.datepicker.endDate", "\u7ED3\u675F\u65E5\u671F"), "value-format": t.fieldFormat, format: t.fieldFormat, disabled: t.intervalData.value !== "" }, model: { value: t.options.defaultValueList, callback: function(l) {
       t.$set(t.options, "defaultValueList", l);
-    }, expression: "options.defaultValueList" } })], 1), t.options.displayStyle == 1 ? a("div", [t._l(t.equalList, function(l) {
-      return [a("el-tag", { staticStyle: { cursor: "pointer", margin: "0 6px 6px 0" }, attrs: { type: t.equalData.value === l.val ? "success" : "info", effect: "dark" }, on: { click: function(d) {
+    }, expression: "options.defaultValueList" } })], 1), t.disabledInterval(t.options) ? t._e() : [t.options.displayStyle == 1 ? a("div", [t._l(t.equalList, function(l) {
+      return [a("el-tag", { staticStyle: { cursor: "pointer", margin: "6px 6px 6px 0" }, attrs: { type: t.equalData.value === l.val ? "success" : "info", effect: "dark" }, on: { click: function(d) {
         return t.selDateDefault(l, 1);
       } } }, [t._v(" " + t._s(t.$i18nt(l.keyI18n, l.name)) + " ")])];
     })], 2) : a("div", [t._l(t.intervalList, function(l) {
-      return [a("el-tag", { staticStyle: { cursor: "pointer", margin: "0 6px 6px 0" }, attrs: { type: t.intervalData.value === l.val ? "success" : "info", effect: "dark" }, on: { click: function(d) {
+      return [a("el-tag", { staticStyle: { cursor: "pointer", margin: "6px 6px 6px 0" }, attrs: { type: t.intervalData.value === l.val ? "success" : "info", effect: "dark" }, on: { click: function(d) {
         return t.selDateDefault(l, 0);
       } } }, [t._v(" " + t._s(t.$i18nt(l.keyI18n, l.name)) + " ")])];
-    })], 2)] : t._e()], 2) : t._e(), t.selItem.effecttype === "fk" ? a("el-form-item", { attrs: { label: t.$i18nt("gd.form.cascadingFilter", "\u7EA7\u8054\u7B5B\u9009") } }, [a("FieldFiltering", { attrs: { selectItem: t.options, loadData: t.tableFieldList } })], 1) : t._e(), a("el-form-item", { attrs: { label: t.$i18nt("gd.form.actionProperties", "\u64CD\u4F5C\u5C5E\u6027") } }, [a("el-checkbox", { model: { value: t.options.hidden, callback: function(l) {
+    })], 2)]] : t._e()], 2) : t._e(), t.selItem.effecttype === "fk" ? a("el-form-item", { attrs: { label: t.$i18nt("gd.form.cascadingFilter", "\u7EA7\u8054\u7B5B\u9009") } }, [a("FieldFiltering", { attrs: { selectItem: t.options, loadData: t.tableFieldList } })], 1) : t._e(), a("el-form-item", { attrs: { label: t.$i18nt("gd.form.actionProperties", "\u64CD\u4F5C\u5C5E\u6027") } }, [a("el-checkbox", { model: { value: t.options.hidden, callback: function(l) {
       t.$set(t.options, "hidden", l);
     }, expression: "options.hidden" } }, [t._v(" " + t._s(t.$i18nt("gd.form.hide", "\u9690\u85CF")) + " ")]), a("el-checkbox", { model: { value: t.options.required, callback: function(l) {
       t.$set(t.options, "required", l);
@@ -14857,7 +14896,7 @@ var _sfc_render$5p = function() {
   _sfc_staticRenderFns$5p,
   !1,
   null,
-  "4237e52a",
+  "58a81ecb",
   null,
   null
 );
@@ -15170,7 +15209,7 @@ function sysSafeConfigMemberDel(s) {
     params: s
   });
 }
-const editPerson_vue_vue_type_style_index_0_scoped_684cac06_lang = "", defaultList$1 = [
+const editPerson_vue_vue_type_style_index_0_scoped_a095cf56_lang = "", defaultList$1 = [
   {
     code: 1,
     name: "\u662F",
@@ -15296,7 +15335,7 @@ const editPerson_vue_vue_type_style_index_0_scoped_684cac06_lang = "", defaultLi
     add() {
       let s = [], t = [], a = [];
       this.list.forEach((d, u) => {
-        let f = String(d.id).split("-"), h = `${d.align}&${d.visible ? 1 : 0}&${d.displaymode}&${d.displayprefix}`, p = {
+        let f = String(d.id).split("-"), h = `${d.align}&${d.visible ? 1 : 0}&${d.displaymode}&${d.displayprefix}&${d.preview}&${d.download}&${d.format}`, p = {
           name: d.alias == "" ? d.columncomment : d.alias,
           width: d.num,
           order: u,
@@ -15359,7 +15398,7 @@ const editPerson_vue_vue_type_style_index_0_scoped_684cac06_lang = "", defaultLi
     edit() {
       let s = [], t = [], a = [];
       this.list.forEach((d, u) => {
-        let f = String(d.id).split("-"), h = `${d.align}&${d.visible ? 1 : 0}&${d.displaymode}&${d.displayprefix}`;
+        let f = String(d.id).split("-"), h = `${d.align}&${d.visible ? 1 : 0}&${d.displaymode}&${d.displayprefix}&${d.preview}&${d.download}&${d.format}`;
         if (this.isChecked(d.id, this.record.data.syssavedqueryfields)) {
           let p = {
             id: 0,
@@ -15493,7 +15532,8 @@ const editPerson_vue_vue_type_style_index_0_scoped_684cac06_lang = "", defaultLi
                   displaymode: h[2] ? h[2] : "none",
                   displayprefix: h[3] ? h[3] : "none",
                   preview: h[4] ? h[4] === "true" : !0,
-                  download: h[5] ? h[5] === "true" : !0
+                  download: h[5] ? h[5] === "true" : !0,
+                  format: h[6] ? h[6] : String(l.fieldformat)
                 }
               );
               t.push(p);
@@ -15524,7 +15564,8 @@ const editPerson_vue_vue_type_style_index_0_scoped_684cac06_lang = "", defaultLi
                     displaymode: v[2] ? v[2] : "none",
                     displayprefix: v[3] ? v[3] : "none",
                     preview: v[4] ? v[4] === "true" : !0,
-                    download: v[5] ? v[5] === "true" : !0
+                    download: v[5] ? v[5] === "true" : !0,
+                    format: v[6] ? v[6] : String(d.fieldformat)
                   }
                 );
                 t.push(g);
@@ -15708,11 +15749,11 @@ var _sfc_render$5o = function() {
   _sfc_staticRenderFns$5o,
   !1,
   null,
-  "684cac06",
+  "a095cf56",
   null,
   null
 );
-const EditPerson = __component__$5o.exports, settings_vue_vue_type_style_index_0_scoped_d8d13a92_lang = "", _sfc_main$5n = {
+const EditPerson = __component__$5o.exports, settings_vue_vue_type_style_index_0_scoped_18b18fc7_lang = "", _sfc_main$5n = {
   props: {
     showTitle: {
       type: Boolean,
@@ -16090,7 +16131,7 @@ const EditPerson = __component__$5o.exports, settings_vue_vue_type_style_index_0
               }, u = this.$i18nt(`Dynamics.${o.transkey}`, o.columncomment), f = this.$i18nt(`Dynamics.${l.transkey}`, l.name);
               d.order = l.order, d.num = l.width, d.aliastranskey = l.transkey ? l.transkey : null, d.alias = u === f ? "" : f, d.orderconfig = l.orderconfig == 1, d.columnname = l.field ? l.field.columnname : o.columnname, d.codegenid = l.field ? l.field.codegenid : o.codegenid, d.gatherconfig = l.gatherconfig == 1, d.maxtagcount = l.maxtagcount ? l.maxtagcount : 2, d.fkrelations = `${u} -- ${o.columnname}`, d.transkey = o.transkey, d.operate = "edit", d.aliasold = f;
               let h = l.align ? l.align.split("&") : [];
-              d.align = h[0] ? h[0] : "left", d.visible = h[1] ? h[1] == 1 : !0, d.displaymode = h[2] ? h[2] : "none", d.displayprefix = h[3] ? h[3] : "none", d.preview = h[4] ? h[4] === "true" : !0, d.download = h[5] ? h[5] === "true" : !0, r.push(d);
+              d.align = h[0] ? h[0] : "left", d.visible = h[1] ? h[1] == 1 : !0, d.displaymode = h[2] ? h[2] : "none", d.displayprefix = h[3] ? h[3] : "none", d.preview = h[4] ? h[4] === "true" : !0, d.download = h[5] ? h[5] === "true" : !0, d.format = h[6] ? h[6] : String(o.fieldformat), r.push(d);
             }
           }
           o.children && o.children.length > 0 && o.children.forEach((l) => {
@@ -16102,7 +16143,7 @@ const EditPerson = __component__$5o.exports, settings_vue_vue_type_style_index_0
                 }, f = this.$i18nt(`Dynamics.${o.transkey}`, o.columncomment), h = this.$i18nt(`Dynamics.${l.transkey}`, l.columncomment), p = this.$i18nt(`Dynamics.${d.transkey}`, d.name);
                 u.order = d.order, u.num = d.width, u.aliastranskey = d.transkey ? d.transkey : null, u.alias = h === p ? "" : p, u.id = u.id + "-" + o.id, u.orderconfig = d.orderconfig == 1, u.gatherconfig = d.gatherconfig == 1, u.fkrelations = `${f} -- ${o.columnname}`, u.maxtagcount = d.maxtagcount ? d.maxtagcount : 2, u.transkey = l.transkey, u.operate = "edit", u.aliasold = p;
                 let v = d.align ? d.align.split("&") : [];
-                u.align = v[0] ? v[0] : "left", u.visible = v[1] ? v[1] == 1 : !0, u.displaymode = v[2] ? v[2] : "none", u.displayprefix = v[3] ? v[3] : "none", u.preview = v[4] ? v[4] === "true" : !0, u.download = v[5] ? v[5] === "true" : !0, r.push(u);
+                u.align = v[0] ? v[0] : "left", u.visible = v[1] ? v[1] == 1 : !0, u.displaymode = v[2] ? v[2] : "none", u.displayprefix = v[3] ? v[3] : "none", u.preview = v[4] ? v[4] === "true" : !0, u.download = v[5] ? v[5] === "true" : !0, u.format = v[6] ? v[6] : String(l.fieldformat), r.push(u);
               }
             }
           });
@@ -16254,7 +16295,7 @@ var _sfc_render$5n = function() {
   _sfc_staticRenderFns$5n,
   !1,
   null,
-  "d8d13a92",
+  "18b18fc7",
   null,
   null
 );
@@ -18411,7 +18452,7 @@ var _sfc_render$5e = function() {
   null,
   null
 );
-const XlsxExport = __component__$5e.exports, result_vue_vue_type_style_index_0_scoped_27cd1f39_lang = "", _sfc_main$5d = {
+const XlsxExport = __component__$5e.exports, result_vue_vue_type_style_index_0_scoped_deac0f84_lang = "", _sfc_main$5d = {
   props: {
     height: {
       type: Number,
@@ -18587,7 +18628,8 @@ const XlsxExport = __component__$5e.exports, result_vue_vue_type_style_index_0_s
         displayMode: s.displaymode,
         displayPrefix: s.displayprefix,
         preview: s.preview,
-        download: s.download
+        download: s.download,
+        format: s.format
       };
       return s.operate != "add" && s.alias != "" && s.aliastranskey ? Object.assign(p, {
         transKey: `Dynamics.${s.aliastranskey}`
@@ -18903,7 +18945,7 @@ var _sfc_render$5d = function() {
   _sfc_staticRenderFns$5d,
   !1,
   null,
-  "27cd1f39",
+  "deac0f84",
   null,
   null
 );
@@ -32077,7 +32119,7 @@ function processingResults$2(s, t) {
 function isSatisfyed$2(s, t) {
   return t === "2" ? s.every((a, r, o) => !a) : s.every((a, r, o) => !!a);
 }
-const main_vue_vue_type_style_index_0_scoped_ede1f888_lang = "", _sfc_main$4T = {
+const main_vue_vue_type_style_index_0_scoped_88c02157_lang = "", _sfc_main$4T = {
   name: "GdTableQueriesField",
   props: {
     height: {
@@ -32278,7 +32320,7 @@ const main_vue_vue_type_style_index_0_scoped_ede1f888_lang = "", _sfc_main$4T =
             let o = this.columns.filter((l) => l.prop === r)[0];
             ["checkbox"].includes(o.effectType) ? a.set(r, this.ruleFormData[r].join(",")) : a.set(r, this.ruleFormData[r]);
           }
-          this.$emit("save", Object.fromEntries(a)), this.cancel();
+          this.$emit("save", Object.fromEntries(a), this.columns), this.cancel();
         } else {
           let a = new Map(Object.entries(t)), r = [];
           for (let u of a.keys())
@@ -32345,11 +32387,15 @@ var _sfc_render$4T = function() {
       return a("el-option", { key: l.id, attrs: { label: t.$i18nt(`Dynamics.${l.transkey}`, l.busname), value: l.id } }, [t._v(" " + t._s(t.$i18nt(`Dynamics.${l.transkey}`, l.busname)) + " " + t._s(l.tablename) + " ")]);
     }), 1)] : r.effectType === "selectFkMultiple" ? [a("SelectFkMultiple", { ref: `fk_${r.prop}`, refInFor: !0, attrs: { column: r, ruleFormData: t.ruleFormData, visible: t.visible, recordRelation: t.recordRelation, openMode: t.openMode, changeTrigger: t.changeTrigger }, on: { change: function(l) {
       return t.handleChange(r);
-    } } })] : r.effectType == "datepicker" ? [r.options.displayStyle === 1 ? a("el-date-picker", { staticStyle: { width: "100%" }, attrs: { type: r.fieldFormat === 1 ? "datetime" : "date", "value-format": r.valueFormat, format: r.valueFormat, placeholder: t.$i18nt("gd.placeholder.select", "\u8BF7\u9009\u62E9"), disabled: r.disabled === void 0 ? !1 : r.disabled }, on: { change: function(l) {
+    } } })] : r.effectType == "datepicker" ? [r.options.displayStyle === 1 ? [r.hasTimePicker ? a("el-time-picker", { staticStyle: { width: "100%" }, attrs: { "value-format": r.valueFormat, format: r.valueFormat, placeholder: t.$i18nt("gd.placeholder.select", "\u8BF7\u9009\u62E9"), disabled: r.disabled === void 0 ? !1 : r.disabled }, on: { change: function(l) {
+      return t.handleChange(r);
+    } }, model: { value: t.ruleFormData[r.prop], callback: function(l) {
+      t.$set(t.ruleFormData, r.prop, l);
+    }, expression: "ruleFormData[column.prop]" } }) : a("el-date-picker", { staticStyle: { width: "100%" }, attrs: { type: r.pickerType, "value-format": r.valueFormat, format: r.valueFormat, placeholder: t.$i18nt("gd.placeholder.select", "\u8BF7\u9009\u62E9"), disabled: r.disabled === void 0 ? !1 : r.disabled }, on: { change: function(l) {
       return t.handleChange(r);
     } }, model: { value: t.ruleFormData[r.prop], callback: function(l) {
       t.$set(t.ruleFormData, r.prop, l);
-    }, expression: "ruleFormData[column.prop]" } }) : a("el-date-picker", { staticStyle: { width: "100%" }, attrs: { type: "daterange", format: "yyyy-MM-dd", "value-format": "yyyy-MM-dd", "range-separator": "~", "start-placeholder": t.$i18nt("el.datepicker.startDate", "\u5F00\u59CB\u65E5\u671F"), "end-placeholder": t.$i18nt("el.datepicker.endDate", "\u7ED3\u675F\u65E5\u671F"), disabled: r.disabled === void 0 ? !1 : r.disabled }, on: { change: function(l) {
+    }, expression: "ruleFormData[column.prop]" } })] : a("el-date-picker", { staticStyle: { width: "100%" }, attrs: { type: "daterange", format: "yyyy-MM-dd", "value-format": "yyyy-MM-dd", "range-separator": "~", "start-placeholder": t.$i18nt("el.datepicker.startDate", "\u5F00\u59CB\u65E5\u671F"), "end-placeholder": t.$i18nt("el.datepicker.endDate", "\u7ED3\u675F\u65E5\u671F"), disabled: r.disabled === void 0 ? !1 : r.disabled }, on: { change: function(l) {
       return t.handleChange(r);
     } }, model: { value: t.ruleFormData[r.prop], callback: function(l) {
       t.$set(t.ruleFormData, r.prop, l);
@@ -32365,7 +32411,7 @@ var _sfc_render$4T = function() {
   _sfc_staticRenderFns$4T,
   !1,
   null,
-  "ede1f888",
+  "88c02157",
   null,
   null
 );
@@ -78134,7 +78180,7 @@ const mixins$1e = {
       }]
     };
   }
-}, dictColumn_vue_vue_type_style_index_0_scoped_d5fab563_lang = "", _sfc_main$4x = {
+}, dictColumn_vue_vue_type_style_index_0_scoped_a97606ac_lang = "", _sfc_main$4x = {
   props: {
     typeId: {
       type: [String, Number],
@@ -78315,7 +78361,7 @@ const mixins$1e = {
 var _sfc_render$4x = function() {
   var t = this, a = t._self._c;
   return a("div", [a("el-divider", { staticClass: "setting-divider" }), a("div", { staticStyle: { "font-size": "16px", "font-weight": "700", color: "#303133", "margin-bottom": "6px" } }, [t._v(" " + t._s(t.$i18nt("gd.dict.dictManagement", "\u5B57\u5178\u503C\u7BA1\u7406")) + " ")]), a("el-divider", { staticClass: "setting-divider" }), a("gd-tables", { ref: "tableManage", attrs: { dataSource: t.loadData, size: t.tableSize, pageSize: t.tablePageSize, columns: t.tableColumns, selectedRowKeys: t.selectedRowKeys, height: t.height, filtering: !0 }, on: { onChange: t.onSelectChange }, scopedSlots: t._u([{ key: "values", fn: function({ column: r, row: o }) {
-    return [a("gd-tooltip", { attrs: { rowKey: "value", row: o, transKey: `Dynamics.${o.transKey}`, highlight: "" }, on: { click: t.editForm } })];
+    return [a("gd-tooltip", { attrs: { rowKey: "value", row: o, transKey: `Dynamics.${o.transkey}`, highlight: "" }, on: { click: t.editForm } })];
   } }, { key: "stateCodes", fn: function(r) {
     return [a("div", { staticStyle: { cursor: "pointer" }, on: { click: function(o) {
       return o.stopPropagation(), t.editStateCodes(r);
@@ -78343,7 +78389,7 @@ var _sfc_render$4x = function() {
   _sfc_staticRenderFns$4x,
   !1,
   null,
-  "d5fab563",
+  "a97606ac",
   null,
   null
 );
@@ -109865,7 +109911,7 @@ var _sfc_render$2l = function s() {
   null,
   null
 );
-const ViewTree = __component__$2l.exports, edit_vue_vue_type_style_index_0_scoped_eb12b7c2_lang = "", defaultList = [
+const ViewTree = __component__$2l.exports, edit_vue_vue_type_style_index_0_scoped_e0c171a9_lang = "", defaultList = [
   {
     code: 1,
     name: "\u662F",
@@ -109973,6 +110019,9 @@ const ViewTree = __component__$2l.exports, edit_vue_vue_type_style_index_0_scope
     };
   },
   computed: {
+    formatDict() {
+      return this.$options.filters.dictData("time_longshort");
+    },
     title() {
       return this.record ? this.$i18nt("gd.https.edit", "\u7F16\u8F91") : this.$i18nt("gd.https.add", "\u65B0\u589E");
     },
@@ -110044,7 +110093,8 @@ const ViewTree = __component__$2l.exports, edit_vue_vue_type_style_index_0_scope
                   displaymode: u[2] ? u[2] : "none",
                   displayprefix: u[3] ? u[3] : "none",
                   preview: u[4] ? u[4] === "true" : !0,
-                  download: u[5] ? u[5] === "true" : !0
+                  download: u[5] ? u[5] === "true" : !0,
+                  format: u[6] ? u[6] : String(r.fieldformat)
                 }
               );
               t.push(f);
@@ -110075,7 +110125,8 @@ const ViewTree = __component__$2l.exports, edit_vue_vue_type_style_index_0_scope
                     displaymode: h[2] ? h[2] : "none",
                     displayprefix: h[3] ? h[3] : "none",
                     preview: h[4] ? h[4] === "true" : !0,
-                    download: h[5] ? h[5] === "true" : !0
+                    download: h[5] ? h[5] === "true" : !0,
+                    format: h[6] ? h[6] : String(o.fieldformat)
                   }
                 );
                 t.push(p);
@@ -110110,25 +110161,33 @@ const ViewTree = __component__$2l.exports, edit_vue_vue_type_style_index_0_scope
           this.rulesList = s.data.ruleconfig ? JSON.parse(s.data.ruleconfig) : [];
           let t = s.data.sysviewqueries ? s.data.sysviewqueries : [];
           t.forEach((r, o) => {
-            r.options ? t[o].options = typeof r.options == "string" ? JSON.parse(r.options) : r.options : t[o].options = {
-              effectType: "",
-              displayStyle: 0,
-              defaultValue: "",
-              defaultValueList: [],
-              filter: [],
-              hidden: !1,
-              required: !1,
-              defaultInterval: [
-                {
-                  type: "interval",
-                  value: ""
-                },
-                {
-                  type: "equal",
-                  value: ""
-                }
-              ]
-            };
+            if (!r.options)
+              t[o].options = {
+                effectType: "",
+                fieldFormat: "",
+                displayStyle: 0,
+                defaultValue: "",
+                defaultValueList: [],
+                filter: [],
+                hidden: !1,
+                required: !1,
+                defaultInterval: [
+                  {
+                    type: "interval",
+                    value: ""
+                  },
+                  {
+                    type: "equal",
+                    value: ""
+                  }
+                ]
+              };
+            else {
+              const l = typeof r.options == "string" ? JSON.parse(r.options) : r.options;
+              t[o].options = Object.assign(l, {
+                fieldFormat: l.fieldFormat !== void 0 ? l.fieldFormat : "2"
+              });
+            }
           }), this.lodaData = Object.assign(s.data, {
             sysviewqueries: [...t]
           }), this.filterList = s.data.filterconfig ? JSON.parse(s.data.filterconfig) : JSON.parse(JSON.stringify(this.plugFilters));
@@ -110232,7 +110291,7 @@ const ViewTree = __component__$2l.exports, edit_vue_vue_type_style_index_0_scope
     add() {
       let s = [], t = [], a = [];
       this.list.forEach((u, f) => {
-        let h = String(u.id).split("-"), p = `${u.align}&${u.visible ? 1 : 0}&${u.displaymode}&${u.displayprefix}&${u.preview}&${u.download}`, v = {
+        let h = String(u.id).split("-"), p = `${u.align}&${u.visible ? 1 : 0}&${u.displaymode}&${u.displayprefix}&${u.preview}&${u.download}&${u.format}`, v = {
           name: u.alias == "" ? u.columncomment : u.alias,
           width: u.num,
           order: f,
@@ -110296,7 +110355,7 @@ const ViewTree = __component__$2l.exports, edit_vue_vue_type_style_index_0_scope
     edit(s = 1) {
       let t = [], a = [], r = [];
       this.list.forEach((f, h) => {
-        let p = String(f.id).split("-"), v = `${f.align}&${f.visible ? 1 : 0}&${f.displaymode}&${f.displayprefix}&${f.preview}&${f.download}`;
+        let p = String(f.id).split("-"), v = `${f.align}&${f.visible ? 1 : 0}&${f.displaymode}&${f.displayprefix}&${f.preview}&${f.download}&${f.format}`;
         if (this.isChecked(f.id, this.lodaData.sysviewfields)) {
           let g = {
             id: 0,
@@ -110484,7 +110543,7 @@ var _sfc_render$2k = function s() {
   _sfc_staticRenderFns$2k,
   !1,
   null,
-  "eb12b7c2",
+  "e0c171a9",
   null,
   null
 );
@@ -114128,11 +114187,11 @@ var _sfc_render$21 = function s() {
 );
 const titleVlaue = __component__$21.exports;
 function getColumns(s, t, a) {
-  var h, p, v, g;
+  var p, v, g, y;
   if (!s.syscodegenconfig && !s.syscodegenconfigfk)
     return console.log("\u5B57\u6BB5:" + s.name + "\u6570\u636E\u9519\u8BEF!"), null;
-  const r = ["fk", "user"].includes(s.syscodegenconfig.effecttype) ? (h = s.syscodegenconfigfk) == null ? void 0 : h.effecttype : s.syscodegenconfig.effecttype, o = s.syscodegenconfig.effecttype, l = getColumnName(s).toLowerCase(), d = s.align ? s.align.split("&") : [], u = getScopedSlots(o, l, s);
-  let f = {
+  const r = ["fk", "user"].includes(s.syscodegenconfig.effecttype) ? (p = s.syscodegenconfigfk) == null ? void 0 : p.effecttype : s.syscodegenconfig.effecttype, o = s.syscodegenconfig.effecttype, l = getColumnName(s).toLowerCase(), d = s.align ? s.align.split("&") : [], u = getScopedSlots(o, l, s), f = ["fk", "user"].includes(o) ? (v = s.syscodegenconfigfk) == null ? void 0 : v.fieldformat : s.syscodegenconfig.fieldformat;
+  let h = {
     key: l,
     transKey: `Dynamics.${s.transkey}`,
     prop: l,
@@ -114142,14 +114201,14 @@ function getColumns(s, t, a) {
     columnName: s.syscodegenconfig.columnname,
     fkEntityName: s.syscodegenconfig.fkentityname,
     id: s.fieldid,
-    fkId: ["fk", "about", "user"].includes(o) ? (p = s.syscodegenconfigfk) == null ? void 0 : p.id : null,
+    fkId: ["fk", "about", "user"].includes(o) ? (g = s.syscodegenconfigfk) == null ? void 0 : g.id : null,
     align: d[0] ? d[0] : "center",
     checked: d[1] ? d[1] == 1 : !0,
     effectType: r,
     fieldType: o,
     gatherConfig: s.gatherconfig == 1,
-    fieldFormat: ["fk", "user"].includes(o) ? (v = s.syscodegenconfigfk) == null ? void 0 : v.fieldformat : s.syscodegenconfig.fieldformat,
-    dictTypeCode: ["fk", "user"].includes(o) ? (g = s.syscodegenconfigfk) == null ? void 0 : g.dicttypecode : s.syscodegenconfig.dicttypecode,
+    fieldFormat: d[6] ? d[6] : f,
+    dictTypeCode: ["fk", "user"].includes(o) ? (y = s.syscodegenconfigfk) == null ? void 0 : y.dicttypecode : s.syscodegenconfig.dicttypecode,
     dictTypeList: [],
     maxTagCount: s.maxtagcount ? Number(s.maxtagcount) : 2,
     sourceFk: !!["fk", "about", "user"].includes(o),
@@ -114158,13 +114217,13 @@ function getColumns(s, t, a) {
     preview: d[4] ? d[4] === "true" : !0,
     download: d[5] ? d[5] === "true" : !0
   };
-  return s.orderconfig === 1 && Object.assign(f, {
+  return s.orderconfig === 1 && Object.assign(h, {
     sortable: "custom"
-  }), t < a && Object.assign(f, {
+  }), t < a && Object.assign(h, {
     fixed: "left"
-  }), ["participants"].includes(o) && Object.assign(f, {
+  }), ["participants"].includes(o) && Object.assign(h, {
     showTooltip: !1
-  }), Object.assign(f, u);
+  }), Object.assign(h, u);
 }
 function getColumnName(s) {
   const t = s.syscodegenconfigfk ? s.syscodegenconfigfk.columnname : "";
@@ -114197,9 +114256,11 @@ function getQueries(s, t, a) {
     message: a,
     trigger: "blur"
   };
-  return ["inputnumber", "double", "	currency"].includes(s.syscodegenconfig.effecttype) && Object.assign(o, {
+  ["inputnumber", "double", "	currency"].includes(s.syscodegenconfig.effecttype) && Object.assign(o, {
     type: "number"
-  }), {
+  });
+  const l = r.fieldFormat === void 0 ? "2" : r.fieldFormat, d = t.filter((f) => f.code == l)[0];
+  return {
     id: s.syscodegenconfig.id,
     transKey: `Dynamics.${s.syscodegenconfig.transkey}`,
     prop: s.syscodegenconfig.columnname,
@@ -114208,15 +114269,28 @@ function getQueries(s, t, a) {
     dictTypeCode: s.syscodegenconfig.dicttypecode,
     fkEntityName: s.syscodegenconfig.fkentityname,
     disabled: s.disabled === void 0 ? !1 : s.disabled,
-    options: r,
+    options: Object.assign(r, {
+      fieldFormat: l
+    }),
     fieldFormat: s.syscodegenconfig.fieldformat,
-    valueFormat: getFieldFormat(s.syscodegenconfig.fieldformat, t),
+    valueFormat: getFieldFormat(l, t),
     rules: [o],
     hasFiltered: !1,
     filterList: [],
-    fkData: []
+    fkData: [],
+    hasTimePicker: hasTimePicker(d),
+    pickerType: pickerType(d)
   };
 }
+function hasTimePicker(s) {
+  const t = s ? s.name : "yyyy-MM-dd";
+  return ["hh:mm:ss", "hh:mm", "mm:ss"].includes(t);
+}
+function pickerType(s) {
+  const t = s ? s.name : "yyyy-MM-dd";
+  let a = "date";
+  return t === "yyyy-MM-dd hh:mm:ss" ? a = "datetime" : t === "yyyy-MM" ? a = "month" : t === "yyyy" && (a = "year"), a;
+}
 function getFieldFormat(s, t) {
   if (s === null)
     return s;
@@ -114227,20 +114301,44 @@ function getEffectType(s) {
   let t = s;
   return ["image", "file"].includes(s) ? t = "input" : ["select", "radio", "switch", "checkbox"].includes(s) ? t = "selectMultiple" : ["fk", "about", "participants", "user"].includes(s) && (t = "selectFkMultiple"), t;
 }
-function switchingDate(s, t) {
-  let a = /* @__PURE__ */ new Map();
-  for (var r in s) {
-    let o = s[r] != null && s[r] !== void 0 ? s[r] : "", l = t ? t.filter((u) => u.columnname === r)[0] : null;
-    if ((l ? l.effecttype : "input") === "datepicker") {
-      let u = dateProcessing(o, l);
-      u && (a.set(r + "Start", u[0]), a.set(r + "End", u[1]));
+function switchingDate(s, t, a, r) {
+  let o = /* @__PURE__ */ new Map();
+  for (var l in s) {
+    let d = s[l] != null && s[l] !== void 0 ? s[l] : "", u = t ? t.filter((h) => h.columnname === l)[0] : null;
+    if ((u ? u.effecttype : "input") === "datepicker") {
+      let h = dateProcessing(d, u, a, r);
+      h && (o.set(l + "Start", h[0]), o.set(l + "End", h[1]));
     } else
-      Array.isArray(o) ? o.length > 0 && a.set(r, o.join(",")) : !o == "" && a.set(r, o);
+      Array.isArray(d) ? d.length > 0 && o.set(l, d.join(",")) : !d == "" && o.set(l, d);
   }
-  return a.size == 0 ? {} : Object.fromEntries(a);
+  return o.size == 0 ? {} : Object.fromEntries(o);
 }
-function dateProcessing(s, t) {
-  return s === "" ? !1 : typeof s == "array" || typeof s == "object" ? s[1] ? [s[0].split(" ")[0] + " 00:00:00", s[1].split(" ")[0] + " 23:59:59"] : !1 : t.fieldFormat == 1 ? [s, s] : [s + " 00:00:00", s + " 23:59:59"];
+function dateProcessing(s, t, a, r) {
+  if (s === "")
+    return !1;
+  if (typeof s == "array" || typeof s == "object")
+    return s[1] ? [s[0].split(" ")[0] + " 00:00:00", s[1].split(" ")[0] + " 23:59:59"] : !1;
+  console.log(a);
+  const o = a.filter((d) => d.prop === t.columnname)[0];
+  if (!o)
+    return !1;
+  const l = r.filter((d) => d.code == o.options.fieldFormat)[0];
+  if (l.name === "yyyy-MM-dd hh:mm:ss")
+    return [s, s];
+  if (l.name === "yyyy-MM-dd")
+    return [`${s} 00:00:00`, `${s} 23:59:59`];
+  if (l.name === "yyyy-MM") {
+    const d = endDayTime(s);
+    return [`${s}-01 00:00:00`, `${s}-${d} 23:59:59`];
+  } else {
+    if (l.name === "yyyy")
+      return [`${s}-01-01 00:00:00`, `${s}-12-31 23:59:59`];
+    if (l.name === "MM-dd") {
+      const d = new Date().getFullYear();
+      return [`${d}${s} 00:00:00`, `${d}${s} 23:59:59`];
+    } else
+      return [s, s];
+  }
 }
 function hasDefaultVal(s) {
   let t = /* @__PURE__ */ new Map(), a = getDatepickerVal(s);
@@ -114271,6 +114369,10 @@ function getFormatTime(s) {
 function formatNumber(s) {
   return s = s.toString(), s[1] ? s : "0" + s;
 }
+function endDayTime(s) {
+  const t = s.split("-");
+  return new Date(t[0], t[1], 0).getDate();
+}
 const sysOverallFun = [
   {
     name: "\u65B0\u589E",
@@ -114306,7 +114408,7 @@ const sysOverallFun = [
     transKey: "gd.settings.custom",
     type: ["view", "form"]
   }
-], unifiedComponents_vue_vue_type_style_index_0_scoped_79476d37_lang = "", _sfc_main$20 = {
+], unifiedComponents_vue_vue_type_style_index_0_scoped_3a7a69b0_lang = "", _sfc_main$20 = {
   props: {
     record: {
       type: Object,
@@ -114437,7 +114539,7 @@ const sysOverallFun = [
         }, 0);
       });
     },
-    queriesRefresh(s) {
+    queriesRefresh(s, t) {
       Object.assign(this.btnItems, {
         queryParam: { ...s }
       }), this.btnItems.formMode === "systemsMethod" && this.btnItems.callbackComponents && this.btnItems.callbackFunction && this.record.doEvent && this.record.doEvent(
@@ -114445,7 +114547,8 @@ const sysOverallFun = [
           key: this.btnItems.callbackComponents,
           functionName: this.btnItems.callbackFunction,
           data: s,
-          id: this.ids
+          id: this.ids,
+          tableQueries: t
         },
         "callback"
       );
@@ -114541,7 +114644,7 @@ const sysOverallFun = [
         }
         if (this.record.doEvent) {
           const t = s.columnContextName ? s.columnContextName : [], a = t[t.length - 1], r = this.itemData[a];
-          this.record.doEvent({ key: s.componentKey, functionName: s.componentFunction, data: r });
+          this.record.doEvent({ key: s.componentKey, functionName: s.componentFunction, data: r, id: this.ids });
         }
       }
     }
@@ -114558,7 +114661,7 @@ var _sfc_render$20 = function s() {
   _sfc_staticRenderFns$20,
   !1,
   null,
-  "79476d37",
+  "3a7a69b0",
   null,
   null
 );
@@ -118673,7 +118776,7 @@ const echartsView = __component__$1B.exports, componentArray = {
   uploadImg,
   echarts: echartsView,
   inputNumber: moneyNumber
-}, layoutItem_vue_vue_type_style_index_0_scoped_2373343d_lang = "", _sfc_main$1A = {
+}, layoutItem_vue_vue_type_style_index_0_scoped_2f14ed7f_lang = "", _sfc_main$1A = {
   props: {
     record: {
       type: Object,
@@ -118730,6 +118833,10 @@ const echartsView = __component__$1B.exports, componentArray = {
     };
   },
   computed: {
+    pickerType() {
+      let s = "date";
+      return this.fieldFormat === "yyyy-MM-dd hh:mm:ss" ? s = "datetime" : this.fieldFormat === "yyyy-MM" ? s = "month" : this.fieldFormat === "yyyy" && (s = "year"), s;
+    },
     columnName() {
       return this.options.columnName ? this.options.columnName.toLowerCase() : this.options.columnName;
     },
@@ -118946,7 +119053,7 @@ var _sfc_render$1A = function s() {
     return a("el-option", { key: r.code, attrs: { label: t.$i18nt(`Dynamics.${r.transkey}`, r.name), value: r.code, disabled: r.disabled } }, [a("span", [t._v(t._s(t.$i18nt(`Dynamics.${r.transkey}`, r.name)))])]);
   }), 1) : t.record.type === "timePicker" ? a("el-time-picker", { style: t.wstyle, attrs: { disabled: t.options.disabled, "value-format": t.fieldFormat, format: t.fieldFormat, placeholder: t.options.placeholder !== void 0 ? t.options.placeholder === "" ? t.options.placeholder : t.$i18nt(`Dynamics.${t.options.placeholderTransKey}`, t.options.placeholder) : t.$i18nt("gd.placeholder.select", "\u8BF7\u9009\u62E9") }, on: { change: t.handleChange }, model: { value: t.model[t.columnName], callback: function(r) {
     t.$set(t.model, t.columnName, r);
-  }, expression: "model[columnName]" } }) : t.record.type === "datePicker" ? a("el-date-picker", { style: t.wstyle, attrs: { disabled: t.options.disabled, type: t.options.showTime == !0 ? "datetime" : t.options.format == "4" ? "month" : "date", "value-format": t.fieldFormat, format: t.fieldFormat, placeholder: t.options.placeholder !== void 0 ? t.options.placeholder === "" ? t.options.placeholder : t.$i18nt(`Dynamics.${t.options.placeholderTransKey}`, t.options.placeholder) : t.$i18nt("gd.placeholder.select", "\u8BF7\u9009\u62E9") }, on: { change: t.handleChange }, model: { value: t.model[t.columnName], callback: function(r) {
+  }, expression: "model[columnName]" } }) : t.record.type === "datePicker" ? a("el-date-picker", { style: t.wstyle, attrs: { disabled: t.options.disabled, type: t.pickerType, "value-format": t.fieldFormat, format: t.fieldFormat, placeholder: t.options.placeholder !== void 0 ? t.options.placeholder === "" ? t.options.placeholder : t.$i18nt(`Dynamics.${t.options.placeholderTransKey}`, t.options.placeholder) : t.$i18nt("gd.placeholder.select", "\u8BF7\u9009\u62E9") }, on: { change: t.handleChange }, model: { value: t.model[t.columnName], callback: function(r) {
     t.$set(t.model, t.columnName, r);
   }, expression: "model[columnName]" } }) : t.record.type === "uploadImg" ? a(t.componentItem, { ref: "uploadImg", tag: "component", attrs: { record: t.record, develop: t.develop, model: t.model, limit: t.options.limit, disabled: t.options.disabled, prop: t.columnName, fieldContext: t.fieldContext }, on: { change: t.handleChange } }) : t.record.type === "uploadFile" ? a(t.componentItem, { ref: "uploadFile", tag: "component", attrs: { record: t.record, develop: t.develop, model: t.model, limit: t.options.limit, prop: t.columnName, disabled: t.options.disabled, fieldContext: t.fieldContext }, on: { change: t.handleChange } }) : a("el-input", { style: t.wstyle, attrs: { placeholder: t.options.placeholder !== void 0 ? t.options.placeholder === "" ? t.options.placeholder : t.$i18nt(`Dynamics.${t.options.placeholderTransKey}`, t.options.placeholder) : t.$i18nt("gd.placeholder.input", "\u8BF7\u8F93\u5165"), clearable: t.options.clearable, disabled: t.options.disabled, type: t.options.type }, on: { change: t.handleChange }, model: { value: t.model[t.columnName], callback: function(r) {
     t.$set(t.model, t.columnName, r);
@@ -118957,7 +119064,7 @@ var _sfc_render$1A = function s() {
   _sfc_staticRenderFns$1A,
   !1,
   null,
-  "2373343d",
+  "2f14ed7f",
   null,
   null
 );
@@ -119255,7 +119362,7 @@ var _sfc_render$1w = function s() {
   null,
   null
 );
-const FlexLayout = __component__$1w.exports, dataList_vue_vue_type_style_index_0_scoped_10988061_lang = "", _sfc_main$1v = {
+const FlexLayout = __component__$1w.exports, dataList_vue_vue_type_style_index_0_scoped_5d2c11eb_lang = "", _sfc_main$1v = {
   props: {
     record: {
       type: Object,
@@ -119285,7 +119392,8 @@ const FlexLayout = __component__$1w.exports, dataList_vue_vue_type_style_index_0
       list: [],
       totalRows: 0,
       loading: !1,
-      statu: !1
+      statu: !1,
+      tableQueries: []
     };
   },
   watch: {
@@ -119385,13 +119493,14 @@ const FlexLayout = __component__$1w.exports, dataList_vue_vue_type_style_index_0
       return s || 10;
     },
     moreTitle() {
-      let s = "\u6B63\u5728\u52A0\u8F7D\u4E2D...";
-      return this.loading || (s = this.list.length >= this.totalRows ? this.pageNo > 1 ? "\u6682\u65E0\u66F4\u591A\u6570\u636E" : "" : "\u70B9\u51FB\u52A0\u8F7D\u66F4\u591A"), s;
+      let s = this.$i18nt("gd.https.Loading", "\u52A0\u8F7D\u4E2D...");
+      return this.loading || (s = this.list.length >= this.totalRows ? this.pageNo > 1 ? this.$i18nt("gd.https.noMoreData", "\u6682\u65E0\u66F4\u591A\u6570\u636E") : "" : this.$i18nt("gd.https.loadMoreData", "\u70B9\u51FB\u52A0\u8F7D\u66F4\u591A")), s;
     },
     ...mapGetters(["tableLists", "tablePageSize"])
   },
   methods: {
     executeEvent(s) {
+      this.tableQueries = s && s.tableQueries ? s.tableQueries : [];
       const t = s.functionName ? s.functionName : "";
       t && this[t] !== void 0 ? this[t](s.data) : console.log("\u6267\u884C\u9519\u8BEF");
     },
@@ -119446,13 +119555,13 @@ const FlexLayout = __component__$1w.exports, dataList_vue_vue_type_style_index_0
           viewId: this.options.view.id,
           viewType: 1
         },
-        switchingDate(this.queryParam, this.fieldData)
+        switchingDate(this.queryParam, this.fieldData, this.tableQueries, this.getDictionary("time_longshort"))
       );
       this.relationData.length > 0 && Object.assign(t, { relation: this.relationData }), this.foreignContextName.length > 0 && Object.assign(t, { fkValue: this.itemData.id, fkName: this.foreignContextName[0] }), basePage(t).then((a) => {
         if (a.code === 200) {
           let r = a.data.rows.map((o) => {
             let l = /* @__PURE__ */ new Map();
-            return l.set(this.ids, o.id), Object.assign(o, Object.fromEntries(l)), o;
+            return l.set(this.ids, o.id), Object.assign(o, Object.fromEntries(l), this.tableQueries, this.getDictionary("time_longshort")), o;
           });
           this.list = s || this.pageNo === 1 ? r : this.list.concat(r), this.totalRows = a.data.totalrows, this.statu = this.totalRows === 0;
         }
@@ -119512,6 +119621,9 @@ const FlexLayout = __component__$1w.exports, dataList_vue_vue_type_style_index_0
       this.record.executeEvent = t.concat([
         { id: this.executeIds, executeEvent: this.executeEvent, ids: this.ids, parentId: this.itemData.id }
       ]);
+    },
+    getDictionary(s) {
+      return this.$options.filters.dictData(s);
     }
   },
   mounted() {
@@ -119529,7 +119641,7 @@ var _sfc_render$1v = function s() {
   _sfc_staticRenderFns$1v,
   !1,
   null,
-  "10988061",
+  "5d2c11eb",
   null,
   null
 );
@@ -119695,7 +119807,7 @@ var _sfc_render$1t = function s() {
   null,
   null
 );
-const drawerPanel = __component__$1t.exports, layoutItem_vue_vue_type_style_index_0_scoped_4dd8ac32_lang = "", _sfc_main$1s = {
+const drawerPanel = __component__$1t.exports, layoutItem_vue_vue_type_style_index_0_scoped_47b23d32_lang = "", _sfc_main$1s = {
   name: "layoutItem",
   props: {
     record: {
@@ -119785,7 +119897,7 @@ var _sfc_render$1s = function s() {
   } } }, [a("el-tabs", { staticClass: "mtabs-box-row", attrs: { type: t.options.type === "none" ? void 0 : t.options.type, "tab-position": t.options.tabPosition }, model: { value: t.options.activeKey, callback: function(r) {
     t.$set(t.options, "activeKey", r);
   }, expression: "options.activeKey" } }, t._l(t.record.columns, function(r, o) {
-    return a("el-tab-pane", { key: r.key + o, attrs: { label: t.$i18nt(`${r.transKey}`, r.label), name: r.key } }, [a("div", { staticClass: "grid-col" }, [a("draggable", t._b({ staticClass: "draggable-box", attrs: { tag: "div", disabled: t.disabled }, on: { start: function(l) {
+    return a("el-tab-pane", { key: r.key + o, attrs: { label: t.$i18nt(`Dynamics.${r.transKey}`, r.label), name: r.key } }, [a("div", { staticClass: "grid-col" }, [a("draggable", t._b({ staticClass: "draggable-box", attrs: { tag: "div", disabled: t.disabled }, on: { start: function(l) {
       return t.$emit("dragStart", l, r.list);
     }, add: function(l) {
       return t.$emit("handleColAdd", l, r.list);
@@ -120128,7 +120240,7 @@ var _sfc_render$1s = function s() {
   _sfc_staticRenderFns$1s,
   !1,
   null,
-  "4dd8ac32",
+  "47b23d32",
   null,
   null
 );
@@ -123735,7 +123847,7 @@ var _sfc_render$14 = function s() {
   null,
   null
 );
-const propertiesTress = __component__$14.exports, propertiesInterac_vue_vue_type_style_index_0_scoped_2b48e65e_lang = "", _sfc_main$13 = {
+const propertiesTress = __component__$14.exports, propertiesInterac_vue_vue_type_style_index_0_scoped_d372ac0d_lang = "", _sfc_main$13 = {
   props: {
     selectItem: {
       type: Object,
@@ -123789,6 +123901,7 @@ const propertiesTress = __component__$14.exports, propertiesInterac_vue_vue_type
   },
   methods: {
     changeSysMethod(s) {
+      this.interac.tableComponents = "";
       const t = this.tableLists.filter((a) => a.tablename === s)[0];
       sysViewList$1({ sysCodeGenId: t.id }).then((a) => {
         if (a.code === 200) {
@@ -123880,11 +123993,11 @@ var _sfc_render$13 = function s() {
   _sfc_staticRenderFns$13,
   !1,
   null,
-  "2b48e65e",
+  "d372ac0d",
   null,
   null
 );
-const propertiesInterac = __component__$13.exports, properties_vue_vue_type_style_index_0_scoped_486d04a5_lang = "", _sfc_main$12 = {
+const propertiesInterac = __component__$13.exports, properties_vue_vue_type_style_index_0_scoped_339270d3_lang = "", _sfc_main$12 = {
   props: {
     selectItem: {
       type: Object,
@@ -123930,6 +124043,21 @@ const propertiesInterac = __component__$13.exports, properties_vue_vue_type_styl
     }
   },
   computed: {
+    pickerType() {
+      const s = this.getTimeData.filter((r) => r.code === this.options.format)[0], t = s ? s.name : "yyyy-MM-dd";
+      let a = "date";
+      return t === "yyyy-MM-dd hh:mm:ss" ? a = "datetime" : t === "yyyy-MM" ? a = "month" : t === "yyyy" && (a = "year"), a;
+    },
+    formatDict() {
+      return this.$options.filters.dictData("time_longshort");
+    },
+    getTimeData() {
+      const t = [
+        { type: "datePicker", list: ["yyyy-MM-dd hh:mm:ss", "yyyy-MM-dd", "yyyy-MM", "yyyy", "MM-dd"] },
+        { type: "timePicker", list: ["hh:mm:ss", "hh:mm", "mm:ss"] }
+      ].filter((r) => r.type === this.selectItem.type)[0], a = t ? t.list : [];
+      return this.formatDict.filter((r) => a.includes(r.name));
+    },
     languageMessages() {
       return this.$i18n.messages;
     },
@@ -124020,9 +124148,6 @@ const propertiesInterac = __component__$13.exports, properties_vue_vue_type_styl
       const t = this.$options.filters.dictData("time_longshort").filter((a) => String(a.code) === String(this.options.format))[0];
       return t ? t.name.replace("DD", "dd") : "yyyy-MM-dd hh:mm:ss";
     },
-    formatDict() {
-      return this.$options.filters.dictData("time_longshort");
-    },
     dict() {
       return this.getDictionary(this.options.dictTypeCode);
     },
@@ -124058,6 +124183,14 @@ const propertiesInterac = __component__$13.exports, properties_vue_vue_type_styl
     propertiesInterac
   },
   methods: {
+    changeFormat() {
+      this.options.defaultValue = "";
+    },
+    changeType() {
+      if (!["timePicker", "datePicker"].includes(this.selectItem.type))
+        return;
+      this.getTimeData.filter((t) => t.code === this.options.format)[0] || (this.options.format = this.getTimeData[0].code);
+    },
     initTranskey(s, t) {
       t !== void 0 && s.key !== t.key && (this.$refs.gdTranslation && this.$refs.gdTranslation.againInit(), this.$refs.gdTranslations && this.$refs.gdTranslations.againInit());
     },
@@ -124197,7 +124330,7 @@ var _sfc_render$12 = function s() {
     t.$set(t.options, "columnName", r);
   }, expression: "options.columnName" } })], 1) : t._e(), t.getTypeof("placeholder") ? a("el-form-item", { attrs: { label: t.$i18nt("gd.page.placeholder", "\u5360\u4F4D\u7B26") } }, [a("el-input", { attrs: { placeholder: t.$i18nt("gd.placeholder.input", "\u8BF7\u8F93\u5165") }, model: { value: t.options.placeholder, callback: function(r) {
     t.$set(t.options, "placeholder", r);
-  }, expression: "options.placeholder" } })], 1) : t._e(), t.isFormItem && t.getTypeof("initialType") && t.options.initialType.length > 0 ? a("el-form-item", { attrs: { label: t.$i18nt("gd.page.typeAction", "\u4F5C\u7528\u7C7B\u578B") } }, [a("el-select", { model: { value: t.selectItem.type, callback: function(r) {
+  }, expression: "options.placeholder" } })], 1) : t._e(), t.isFormItem && t.getTypeof("initialType") && t.options.initialType.length > 0 ? a("el-form-item", { attrs: { label: t.$i18nt("gd.page.typeAction", "\u4F5C\u7528\u7C7B\u578B") } }, [a("el-select", { on: { change: t.changeType }, model: { value: t.selectItem.type, callback: function(r) {
     t.$set(t.selectItem, "type", r);
   }, expression: "selectItem.type" } }, t._l(t.inputComponentList, function(r) {
     return a("el-option", { key: r.type, attrs: { label: r.label, value: r.type } }, [a("span", [t._v(t._s(r.label))])]);
@@ -124239,9 +124372,9 @@ var _sfc_render$12 = function s() {
     t.$set(t.options, "displayMode", r);
   }, expression: "options.displayMode" } }, t._l(t.displayModeDict, function(r) {
     return a("el-option", { key: r.code, attrs: { label: t.$i18nt(`Dynamics.${r.transkey}`, r.name), value: r.code } });
-  }), 1)], 1) : t._e(), t.isFormItem && t.getTypeof("format") ? a("el-form-item", { attrs: { label: t.$i18nt("gd.page.displayFormat", "\u663E\u793A\u683C\u5F0F") } }, [a("el-select", { model: { value: t.options.format, callback: function(r) {
+  }), 1)], 1) : t._e(), t.isFormItem && t.getTypeof("format") ? a("el-form-item", { attrs: { label: t.$i18nt("gd.page.displayFormat", "\u663E\u793A\u683C\u5F0F") } }, [a("el-select", { on: { change: t.changeFormat }, model: { value: t.options.format, callback: function(r) {
     t.$set(t.options, "format", r);
-  }, expression: "options.format" } }, t._l(t.formatDict, function(r) {
+  }, expression: "options.format" } }, t._l(t.getTimeData, function(r) {
     return a("el-option", { key: r.code, attrs: { label: t.$i18nt(`Dynamics.${r.transkey}`, r.name), value: r.code } }, [a("span", [t._v(t._s(t.$i18nt(`Dynamics.${r.transkey}`, r.name)))])]);
   }), 1)], 1) : t._e(), t.getTypeof("disableDictMode") && t.getEffectType ? a("el-form-item", { attrs: { label: t.$i18nt("gd.page.disableMode", "\u8FC7\u6EE4\u65B9\u5F0F") } }, [a("el-select", { model: { value: t.options.disableDictMode, callback: function(r) {
     t.$set(t.options, "disableDictMode", r);
@@ -124261,7 +124394,7 @@ var _sfc_render$12 = function s() {
     return a("el-option", { key: r.code, attrs: { label: t.$i18nt(`Dynamics.${r.transkey}`, r.name), value: r.code } }, [a("span", [t._v(t._s(t.$i18nt(`Dynamics.${r.transkey}`, r.name)))])]);
   }) : [a("el-option", { attrs: { label: "\u9009\u98791", value: "\u9009\u98791" } }), a("el-option", { attrs: { label: "\u9009\u98792", value: "\u9009\u98792" } })]], 2) : t.selectItem.type === "timePicker" ? a("el-time-picker", { attrs: { "value-format": t.fieldFormat, format: t.fieldFormat, placeholder: t.$i18nt("gd.placeholder.select", "\u8BF7\u9009\u62E9") }, model: { value: t.options.defaultValue, callback: function(r) {
     t.$set(t.options, "defaultValue", r);
-  }, expression: "options.defaultValue" } }) : t.selectItem.type === "datePicker" ? a("el-date-picker", { attrs: { type: t.options.showTime == !0 ? "datetime" : t.options.format == "4" ? "month" : "date", "value-format": t.fieldFormat, format: t.fieldFormat, placeholder: t.$i18nt("gd.placeholder.select", "\u8BF7\u9009\u62E9") }, model: { value: t.options.defaultValue, callback: function(r) {
+  }, expression: "options.defaultValue" } }) : t.selectItem.type === "datePicker" ? a("el-date-picker", { attrs: { type: t.pickerType, "value-format": t.fieldFormat, format: t.fieldFormat, placeholder: t.$i18nt("gd.placeholder.select", "\u8BF7\u9009\u62E9") }, model: { value: t.options.defaultValue, callback: function(r) {
     t.$set(t.options, "defaultValue", r);
   }, expression: "options.defaultValue" } }) : t.selectItem.type === "inputNumber" ? a("el-input-number", { staticStyle: { width: "100%" }, attrs: { "controls-position": "right", min: t.options.min || t.options.min === 0 ? t.options.min : -1 / 0, max: t.options.max || t.options.max === 0 ? t.options.max : 1 / 0, step: t.options.step, precision: t.options.precision, placeholder: t.$i18nt("gd.placeholder.input", "\u8BF7\u8F93\u5165") }, model: { value: t.options.defaultValue, callback: function(r) {
     t.$set(t.options, "defaultValue", r);
@@ -124275,9 +124408,7 @@ var _sfc_render$12 = function s() {
     t.$set(t.options, "disabled", r);
   }, expression: "options.disabled" } }) : t._e(), t.getTypeof("bringTo") ? a("pCheckbox", { attrs: { label: t.$i18nt("gd.page.bringTo", "\u53EF\u63D0\u4EA4") }, model: { value: t.options.bringTo, callback: function(r) {
     t.$set(t.options, "bringTo", r);
-  }, expression: "options.bringTo" } }) : t._e(), t.getTypeof("showTime") ? a("pCheckbox", { attrs: { label: t.$i18nt("gd.page.timeSelector", "\u65F6\u95F4\u9009\u62E9\u5668") }, model: { value: t.options.showTime, callback: function(r) {
-    t.$set(t.options, "showTime", r);
-  }, expression: "options.showTime" } }) : t._e(), t.getTypeof("drag") ? a("pCheckbox", { attrs: { label: t.$i18nt("gd.page.allowDragging", "\u5141\u8BB8\u62D6\u62FD") }, model: { value: t.options.drag, callback: function(r) {
+  }, expression: "options.bringTo" } }) : t._e(), t.getTypeof("drag") ? a("pCheckbox", { attrs: { label: t.$i18nt("gd.page.allowDragging", "\u5141\u8BB8\u62D6\u62FD") }, model: { value: t.options.drag, callback: function(r) {
     t.$set(t.options, "drag", r);
   }, expression: "options.drag" } }) : t._e(), t.getTypeof("download") ? a("pCheckbox", { attrs: { label: t.$i18nt("gd.page.download", "\u4E0B\u8F7D") }, model: { value: t.options.download, callback: function(r) {
     t.$set(t.options, "download", r);
@@ -124384,7 +124515,7 @@ var _sfc_render$12 = function s() {
   _sfc_staticRenderFns$12,
   !1,
   null,
-  "486d04a5",
+  "339270d3",
   null,
   null
 );
@@ -135799,7 +135930,7 @@ var _sfc_render$s = function s() {
   null,
   null
 );
-const BuildItem = __component__$s.exports, layoutBlocks_vue_vue_type_style_index_0_scoped_b22d8784_lang = "", _sfc_main$r = {
+const BuildItem = __component__$s.exports, layoutBlocks_vue_vue_type_style_index_0_scoped_c3536a19_lang = "", _sfc_main$r = {
   name: "LayoutBlocks",
   props: {
     record: {
@@ -135903,7 +136034,7 @@ var _sfc_render$r = function s() {
     return [a("el-collapse-item", { directives: [{ name: "show", rawName: "v-show", value: r.hidden === void 0 ? !0 : !r.hidden, expression: "colItem.hidden === void 0 ? true : !colItem.hidden" }], key: r.key, staticClass: "grid-col", attrs: { title: r.label, name: r.key } }, [t._l(r.list, function(l) {
       return [a("LayoutBlocks", { attrs: { height: t.height, record: l, isForm: t.isForm, model: t.model, tableData: t.tableData, forceRender: t.forceRender, itemData: t.itemData }, on: { lookup: t.lookup, change: t.handleChange } })];
     })], 2)];
-  })], 2) : t.record.type === "card" ? a("el-card", { staticClass: "grid-row", attrs: { shadow: t.options.shadow } }, [t.options.header ? a("div", { staticClass: "clearfix", attrs: { slot: "header" }, slot: "header" }, [a("span", [t._v(t._s(t.$i18nt(`${t.options.transKey}`, t.options.header)))])]) : t._e(), t._l(t.record.list, function(r) {
+  })], 2) : t.record.type === "card" ? a("el-card", { staticClass: "grid-row", attrs: { shadow: t.options.shadow } }, [t.options.header ? a("div", { staticClass: "clearfix", attrs: { slot: "header" }, slot: "header" }, [a("span", [t._v(t._s(t.$i18nt(`Dynamics.${t.options.transKey}`, t.options.header)))])]) : t._e(), t._l(t.record.list, function(r) {
     return [a("LayoutBlocks", { attrs: { height: t.height, record: r, isForm: t.isForm, model: t.model, tableData: t.tableData, forceRender: t.forceRender, itemData: t.itemData }, on: { lookup: t.lookup, change: t.handleChange } })];
   })], 2) : t.record.type === "form" ? a("el-form", { staticClass: "grid-row", attrs: { inline: t.options.inline, labelPosition: t.options.labelPosition, labelWidth: t.labelWidth, model: t.ruleForm }, nativeOn: { submit: function(r) {
     r.preventDefault();
@@ -135928,7 +136059,7 @@ var _sfc_render$r = function s() {
   _sfc_staticRenderFns$r,
   !1,
   null,
-  "b22d8784",
+  "c3536a19",
   null,
   null
 );
@@ -135991,7 +136122,7 @@ var _sfc_render$q = function s() {
   null,
   null
 );
-const BuildBlocks = __component__$q.exports, main_vue_vue_type_style_index_0_scoped_f1b2ac51_lang = "", _sfc_main$p = {
+const BuildBlocks = __component__$q.exports, main_vue_vue_type_style_index_0_scoped_f541c238_lang = "", _sfc_main$p = {
   name: "GdPageBuild",
   data() {
     return {
@@ -136061,6 +136192,10 @@ const BuildBlocks = __component__$q.exports, main_vue_vue_type_style_index_0_sco
         return;
       }
       const t = this.allElements.filter((a) => a.key === s.key)[0];
+      if (t && t.type === "dataList") {
+        this.doEventDataList(s, t);
+        return;
+      }
       t && t.executeEvent && t.executeEvent(s);
     },
     eventsCall(s) {
@@ -136119,7 +136254,7 @@ var _sfc_render$p = function s() {
   _sfc_staticRenderFns$p,
   !1,
   null,
-  "f1b2ac51",
+  "f541c238",
   null,
   null
 );
@@ -138584,7 +138719,7 @@ const GDpackage$6 = __component__$m.exports;
 GDpackage$6.install = function(s) {
   s.component(GDpackage$6.name, GDpackage$6);
 };
-const main_vue_vue_type_style_index_0_scoped_e142b4f0_lang = "", plugFilters = {
+const main_vue_vue_type_style_index_0_scoped_b5a328d2_lang = "", plugFilters = {
   referencefiled: "",
   referencetable: "",
   checked: !1,
@@ -138770,7 +138905,7 @@ const main_vue_vue_type_style_index_0_scoped_e142b4f0_lang = "", plugFilters = {
             }, l = this.$i18nt(`Dynamics.${a.transkey}`, a.columncomment), d = this.$i18nt(`Dynamics.${r.transkey}`, r.name);
             o.order = r.order, o.num = r.width, o.aliastranskey = r.transkey ? r.transkey : null, o.alias = l === d ? "" : d, o.orderconfig = r.orderconfig == 1, o.columnname = r.field ? r.field.columnname : a.columnname, o.codegenid = r.field ? r.field.codegenid : a.codegenid, o.gatherconfig = r.gatherconfig == 1, o.maxtagcount = r.maxtagcount ? r.maxtagcount : 2, o.fkrelations = `${l} -- ${a.columnname}`, o.transkey = a.transkey, o.operate = "edit", o.aliasold = d;
             let u = r.align ? r.align.split("&") : [];
-            o.align = u[0] ? u[0] : "left", o.visible = u[1] ? u[1] == 1 : !0, o.displaymode = u[2] ? u[2] : "none", o.displayprefix = u[3] ? u[3] : "none", o.preview = u[4] ? u[4] === "true" : !0, o.download = u[5] ? u[5] === "true" : !0, t.push(o);
+            o.align = u[0] ? u[0] : "left", o.visible = u[1] ? u[1] == 1 : !0, o.displaymode = u[2] ? u[2] : "none", o.displayprefix = u[3] ? u[3] : "none", o.preview = u[4] ? u[4] === "true" : !0, o.download = u[5] ? u[5] === "true" : !0, o.format = u[6] ? u[6] : String(a.fieldformat), t.push(o);
           }
         }
         a.children && a.children.length > 0 && a.children.forEach((r) => {
@@ -138782,7 +138917,7 @@ const main_vue_vue_type_style_index_0_scoped_e142b4f0_lang = "", plugFilters = {
               }, d = this.$i18nt(`Dynamics.${a.transkey}`, a.columncomment), u = this.$i18nt(`Dynamics.${r.transkey}`, r.columncomment), f = this.$i18nt(`Dynamics.${o.transkey}`, o.name);
               l.order = o.order, l.num = o.width, l.aliastranskey = o.transkey ? o.transkey : null, l.alias = u === f ? "" : f, l.id = l.id + "-" + a.id, l.orderconfig = o.orderconfig == 1, l.gatherconfig = o.gatherconfig == 1, l.fkrelations = `${d} -- ${a.columnname}`, l.maxtagcount = o.maxtagcount ? o.maxtagcount : 2, l.transkey = r.transkey, l.operate = "edit", l.aliasold = f;
               let h = o.align ? o.align.split("&") : [];
-              l.align = h[0] ? h[0] : "left", l.visible = h[1] ? h[1] == 1 : !0, l.displaymode = h[2] ? h[2] : "none", l.displayprefix = h[3] ? h[3] : "none", l.preview = h[4] ? h[4] === "true" : !0, l.download = h[4] ? h[4] === "true" : !0, t.push(l);
+              l.align = h[0] ? h[0] : "left", l.visible = h[1] ? h[1] == 1 : !0, l.displaymode = h[2] ? h[2] : "none", l.displayprefix = h[3] ? h[3] : "none", l.preview = h[4] ? h[4] === "true" : !0, l.download = h[4] ? h[4] === "true" : !0, l.format = h[6] ? h[6] : String(r.fieldformat), t.push(l);
             }
           }
         });
@@ -138814,7 +138949,7 @@ var _sfc_render$l = function s() {
   _sfc_staticRenderFns$l,
   !1,
   null,
-  "e142b4f0",
+  "b5a328d2",
   null,
   null
 );
@@ -138970,7 +139105,7 @@ var _sfc_render$k = function s() {
   null,
   null
 );
-const ViewCharts = __component__$k.exports, main_vue_vue_type_style_index_0_scoped_8804c40d_lang = "", _sfc_main$j = {
+const ViewCharts = __component__$k.exports, main_vue_vue_type_style_index_0_scoped_695ff113_lang = "", _sfc_main$j = {
   name: "GdViewBuildDesigner",
   props: {
     record: {
@@ -139028,7 +139163,12 @@ const ViewCharts = __component__$k.exports, main_vue_vue_type_style_index_0_scop
       summaryData: {},
       viewRecord: {},
       loadData: (s) => {
-        const t = Object.assign(s, this.queryTable, switchingDate(this.queryParam, this.fieldData), this.foreign);
+        const t = Object.assign(
+          s,
+          this.queryTable,
+          switchingDate(this.queryParam, this.fieldData, this.tableQueries, this.getDictionary("time_longshort")),
+          this.foreign
+        );
         return this.queryCriteria = { ...t }, basePage(t).then((a) => {
           let r = [];
           if (a.code === 200) {
@@ -139935,7 +140075,7 @@ var _sfc_render$j = function s() {
   _sfc_staticRenderFns$j,
   !1,
   null,
-  "8804c40d",
+  "695ff113",
   null,
   null
 );