cnhis-design-vue 3.1.17-beta.6 → 3.1.17-beta.9

package/es/packages/big-table/index.d.ts

@@ -2845,15 +2845,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         row: any;
         rowIndex: any;
     };
-    initEditTable: () => Promise<void>;
-    activeMethod: ({ row, rowIndex, column, columnIndex }: {
-        row: any;
-        rowIndex: number;
-        column: any;
-        columnIndex: number;
-    }) => boolean;
     deleteRow: (row: any, col: any, index: number) => void;
-    onClickSelectTable: (row: any) => Promise<void>;
     onFormChange: ({ value, row, column, index }: {
         value: string | number | null;
         row: any;
@@ -2941,6 +2933,12 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         } | null;
         showOverflow: boolean;
     })[];
+    getRowData: (row: import("../../../es/src/types").AnyObject) => {
+        separateData: Record<string, string>;
+        index: number;
+        rawRow: import("../../../es/src/types").AnyObject;
+        row: import("../../../es/src/types").AnyObject;
+    } | undefined;
     formatterEdit: (params: any, col: any) => any;
     getEditBtn: (row: any, col: any, index: any) => any;
     formatter: (params: any, col: any, _isEdit: any) => any;

package/es/packages/big-table/src/BigTable.vue.d.ts

@@ -1126,12 +1126,7 @@ declare const _default: import("vue").DefineComponent<{
                 textColorGhostHoverWarning: string;
                 textColorGhostPressedWarning: string;
                 textColorGhostFocusWarning: string;
-                textColorGhostDisabledWarning: string; /**
-                 * 判断是否渲染EditForm
-                 * @param {*} row
-                 * @param {*} column
-                 * @returns
-                 */
+                textColorGhostDisabledWarning: string;
                 borderWarning: string;
                 borderHoverWarning: string;
                 borderPressedWarning: string;
@@ -1252,7 +1247,9 @@ declare const _default: import("vue").DefineComponent<{
                 textColorTextHoverPrimary: string;
                 textColorTextPressedPrimary: string;
                 textColorTextFocusPrimary: string;
-                textColorTextDisabledPrimary: string;
+                textColorTextDisabledPrimary: string; /**
+                 * tsx渲染表格
+                 */
                 textColorGhostPrimary: string;
                 textColorGhostHoverPrimary: string;
                 textColorGhostPressedPrimary: string;
@@ -1331,6 +1328,7 @@ declare const _default: import("vue").DefineComponent<{
                 textColorTextPressedWarning: string;
                 textColorTextFocusWarning: string;
                 textColorTextDisabledWarning: string;
+                /** string */
                 textColorGhostWarning: string;
                 textColorGhostHoverWarning: string;
                 textColorGhostPressedWarning: string;
@@ -2849,15 +2847,7 @@ declare const _default: import("vue").DefineComponent<{
         row: any;
         rowIndex: any;
     };
-    initEditTable: () => Promise<void>;
-    activeMethod: ({ row, rowIndex, column, columnIndex }: {
-        row: any;
-        rowIndex: number;
-        column: any;
-        columnIndex: number;
-    }) => boolean;
     deleteRow: (row: any, col: any, index: number) => void;
-    onClickSelectTable: (row: any) => Promise<void>;
     onFormChange: ({ value, row, column, index }: {
         value: string | number | null;
         row: any;
@@ -2945,6 +2935,12 @@ declare const _default: import("vue").DefineComponent<{
         } | null;
         showOverflow: boolean;
     })[];
+    getRowData: (row: import("../../../src/types").AnyObject) => {
+        separateData: Record<string, string>;
+        index: number;
+        rawRow: import("../../../src/types").AnyObject;
+        row: import("../../../src/types").AnyObject;
+    } | undefined;
     formatterEdit: (params: any, col: any) => any;
     getEditBtn: (row: any, col: any, index: any) => any;
     formatter: (params: any, col: any, _isEdit: any) => any;

package/es/packages/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -19,7 +19,7 @@ import { useBatchEditing } from './hooks/useBatchEditing.js';
 import { useNestTable } from './hooks/useNestTable.js';
 import { useAnchor } from './hooks/useAnchor.js';
 import { useEvent } from './hooks/useEvent.js';
-import { useSeparateRow } from './hooks/useSeparateRow.js';
+import { useSeparateRow, useSeparateMap } from './hooks/useSeparateRow.js';
 import { useFormat } from './hooks/useFormat.js';
 import { useTableParse } from './hooks/useTableParse.js';
 import { useEdit, comps } from './hooks/useEdit.js';
@@ -82,10 +82,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       getInlineOpreateRow
     } = useBatchEditing(props, state, emit, xGrid);
     const {
-      initEditTable,
-      activeMethod,
       deleteRow,
-      onClickSelectTable,
       onFormChange,
       getDefaultValue
     } = useEdit(props, state, emit, xGrid);
@@ -506,7 +503,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       state.columnLen = currentColumns.filter((item) => item.visible).length;
       return columns;
     };
+    const {
+      getRowData
+    } = useSeparateMap();
     const formatterEdit = (params, col) => {
+      var _a, _b;
       let {
         row,
         column,
@@ -526,7 +527,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       const propsData = {
         col,
         row,
-        index: $rowIndex,
+        index: (_b = (_a = getRowData(row)) == null ? void 0 : _a.index) != null ? _b : $rowIndex,
         type: formType,
         ...col.componentProps || {},
         onFormChange,
@@ -537,7 +538,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             column: col,
             index: $rowIndex
           });
-        }
+        },
+        editTrigger: state.editConfig.trigger
       };
       if (formType === "date" || formType === "time") {
         propsData.formattedValue = row[col.columnName];

package/es/packages/big-table/src/components/edit-form/edit-date.js

@@ -2,6 +2,7 @@ import { defineComponent, computed, createVNode, mergeProps } from 'vue';
 import { generateTimeFormat } from '../../../../../src/utils';
 import { isFunction } from 'lodash-es';
 import { NDatePicker } from 'naive-ui';
+import { useCommon } from './useCommon.js';
 
 var EditDate = defineComponent({
   name: "EditDate",
@@ -28,6 +29,10 @@ var EditDate = defineComponent({
     attrs,
     emit
   }) {
+    const {
+      formRef,
+      isShow
+    } = useCommon(props, attrs);
     const onConfirm = (value) => {
       emit("formChange", {
         value,
@@ -124,7 +129,11 @@ var EditDate = defineComponent({
     if (config.type.includes("time")) {
       config.isTimeDisabled = customDateDisabledDecorator(props.col.isTimeDisabled) || isTimeDisabled;
     }
-    return () => createVNode(NDatePicker, mergeProps(attrs, config, {
+    return () => createVNode(NDatePicker, mergeProps({
+      "ref": formRef,
+      "show": isShow.value,
+      "onUpdate:show": ($event) => isShow.value = $event
+    }, attrs, config, {
       "onUpdateFormattedValue": onConfirm
     }), null);
   }

package/es/packages/big-table/src/components/edit-form/edit-input.js

@@ -1,5 +1,6 @@
 import { defineComponent, ref, createVNode, mergeProps } from 'vue';
 import { NInput, NInputNumber } from 'naive-ui';
+import { useCommon } from './useCommon.js';
 
 var EditInput = defineComponent({
   name: "EditInput",
@@ -31,6 +32,9 @@ var EditInput = defineComponent({
     attrs,
     emit
   }) {
+    const {
+      formRef
+    } = useCommon(props, attrs);
     const __value = ref(attrs.value);
     const onUpdateValue = (value) => {
       emit("formChange", {
@@ -52,11 +56,15 @@ var EditInput = defineComponent({
       placeholder: props.col.placeholder || "\u8BF7\u8F93\u5165",
       ...props.col.componentProps || {}
     };
-    return () => props.type === "input" ? createVNode(NInput, mergeProps(attrs, config, {
+    return () => props.type === "input" ? createVNode(NInput, mergeProps({
+      "ref": formRef
+    }, attrs, config, {
       "value": __value.value,
       "onUpdate:value": ($event) => __value.value = $event,
       "onBlur": onBlur
-    }), null) : createVNode(NInputNumber, mergeProps(attrs, config, {
+    }), null) : createVNode(NInputNumber, mergeProps({
+      "ref": formRef
+    }, attrs, config, {
       "onUpdateValue": onUpdateValue
     }), null);
   }

package/es/packages/big-table/src/components/edit-form/edit-select.d.ts

@@ -11,7 +11,7 @@ declare const _default: import("vue").DefineComponent<{
         type: (NumberConstructor | ObjectConstructor)[];
         default: number;
     };
-}, () => JSX.Element[], unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("formChange" | "setOptions")[], "formChange" | "setOptions", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("formChange" | "setOptions")[], "formChange" | "setOptions", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     col: {
         type: ObjectConstructor;
         default: () => {};

package/es/packages/big-table/src/components/edit-form/edit-select.js

@@ -1,6 +1,7 @@
 import { defineComponent, reactive, createVNode, mergeProps } from 'vue';
 import { NSelect } from 'naive-ui';
 import vexutils from '../../../../../src/utils/vexutils';
+import { useCommon } from './useCommon.js';
 
 var EditSelect = defineComponent({
   name: "EditSelect",
@@ -28,6 +29,10 @@ var EditSelect = defineComponent({
     slots,
     emit
   }) {
+    const {
+      formRef,
+      isShow
+    } = useCommon(props, attrs);
     const state = reactive({
       options: [],
       loading: false,
@@ -77,7 +82,11 @@ var EditSelect = defineComponent({
       }
     };
     init();
-    return () => [createVNode(NSelect, mergeProps(attrs, state.config, {
+    return () => createVNode(NSelect, mergeProps({
+      "ref": formRef,
+      "show": isShow.value,
+      "onUpdate:show": ($event) => isShow.value = $event
+    }, attrs, state.config, {
       "options": state.options,
       "consistentMenuWidth": false,
       "clearable": true,
@@ -85,7 +94,7 @@ var EditSelect = defineComponent({
       "placeholder": props.col.placeholder || "\u8BF7\u9009\u62E9",
       "loading": state.loading,
       "onUpdateValue": onUpdateValue
-    }), null)];
+    }), null);
   }
 });
 

package/es/packages/big-table/src/components/edit-form/edit-separate.js

@@ -24,32 +24,33 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     watch(show, updateShow);
     const editContent = ref();
     const { getRowData } = useSeparateMap();
-    async function updateShow(show2) {
+    async function onShow(target) {
       var _a;
-      const target = getRowData(props.row);
       if (!target)
         return;
-      if (show2) {
-        editContent.value = cloneDeep(target.row[props.col.field]);
-        await new Promise((resolve) => setTimeout(resolve));
-        (_a = popoverRef.value) == null ? void 0 : _a.syncPosition();
-        return;
-      }
-      const old = target.row[props.col.field];
+      editContent.value = cloneDeep(target.row[props.col.field]);
+      await new Promise((resolve) => setTimeout(resolve));
+      (_a = popoverRef.value) == null ? void 0 : _a.syncPosition();
+      return;
+    }
+    async function onClose(target) {
       if (!target)
         return;
+      const old = target.row[props.col.field];
       if (!isObject(editContent.value) && !isArray(editContent.value)) {
         if (old === editContent.value)
           return;
       }
-      target.rawRow[props.col.field] = editContent.value;
       emit("formChange", {
         value: editContent.value,
-        row: target.row,
+        row: props.row,
         column: props.col,
         index: target.index
       });
     }
+    function updateShow(show2) {
+      show2 ? onShow(getRowData(props.row)) : onClose(getRowData(props.row));
+    }
     const style = {
       border: "1px solid #f5f5f5",
       padding: "4px 0 4px 4px",

package/es/packages/big-table/src/components/edit-form/edit-separate.vue.d.ts

@@ -41,7 +41,19 @@ declare const _default: import("vue").DefineComponent<{
         rawRow: AnyObject;
         row: AnyObject;
     } | undefined;
-    updateShow: (show: boolean) => Promise<void>;
+    onShow: (target: {
+        separateData: Record<string, string>;
+        index: number;
+        rawRow: AnyObject;
+        row: AnyObject;
+    } | undefined) => Promise<void>;
+    onClose: (target: {
+        separateData: Record<string, string>;
+        index: number;
+        rawRow: AnyObject;
+        row: AnyObject;
+    } | undefined) => Promise<void>;
+    updateShow: (show: boolean) => void;
     style: CSSProperties;
     SlotRender: import("vue").DefineComponent<{
         renderer: {

package/es/packages/big-table/src/components/edit-form/edit-time.js

@@ -1,5 +1,6 @@
 import { defineComponent, createVNode, mergeProps } from 'vue';
 import { NTimePicker } from 'naive-ui';
+import { useCommon } from './useCommon.js';
 
 var editTime = defineComponent({
   name: "EditTime",
@@ -30,6 +31,10 @@ var editTime = defineComponent({
     attrs,
     emit
   }) {
+    const {
+      formRef,
+      isShow
+    } = useCommon(props, attrs);
     const onUpdateValue = (value) => {
       emit("formChange", {
         value,
@@ -44,7 +49,11 @@ var editTime = defineComponent({
       format: props.col.valueFormat || "yyyy-MM-dd HH:mm:ss",
       ...props.col.componentProps || {}
     };
-    return () => createVNode(NTimePicker, mergeProps(attrs, config, {
+    return () => createVNode(NTimePicker, mergeProps({
+      "ref": formRef,
+      "show": isShow.value,
+      "onUpdate:show": ($event) => isShow.value = $event
+    }, attrs, config, {
       "onUpdateFormattedValue": onUpdateValue
     }), null);
   }

package/es/packages/big-table/src/components/edit-form/useCommon.d.ts

@@ -0,0 +1,4 @@
+export declare const useCommon: (props: any, attrs: any) => {
+    formRef: import("vue").Ref<HTMLElement | null>;
+    isShow: import("vue").Ref<boolean>;
+};

package/es/packages/big-table/src/components/edit-form/useCommon.js

@@ -0,0 +1,19 @@
+import { ref, onMounted } from 'vue';
+
+const useCommon = (props, attrs) => {
+  const formRef = ref(null);
+  const isShow = ref(false);
+  onMounted(() => {
+    var _a;
+    if (attrs.editTrigger !== "manual") {
+      (_a = formRef.value) == null ? void 0 : _a.focus();
+      isShow.value = true;
+    }
+  });
+  return {
+    formRef,
+    isShow
+  };
+};
+
+export { useCommon };

package/es/packages/big-table/src/hooks/useEdit.d.ts

@@ -96,7 +96,7 @@ export declare const comps: {
             type: (NumberConstructor | ObjectConstructor)[];
             default: number;
         };
-    }, () => JSX.Element[], unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("formChange" | "setOptions")[], "formChange" | "setOptions", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("formChange" | "setOptions")[], "formChange" | "setOptions", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         col: {
             type: ObjectConstructor;
             default: () => {};
@@ -233,7 +233,19 @@ export declare const comps: {
             rawRow: import("../../../../src/types").AnyObject;
             row: import("../../../../src/types").AnyObject;
         } | undefined;
-        updateShow: (show: boolean) => Promise<void>;
+        onShow: (target: {
+            separateData: Record<string, string>;
+            index: number;
+            rawRow: import("../../../../src/types").AnyObject;
+            row: import("../../../../src/types").AnyObject;
+        } | undefined) => Promise<void>;
+        onClose: (target: {
+            separateData: Record<string, string>;
+            index: number;
+            rawRow: import("../../../../src/types").AnyObject;
+            row: import("../../../../src/types").AnyObject;
+        } | undefined) => Promise<void>;
+        updateShow: (show: boolean) => void;
         style: import("vue").CSSProperties;
         SlotRender: import("vue").DefineComponent<{
             renderer: {
@@ -1458,12 +1470,6 @@ export declare const comps: {
 };
 export declare const useEdit: (props: any, state: any, emit: any, xGrid: any) => {
     initEditTable: () => Promise<void>;
-    activeMethod: ({ row, rowIndex, column, columnIndex }: {
-        row: any;
-        rowIndex: number;
-        column: any;
-        columnIndex: number;
-    }) => boolean;
     deleteRow: (row: any, col: any, index: number) => void;
     onClickSelectTable: (row: any) => Promise<void>;
     onFormChange: ({ value, row, column, index }: {

package/es/packages/big-table/src/hooks/useEdit.js

@@ -34,25 +34,6 @@ const useEdit = (props, state, emit, xGrid) => {
     xGrid.value.remove(row);
     emit("clickBtn", { row, column: col, index });
   };
-  const activeMethod = ({
-    row,
-    rowIndex,
-    column,
-    columnIndex
-  }) => {
-    var _a;
-    const { isEdit, fieldList } = props.columnConfig;
-    if (isEdit) {
-      const isEditCol = ((_a = fieldList.find((v) => v.columnName === column.field)) == null ? void 0 : _a.isEdit) || false;
-      if (isEditCol) {
-        return true;
-      } else {
-        return false;
-      }
-    } else {
-      return false;
-    }
-  };
   const onClickSelectTable = async (row) => {
     emit("clickSelectTable", { row });
     const record = {
@@ -131,7 +112,6 @@ const useEdit = (props, state, emit, xGrid) => {
   };
   return {
     initEditTable,
-    activeMethod,
     deleteRow,
     onClickSelectTable,
     onFormChange,

package/es/packages/big-table/style/index.css

@@ -538,6 +538,12 @@ body > .vxe-table--tooltip-wrapper {
   margin-right: 6px;
   box-shadow: 0px 2px 4px 0px rgba(99, 129, 249, 0.5);
 }
+.custom-big-table .vxe-table--render-default .vxe-table--fixed-left-wrapper.scrolling--middle {
+  box-shadow: 4px 0 4px 0 rgba(0, 0, 0, 0.12);
+}
+.custom-big-table .vxe-table--render-default .vxe-table--fixed-right-wrapper.scrolling--middle {
+  box-shadow: -4px 0 4px 0 rgba(0, 0, 0, 0.12);
+}
 .annotation-edit {
   cursor: pointer;
   color: #0067ee;

package/es/packages/button-print/index.d.ts

@@ -52,6 +52,9 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
         default: string;
         type: StringConstructor;
     };
+    token: {
+        type: StringConstructor;
+    };
 }, {
     $message: import("naive-ui").MessageApi;
     printInstance: any;
@@ -107,6 +110,9 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
             default: string;
             type: StringConstructor;
         };
+        token: {
+            type: StringConstructor;
+        };
     }>> & {
         onError?: ((...args: any[]) => any) | undefined;
         onClickoutside?: ((...args: any[]) => any) | undefined;
@@ -7356,6 +7362,9 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
         default: string;
         type: StringConstructor;
     };
+    token: {
+        type: StringConstructor;
+    };
 }>> & {
     onError?: ((...args: any[]) => any) | undefined;
     onClickoutside?: ((...args: any[]) => any) | undefined;

package/es/packages/button-print/src/ButtonPrint.vue.d.ts

@@ -53,6 +53,9 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
         type: StringConstructor;
     };
+    token: {
+        type: StringConstructor;
+    };
 }, {
     $message: import("naive-ui").MessageApi;
     printInstance: any;
@@ -111,6 +114,9 @@ declare const _default: import("vue").DefineComponent<{
             default: string;
             type: StringConstructor;
         };
+        token: {
+            type: StringConstructor;
+        };
     }>> & {
         onError?: ((...args: any[]) => any) | undefined;
         onClickoutside?: ((...args: any[]) => any) | undefined;
@@ -7363,6 +7369,9 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
         type: StringConstructor;
     };
+    token: {
+        type: StringConstructor;
+    };
 }>> & {
     onError?: ((...args: any[]) => any) | undefined;
     onClickoutside?: ((...args: any[]) => any) | undefined;

package/es/packages/button-print/src/ButtonPrint.vue_vue_type_script_setup_true_lang.js

@@ -59,6 +59,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     noDataMsg: {
       default: "\u8BF7\u9009\u4E2D\u9700\u8981\u6253\u5370\u7684\u6570\u636E",
       type: String
+    },
+    token: {
+      type: String
     }
   },
   emits: ["success", "error", "clickoutside"],
@@ -136,7 +139,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const getPrintParams = (index = 0) => {
       var _a;
       const params = ((_a = props.printParams) == null ? void 0 : _a.length) ? props.printParams[index] : state.printParams[index];
-      return JSON.stringify(params);
+      return JSON.stringify({
+        ...params || {},
+        ...props.token ? {
+          token: props.token
+        } : {}
+      });
     };
     const getOnceParams = () => {
       var _a, _b;
@@ -176,22 +184,22 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         prevFnError();
         return Promise.reject();
       }).then(() => {
+        const queryParams = {
+          formatId: state.currentFormatId,
+          templateId: getTemplateIdByFormatId.value
+        };
         if (props.strategy === "MULTI") {
           for (let i = 0; i < state.printParams.length; i++) {
-            const queryParams = {
-              formatId: state.currentFormatId,
-              templateId: getTemplateIdByFormatId.value,
+            printInstance.printDirect({
+              ...queryParams,
               params: getPrintParams(i)
-            };
-            printInstance.printDirect(queryParams, callLocalServicesSuccessCbTmp, callLocalServicesErrorCb);
+            }, callLocalServicesSuccessCbTmp, callLocalServicesErrorCb);
           }
         } else {
-          const queryParams = {
-            formatId: state.currentFormatId,
-            templateId: getTemplateIdByFormatId.value,
+          printInstance.printDirect({
+            ...queryParams,
             params: getOnceParams()
-          };
-          printInstance.printDirect(queryParams, (res) => {
+          }, (res) => {
             callLocalServicesSuccessCb(res, "print");
           }, callLocalServicesErrorCb);
         }

package/es/packages/fabric-chart/src/hooks/useLeft.js

@@ -22,9 +22,10 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
   const mainScaleWidth = 9;
   const subScaleWidth = 5;
   function drawScaleNumber(text, item, left2, top) {
+    const { position } = item;
     return new fabric.Text(String(text), {
       ...defaultTextStyle,
-      originX: item.position || "center",
+      originX: position == "left" ? "right" : position == "right" ? "left" : "center",
       left: left2,
       top,
       ...item.style
@@ -35,13 +36,13 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
     let lineXMain = [scaleLeft - mainScaleWidth / 2, scaleLeft + mainScaleWidth / 2];
     let lineXSub = [scaleLeft - subScaleWidth / 2, scaleLeft + subScaleWidth / 2];
     let textLeft = scaleLeft;
-    if (position === "left") {
+    if (position === "right") {
       scaleLeft = x;
       lineXMain = [scaleLeft, scaleLeft + mainScaleWidth];
       lineXSub = [scaleLeft, scaleLeft + subScaleWidth];
       textLeft = lineXMain[1];
     }
-    if (position === "right") {
+    if (position === "left") {
       scaleLeft = x + width;
       lineXMain = [scaleLeft - mainScaleWidth, scaleLeft];
       lineXSub = [scaleLeft - subScaleWidth, scaleLeft];