@opentiny/vue-renderless 3.21.2 → 3.22.0

package/date-range/vue.js

@@ -41,9 +41,10 @@ import {
   computerBtnDisabled,
   computerLabel,
   computerEnableYearArrow,
-  watchPickerVisible
+  watchPickerVisible,
+  watchModelValue
 } from "./index";
-import { nextMonth, extractDateFormat, extractTimeFormat } from "../common/deps/date-util";
+import { nextMonth1, extractDateFormat, extractTimeFormat } from "@opentiny/utils";
 const api = [
   "state",
   "handleShortcutClick",
@@ -67,14 +68,15 @@ const api = [
   "handleMinTimeClose",
   "handleDateChange",
   "handleMaxTimeClose",
-  "isValidValue"
+  "isValidValue",
+  "watchModelValue"
 ];
-const initState = ({ reactive, computed, api: api2, constants, designConfig }) => {
+const initState = ({ reactive, computed, api: api2, constants, designConfig, props }) => {
   var _a;
   const state = reactive({
     popperElm: null,
-    popperClass: "",
-    value: [],
+    popperClass: props.popperClass || "",
+    value: props.modelValue || [],
     defaultValue: null,
     defaultTime: null,
     minDate: "",
@@ -85,18 +87,18 @@ const initState = ({ reactive, computed, api: api2, constants, designConfig }) =
     minRangeDate: constants.startDate,
     maxRangeDate: constants.endDate,
     leftDate: /* @__PURE__ */ new Date(),
-    rightDate: nextMonth(/* @__PURE__ */ new Date()),
+    rightDate: nextMonth1(/* @__PURE__ */ new Date()),
     rangeState: { endDate: null, selecting: false, row: null, column: null },
-    showTime: false,
-    format: "",
+    showTime: props.type === "datetimerange" || false,
+    format: props.format || "",
     arrowControl: false,
-    unlinkPanels: false,
+    unlinkPanels: props.unlinkPanels || false,
     firstDayOfWeek: 7,
     minTimePickerVisible: false,
     maxTimePickerVisible: false,
-    shortcuts: "",
+    shortcuts: props.shortcuts || "",
     visible: "",
-    disabledDate: "",
+    disabledDate: props.disabledDate || null,
     cellClassName: "",
     dateUserInput: { min: null, max: null },
     timeUserInput: { min: null, max: null },
@@ -119,13 +121,14 @@ const initState = ({ reactive, computed, api: api2, constants, designConfig }) =
     enableYearArrow: computed(() => api2.computerEnableYearArrow()),
     // tiny 新增
     confirmButtonProps: __spreadValues({
-      plain: true,
+      plain: false,
       type: "default"
     }, (_a = designConfig == null ? void 0 : designConfig.state) == null ? void 0 : _a.confirmButtonProps)
   });
   return state;
 };
-const initWatch = ({ watch, state, api: api2 }) => {
+const initWatch = ({ watch, state, api: api2, props }) => {
+  watch(() => props.modelValue, api2.watchModelValue, { immediate: true });
   watch(() => state.minDate, api2.watchMinDate);
   watch(() => state.maxDate, api2.watchMaxDate);
   watch(() => state.minTimePickerVisible, api2.watchMinTimePickerVisible);
@@ -135,14 +138,14 @@ const initWatch = ({ watch, state, api: api2 }) => {
   watch(() => state.showTime, api2.setTimeFormat);
   watch(() => state.visible, api2.watchPickerVisible);
 };
-const initApi = ({ api: api2, state, t, vm, nextTick, emit, constants }) => {
+const initApi = ({ api: api2, state, t, vm, nextTick, emit, constants, props }) => {
   Object.assign(api2, {
     t,
     state,
     computerLabel: computerLabel({ state, t }),
     resetView: resetView({ state }),
     watchMaxDate: watchMaxDate({ state, vm }),
-    handleChangeRange: handleChangeRange(state),
+    handleChangeRange: handleChangeRange(state, props),
     handleMaxTimeClose: handleMaxTimeClose(state),
     handleMinTimeClose: handleMinTimeClose(state),
     isValidValue: isValidValue({ state }),
@@ -173,20 +176,21 @@ const initApi = ({ api: api2, state, t, vm, nextTick, emit, constants }) => {
     watchDefault: watchDefault({ state }),
     handleClear: handleClear({ emit, state }),
     setTimeFormat: setTimeFormat({ nextTick, vm, state }),
-    handleConfirm: handleConfirm({ api: api2, emit, state }),
-    handleRangePick: handleRangePick({ api: api2, state, t }),
-    handleShortcutClick: handleShortcutClick(state, api2),
+    handleConfirm: handleConfirm({ api: api2, emit, state, props, t }),
+    handleRangePick: handleRangePick({ api: api2, state, props, t }),
+    handleShortcutClick: handleShortcutClick(state, api2, props),
     computerBtnDisabled: computerBtnDisabled({ state, api: api2 }),
     computerEnableYearArrow: computerEnableYearArrow(state),
-    watchPickerVisible: watchPickerVisible({ state, constants })
+    watchPickerVisible: watchPickerVisible({ state, constants }),
+    watchModelValue: watchModelValue({ state, api: api2 })
   });
 };
 const renderless = (props, { computed, reactive, watch, nextTick }, { t, emit: $emit, vm, constants, designConfig }) => {
   const api2 = {};
   const emit = props.emitter ? props.emitter.emit : $emit;
-  const state = initState({ reactive, computed, api: api2, constants, designConfig });
-  initApi({ api: api2, state, t, vm, nextTick, emit, constants });
-  initWatch({ watch, state, api: api2 });
+  const state = initState({ reactive, computed, api: api2, constants, designConfig, props });
+  initApi({ api: api2, state, t, vm, nextTick, emit, constants, props });
+  initWatch({ watch, state, api: api2, props });
   return api2;
 };
 export {

package/date-table/index.js

@@ -1,15 +1,15 @@
 import "../chunk-G2ADBYYC.js";
-import { formatDate } from "../common/deps/date-util";
 import {
   getFirstDayOfMonth,
   getDayCountOfMonth,
   getWeekNumber,
   prevDate,
   nextDate,
-  isDate,
-  clearTime
-} from "../common/deps/date-util";
-import { DATEPICKER } from "../common";
+  isDate1 as isDate,
+  clearTime,
+  formatDate,
+  DATEPICKER
+} from "@opentiny/utils";
 const formatJudg = ({ day, offset, j, i, cell, count, dateCountOfLastMonth }) => {
   const nodfpm = day + offset <= 0 ? 7 + day + offset : day + offset;
   if (j + i * 7 >= nodfpm) {
@@ -290,6 +290,9 @@ const getTarget = (event) => {
   return target;
 };
 const handleClick = ({ api, emit, props, state }) => (event) => {
+  if (props.readonly) {
+    return;
+  }
   let target = getTarget(event);
   if (target.tagName !== "TD") {
     return;

package/date-table/vue.js

@@ -16,7 +16,7 @@ import {
   getCellRangeClasses,
   getCell
 } from "./index";
-import { getStartDateOfMonth } from "../common/deps/date-util";
+import { getStartDateOfMonth } from "@opentiny/utils";
 const api = ["state", "getCellClasses", "getCssToken", "isWeekActive", "handleMouseMove", "handleClick"];
 const initState = ({ reactive, computed, api: api2, props }) => {
   const state = reactive({

package/dialog-box/index.js

@@ -1,9 +1,9 @@
 import {
   __spreadValues
 } from "../chunk-G2ADBYYC.js";
-import { on, off, addClass, removeClass } from "../common/deps/dom";
-import { emitEvent } from "../common/event";
-import { getDomNode } from "../common/deps/dom";
+import { on, off, addClass, removeClass } from "@opentiny/utils";
+import { emitEvent } from "@opentiny/utils";
+import { getDomNode } from "@opentiny/utils";
 const computedAnimationName = ({ constants, props }) => () => props.rightSlide ? constants.DIALOG_SLIDER_RIGHT : constants.DIALOG_FADE;
 const computedAddUnit = (value) => isNaN(Number(value)) ? value : value + "px";
 const computedStyle = ({ props, state, designConfig }) => () => {

package/dialog-box/vue.js

@@ -22,7 +22,7 @@ import {
   hideScrollbar,
   toggleFullScreen
 } from "./index";
-import usePopup from "../common/deps/vue-popup";
+import { usePopup } from "@opentiny/vue-hooks";
 const api = [
   "afterEnter",
   "afterLeave",

package/dialog-select/vue.js

@@ -125,10 +125,13 @@ const renderless = (props, { reactive, computed, watch }, { vm, nextTick, emit,
   watch(
     () => props.visible,
     (value) => {
-      if (value && !state.multiGridStore.inited) {
-        api2.queryGridData();
-      }
-    }
+      nextTick(() => {
+        if (value && !state.multiGridStore.inited) {
+          api2.queryGridData();
+        }
+      });
+    },
+    { immediate: true }
   );
   watch(
     () => props.multi,

package/drawer/index.js

@@ -1,6 +1,6 @@
 import "../chunk-G2ADBYYC.js";
-import debounce from "../common/deps/debounce";
-import { addClass, removeClass } from "../common/deps/dom";
+import { debounce } from "@opentiny/utils";
+import { addClass, removeClass } from "@opentiny/utils";
 const computedWidth = ({
   state,
   designConfig,

package/drop-times/index.js

@@ -1,5 +1,5 @@
 import "../chunk-G2ADBYYC.js";
-import { format } from "../common/date";
+import { formatDateByPattern as format } from "@opentiny/utils";
 const init = ({ state, props }) => () => {
   let list = [];
   let value;

package/dropdown/index.js

@@ -1,6 +1,6 @@
 import "../chunk-G2ADBYYC.js";
-import { KEY_CODE } from "../common";
-import { addClass, removeClass, on, off } from "../common/deps/dom";
+import { KEY_CODE } from "@opentiny/utils";
+import { addClass, removeClass, on, off } from "@opentiny/utils";
 const watchVisible = ({ broadcast, emit, nextTick }) => (value) => {
   broadcast("TinyDropdownMenu", "visible", value);
   nextTick(() => emit("visible-change", value));
@@ -182,7 +182,13 @@ const handleMainButtonClick = ({ api, emit }) => (event) => {
   emit("button-click", event);
   api.hide();
 };
-const mounted = ({ api, vm, state, broadcast }) => () => {
+const mounted = ({
+  api,
+  vm,
+  state,
+  broadcast,
+  props
+}) => () => {
   if (state.showSelfIcon) {
     state.showIcon = false;
   }
@@ -193,6 +199,8 @@ const mounted = ({ api, vm, state, broadcast }) => () => {
   });
   if (!state.visibleIsBoolean) {
     vm.$on("is-disabled", api.clickOutside);
+  } else if (props.visible) {
+    broadcast("TinyDropdownMenu", "visible", true);
   }
 };
 const beforeDistory = ({ vm, api, state }) => () => {

package/dropdown/vue.js

@@ -1,5 +1,5 @@
 import "../chunk-G2ADBYYC.js";
-import { guid } from "../common/string";
+import { guid } from "@opentiny/utils";
 import {
   watchVisible,
   watchFocusing,
@@ -49,7 +49,7 @@ const renderless = (props, { reactive, watch, provide, onMounted, computed, onBe
     watchFocusing: watchFocusing(parent),
     show: show({ props, state, emit }),
     hide: hide({ api: api2, props, state, emit }),
-    mounted: mounted({ api: api2, vm, state, broadcast }),
+    mounted: mounted({ api: api2, vm, state, broadcast, props }),
     handleClick: handleClick({ api: api2, props, state, emit }),
     handleTriggerKeyDown: handleTriggerKeyDown({ api: api2, state }),
     handleItemKeyDown: handleItemKeyDown({ api: api2, props, state, emit }),

package/dropdown-item/index.js

@@ -1,5 +1,5 @@
 import "../chunk-G2ADBYYC.js";
-import { on, off } from "../common/deps/dom";
+import { on, off } from "@opentiny/utils";
 const getTitle = (props) => () => {
   if (props.title) {
     return props.title;

package/dropdown-item/mf.js

@@ -1,5 +1,5 @@
 import "../chunk-G2ADBYYC.js";
-import { omitText } from "../common/string";
+import { omitText } from "@opentiny/utils";
 const api = ["dataStore", "handleClick", "dataStore", "mouseEnter", "mouseLeave"];
 const renderless = (props, { reactive, inject }, { dispatch, vm }) => {
   const api2 = {};

package/dropdown-menu/index.js

@@ -1,7 +1,7 @@
 import {
   __spreadValues
 } from "../chunk-G2ADBYYC.js";
-import userPopper from "../common/deps/vue-popper";
+import { userPopper } from "@opentiny/vue-hooks";
 const toggleItem = (state) => (active, item) => {
   if (item.disabled) {
     return;

package/espace/vue.js

@@ -1,5 +1,5 @@
 import "../chunk-G2ADBYYC.js";
-import { init } from "../common/deps/eSpaceCtrl";
+import { initEspace } from "@opentiny/utils";
 import { getUserHref, getUserTitle, doUserAction, initEspaceLink, openEspace, testUID, soundEspace } from "./index";
 const api = [
   "getUserHref",
@@ -15,7 +15,7 @@ const renderless = (props, { reactive }, { service }) => {
   const { setting = {} } = service || {};
   const { widgets = {} } = setting;
   const eSpaceCtrlDisabled = widgets.ESpaceCtrl && !widgets.ESpaceCtrl.autoLink;
-  const eSpaceCtrl = eSpaceCtrlDisabled ? {} : init();
+  const eSpaceCtrl = eSpaceCtrlDisabled ? {} : initEspace();
   const state = reactive({
     initialized: false,
     dataItem: null

package/fall-menu/index.js

@@ -1,7 +1,7 @@
 import "../chunk-G2ADBYYC.js";
-import { REFRESH_INTERVAL } from "../common";
-import { on, off } from "../common/deps/dom";
-import PopupManager from "../common/deps/popup-manager";
+import { REFRESH_INTERVAL } from "@opentiny/utils";
+import { on, off } from "@opentiny/utils";
+import { PopupManager } from "@opentiny/utils";
 import { xss } from "@opentiny/utils";
 const arrowClick = (state) => (opt) => {
   state.pager += opt;

package/file-upload/index.js

@@ -2,11 +2,11 @@ import {
   __spreadProps,
   __spreadValues
 } from "../chunk-G2ADBYYC.js";
-import { extend } from "../common/object";
-import { xss, log, crypt } from "@opentiny/utils";
-import uploadAjax from "../common/deps/upload-ajax";
-import { isObject } from "../common/type";
-import { isEmptyObject } from "../common/type";
+import { extend } from "@opentiny/utils";
+import { xss, logger, sha256 } from "@opentiny/utils";
+import { uploadAjax } from "@opentiny/utils";
+import { isObject } from "@opentiny/utils";
+import { isEmptyObject } from "@opentiny/utils";
 let initTokenPromise = null;
 const noopFnCreator = (fn, propName) => {
   const noFn = () => {
@@ -276,7 +276,10 @@ const properFileSize = ({
   if (state.isEdm || Array.isArray(props.fileSize) && props.fileSize[1]) {
     if (!isNaN(Number(maxSize)) && file.size > maxSize * 1024 * 1024) {
       Modal.message({
-        message: t(constants.EDM.EXCEED, { maxSize: api.formatFileSize(Number(maxSize * 1024 * 1024)) }),
+        message: t(constants.EDM.EXCEED, {
+          fileName: file.name,
+          maxSize: api.formatFileSize(Number(maxSize * 1024 * 1024))
+        }),
         status: "warning"
       });
       return false;
@@ -292,7 +295,7 @@ const properFileSize = ({
   const userMin = props.fileSize && (props.fileSize[0] || props.fileSize) || 0;
   if (file.size <= userMin * 1024) {
     Modal.message({
-      message: `${t(constants.EDM.SIZE, { minSize: api.formatFileSize(Number(userMin), "K"), sizeUnit: "" })}`,
+      message: `${t(constants.EDM.SIZE, { fileName: file.name, minSize: api.formatFileSize(Number(userMin), "KB"), sizeUnit: "" })}`,
       status: "warning"
     });
     return false;
@@ -379,7 +382,7 @@ const getFileHash = ({
     reader.onload = async (e) => {
       if (file.status === constants.FILE_STATUS.FAIL)
         return;
-      const hash = await crypt.sha256(e.target && e.target.result);
+      const hash = sha256(e.target && e.target.result);
       file.hash = file.raw.hash = hash;
       resolve(hash);
       emit("hash-progress", 100);
@@ -1303,14 +1306,14 @@ const afterDownload = ({ api, state }) => ({ batchIndex, range, data, file, isBa
         range.index,
         "]"
       ];
-      log.logger.warn(msgArray.join(""));
+      logger.warn(msgArray.join(""));
       delete state.downloadReplayAtoms[key];
     } else {
       if (state.downloadReplayAtoms[key] === void 0) {
         state.downloadReplayAtoms[key] = 0;
       }
       const msgArray = ["replay ", countDownloadReplay, "! [docId:", file.docId, ", chunk:", range.index, "]"];
-      log.logger.warn(msgArray.join(""));
+      logger.warn(msgArray.join(""));
       state.downloadReplayAtoms[key] += 1;
       api.downloadFileInner({ batchIndex, range, file, isBatch, isChunk, isLessThan17G });
     }
@@ -1502,14 +1505,14 @@ const afterUpload = ({
         file.chunk,
         "]"
       ];
-      log.logger.warn(msgArray.join(""));
+      logger.warn(msgArray.join(""));
       delete state.replayAtoms[key];
     } else {
       if (state.replayAtoms[key] === void 0) {
         state.replayAtoms[key] = 0;
       }
       const msgArray = ["replay ", countReplay, "! [docId:", file.docId, ", chunk:", file.chunk, "]"];
-      log.logger.warn(msgArray.join(""));
+      logger.warn(msgArray.join(""));
       state.replayAtoms[key] += 1;
       api.segmentUpload(batchIndex, file, progress);
     }
@@ -1590,7 +1593,7 @@ const segmentUpload = ({
         reader.readAsArrayBuffer(file2);
         reader.onload = async (e) => {
           if (props.edm.isCheckCode === true) {
-            const hash = await crypt.sha256(e.target && e.target.result);
+            const hash = sha256(e.target && e.target.result);
             file2.hash = hash;
           }
           resolve(file2);

package/file-upload/vue.js

@@ -1,6 +1,6 @@
 import "../chunk-G2ADBYYC.js";
 import { downloadFile as ordinaryDownload } from "../upload-list";
-import { formatFileSize } from "../common/string";
+import { formatFileSize } from "@opentiny/utils";
 import {
   initService,
   getNewTabPreviewUrl,
@@ -76,7 +76,7 @@ import {
   closeRecordPanel,
   getTipMessage
 } from "./index";
-import { isEmptyObject } from "../common/type";
+import { isEmptyObject } from "@opentiny/utils";
 const api = [
   "state",
   "getNewTabPreviewUrl",

package/filter/vue.js

@@ -1,5 +1,5 @@
 import "../chunk-G2ADBYYC.js";
-import { on, off } from "../common/deps/dom";
+import { on, off } from "@opentiny/utils";
 import {
   panelToggle,
   filterSelectOption,

package/filter-panel/vue.js

@@ -1,6 +1,6 @@
 import "../chunk-G2ADBYYC.js";
 import { doDestroy, show, hide, popoverShow, popoverHide, handleClear, handleDocumentClick, togglePanel } from "./index";
-import { on, off } from "../common/deps/dom";
+import { on, off } from "@opentiny/utils";
 const api = ["state", "doDestroy", "show", "hide", "popoverShow", "popoverHide", "handleClear", "togglePanel"];
 const renderless = (props, { reactive, onMounted, onBeforeUnmount }, { vm, emit }) => {
   const state = reactive({
@@ -18,7 +18,6 @@ const renderless = (props, { reactive, onMounted, onBeforeUnmount }, { vm, emit
     doDestroy: doDestroy({ vm }),
     handleDocumentClick: handleDocumentClick({ vm, state })
   });
-  handleDocumentClick;
   onMounted(() => {
     on(document, "click", api2.handleDocumentClick);
   });

package/floating-button/index.js

@@ -1,5 +1,5 @@
 import "../chunk-G2ADBYYC.js";
-import { off, on } from "../common/deps/dom";
+import { off, on } from "@opentiny/utils";
 const getClientWidth = ({ state, vm }) => () => {
   if (vm.$refs.floatingButton) {
     state.centerSpace = (document.documentElement.clientWidth - vm.$refs.floatingButton.clientWidth) / 2;

package/flowchart/index.js

@@ -2,9 +2,9 @@ import {
   __spreadProps,
   __spreadValues
 } from "../chunk-G2ADBYYC.js";
-import debounce from "../common/deps/debounce";
-import { omitText as omit } from "../common/string";
-import { fastdom } from "../common/deps/fastdom";
+import { debounce } from "@opentiny/utils";
+import { omitText as omit } from "@opentiny/utils";
+import { fastdom } from "@opentiny/utils";
 const compute = ({ api, markRaw, props, state }) => () => {
   const { data, config } = props;
   const { nodes, links } = data;

package/flowchart/vue.js

@@ -27,7 +27,7 @@ import {
   setAdjustY,
   runAdjustYTask
 } from "./index";
-import throttle from "../common/deps/throttle";
+import { throttle } from "@opentiny/utils";
 const api = [
   "state",
   "clearHoverAfterLink",

package/fluent-editor/index.js

@@ -1,10 +1,10 @@
 import "../chunk-G2ADBYYC.js";
-import { extend } from "../common/object";
-import { isNull } from "../common/type";
+import { extend } from "@opentiny/utils";
+import { isNull } from "@opentiny/utils";
 import { xss } from "@opentiny/utils";
 import { set } from "../chart-core/deps/utils";
-import { on, off } from "../common/deps/dom";
-import PopupManager from "../common/deps/popup-manager";
+import { on, off } from "@opentiny/utils";
+import { PopupManager } from "@opentiny/utils";
 const init = ({
   api,
   emit,
@@ -145,10 +145,8 @@ const handleCompositionend = ({ state }) => (event) => {
     let data = state.quill.container.innerHTML;
     let range = state.quill.getSelection(true);
     const [mentionItem, offset] = state.quill.getLeaf(range.index);
-    if (mentionItem.statics.blotName === "break" || mentionItem.statics.blotName === "text" && offset === 0) {
-      state.quill.clipboard.dangerouslyPasteHTML(data);
-    }
     if (mentionItem.statics.blotName === "break") {
+      state.quill.clipboard.dangerouslyPasteHTML(data);
       state.quill.setSelection(range.index + event.data.length);
     } else {
       let pattern = /[\u4E00-\u9FA5\uF900-\uFA2D]/;

package/fluent-editor/options.js

@@ -2,7 +2,7 @@ import {
   __spreadProps,
   __spreadValues
 } from "../chunk-G2ADBYYC.js";
-import { isNull } from "../common/type";
+import { isNull } from "@opentiny/utils";
 const fontFamilyConfig = [
   "songti",
   "yahei",
@@ -123,7 +123,7 @@ const listAutofillHandler = ({ FluentEditor, state }) => (range, context) => {
   }
   state.quill.insertText(range.index, " ", FluentEditor.sources.USER);
   state.quill.history.cutoff();
-  const delta = new FluentEditor.imports["delta"]().retain(range.index - offset).delete(length + 1).retain(line.length() - 2 - offset).retain(1, { list: { value } });
+  const delta = new FluentEditor.imports.delta().retain(range.index - offset).delete(length + 1).retain(line.length() - 2 - offset).retain(1, { list: { value } });
   state.quill.updateContents(delta, FluentEditor.sources.USER);
   state.quill.history.cutoff();
   state.quill.setSelection(range.index - length, FluentEditor.sources.SILENT);

package/form/index.js

@@ -1,5 +1,5 @@
 import "../chunk-G2ADBYYC.js";
-import { merge } from "../common/object";
+import { merge } from "@opentiny/utils";
 const watchRules = ({ api, props, state }) => (newRules = {}, oldRules = {}) => {
   const newValidFields = Object.keys(newRules);
   const oldValidFields = Object.keys(oldRules);
@@ -114,7 +114,9 @@ const validate = ({ props, state }) => (callback) => {
         Object.keys(field2).forEach((item) => invalidFieldArr.push(item));
       }
       if (typeof callback === "function" && ++count === state.fields.length) {
-        callback(valid, invalidFields, invalidFieldArr);
+        const sortField = sortFields(state.fields, invalidFields);
+        const sortFieldArr = sortFields(state.fields, invalidFieldArr);
+        callback(valid, sortField, sortFieldArr);
       }
     });
   });
@@ -122,6 +124,22 @@ const validate = ({ props, state }) => (callback) => {
     return promise;
   }
 };
+const sortFields = (fileds, val) => {
+  const arrField = fileds.map((item) => item.prop);
+  if (Object.prototype.toString.call(val) === "[object Object]") {
+    const keys = Object.keys(val);
+    const sortKeys = keys.sort((a, b) => arrField.indexOf(a) - arrField.indexOf(b));
+    const sortedObject = sortKeys.reduce((acc, key) => {
+      acc[key] = val[key];
+      return acc;
+    }, {});
+    return sortedObject;
+  }
+  if (Array.isArray(val)) {
+    val.sort((x, y) => arrField.indexOf(x) - arrField.indexOf(y));
+    return val;
+  }
+};
 const validateField = (state) => (props, cb) => {
   props = [].concat(props);
   const fields = state.fields.filter((field) => props.includes(field.prop));

package/form-item/index.js

@@ -1,10 +1,10 @@
 import "../chunk-G2ADBYYC.js";
-import { POSITION, VALIDATE_STATE } from "../common";
-import { omitText } from "../common/string";
-import { merge } from "../common/object";
-import Validator from "../common/validate";
-import { isNull } from "../common/type";
-import debounce from "../common/deps/debounce";
+import { POSITION, VALIDATE_STATE } from "@opentiny/utils";
+import { omitText } from "@opentiny/utils";
+import { merge } from "@opentiny/utils";
+import { Validator } from "@opentiny/utils";
+import { isNull } from "@opentiny/utils";
+import { debounce } from "@opentiny/utils";
 const watchError = (state) => (value) => {
   if (!isNull(value) && state.getValidateType === "tip") {
     state.canShowTip = true;

package/fullscreen/index.js

@@ -1,5 +1,5 @@
 import "../chunk-G2ADBYYC.js";
-import { on, off } from "../common/deps/dom";
+import { on, off } from "@opentiny/utils";
 const toggle = ({ state, api }) => (value) => {
   if (value === void 0) {
     if (state.isFullscreen) {

package/fullscreen/vue.js

@@ -1,5 +1,5 @@
 import "../chunk-G2ADBYYC.js";
-import sf from "../common/deps/fullscreen/screenfull";
+import { sf } from "@opentiny/utils";
 import {
   exit,
   enter,

package/grid/plugins/export.js

@@ -2,7 +2,7 @@ import {
   __spreadValues
 } from "../../chunk-G2ADBYYC.js";
 import { xss } from "@opentiny/utils";
-import browser from "../../common/browser";
+import { browserInfo } from "@opentiny/utils";
 import { toTreeArray } from "../static";
 import { getCellValue, getFuncText } from "../utils";
 import { exportExcel } from "./exportExcel";
@@ -73,7 +73,7 @@ const getCsvContent = ($table, opts, oColumns, oData) => {
   return content;
 };
 const getCsvUrl = (opts, content) => {
-  if (window.Blob && window.URL && window.URL.createObjectURL && browser.name !== "safari") {
+  if (window.Blob && window.URL && window.URL.createObjectURL && browserInfo.name !== "safari") {
     return URL.createObjectURL(new Blob([content], { type: "text/csv;charset=utf-8" }));
   }
   return `data:attachment/csv;charset=utf-8,${encodeURIComponent(content)}`;

package/grid/plugins/exportExcel.js

@@ -1,7 +1,7 @@
 import "../../chunk-G2ADBYYC.js";
-import { extend } from "../../common/object";
-import browser from "../../common/browser";
-const isIE = browser.name === "ie";
+import { extend } from "@opentiny/utils";
+import { browserInfo } from "@opentiny/utils";
+const isIE = browserInfo.name === "ie";
 const rgbRegExp = /^rgba?\((\d+),\s(\d+),\s(\d+)([\s\S]*)\)$/;
 const hexRegExp = /^#([a-zA-Z0-9]{3}|[a-zA-Z0-9]{6})$/;
 function computeColor(rgbColor) {