cnhis-design-vue 3.1.9-beta.1 → 3.1.9-beta.12

package/es/packages/scale-view/src/{ScaleView.vue_vue_type_script_setup_true_lang.mjs → ScaleView.vue_vue_type_script_setup_true_lang.js}

@@ -1,50 +1,50 @@
-import { defineComponent, reactive, ref, watch, nextTick, openBlock, createElementBlock, createCommentVNode, Fragment, unref, createBlock, mergeProps, createElementVNode, normalizeClass, normalizeStyle, createVNode, withCtx, renderList, toDisplayString, resolveDynamicComponent, createTextVNode, h } from 'vue';
-import useNoData from './hooks/use-noData.mjs';
-import ScaleViewState from './hooks/scaleview-state.mjs';
-import ScaleViewProps from './hooks/scaleview-props.mjs';
-import { ScaleViewComputed } from './hooks/scaleview-computed.mjs';
-import { ScaleViewInit } from './hooks/scaleview-init.mjs';
-import { ScaleViewSubmit } from './hooks/scaleview-submit.mjs';
-import { handleQueryParams, isCollection, isEvaluation } from './utils/judge-types.mjs';
-import { useEvent } from './hooks/use-event.mjs';
-import './components/NoData.mjs';
-import '../../../src/components/SvgIcon/SvgIcon.mjs';
-import './components/EvaluateCountdown.mjs';
-import './components/EvaluatePage.mjs';
-import './components/AnswerParse.mjs';
-import ScaleScore from './components/ScaleScore.mjs';
+import { defineComponent, reactive, ref, watch, nextTick, openBlock, createElementBlock, normalizeClass, unref, createCommentVNode, Fragment, createBlock, mergeProps, createElementVNode, normalizeStyle, createVNode, withCtx, renderList, toDisplayString, resolveDynamicComponent, createTextVNode, h } from 'vue';
+import useNoData from './hooks/use-noData.js';
+import { getScaleViewState } from './hooks/scaleview-state.js';
+import ScaleViewProps from './hooks/scaleview-props.js';
+import { ScaleViewComputed } from './hooks/scaleview-computed.js';
+import { ScaleViewInit } from './hooks/scaleview-init.js';
+import { ScaleViewSubmit } from './hooks/scaleview-submit.js';
+import { handleQueryParams, isCollection, isEvaluation } from './utils/judge-types.js';
+import { useEvent } from './hooks/use-event.js';
+import './components/NoData.js';
+import '../../../src/components/SvgIcon/SvgIcon.js';
+import './components/EvaluateCountdown.js';
+import './components/EvaluatePage.js';
+import './components/AnswerParse.js';
+import ScaleScore from './components/ScaleScore.js';
 import { useDialog, useMessage, NForm, NFormItem, NButton } from 'naive-ui';
-import script$1 from './components/NoData.vue_vue_type_script_setup_true_lang.mjs';
-import script$2 from './components/EvaluatePage.vue_vue_type_script_setup_true_lang.mjs';
-import script$3 from './components/EvaluateCountdown.vue_vue_type_script_setup_true_lang.mjs';
-import script$4 from '../../../src/components/SvgIcon/SvgIcon.vue_vue_type_script_setup_true_lang.mjs';
-import script$5 from './components/AnswerParse.vue_vue_type_script_setup_true_lang.mjs';
+import script$1 from './components/NoData.vue_vue_type_script_setup_true_lang.js';
+import script$2 from './components/EvaluatePage.vue_vue_type_script_setup_true_lang.js';
+import script$3 from './components/EvaluateCountdown.vue_vue_type_script_setup_true_lang.js';
+import script$4 from '../../../src/components/SvgIcon/SvgIcon.vue_vue_type_script_setup_true_lang.js';
+import script$5 from './components/AnswerParse.vue_vue_type_script_setup_true_lang.js';
 
-const _hoisted_1 = { class: "c-scale" };
-const _hoisted_2 = ["innerHTML"];
-const _hoisted_3 = {
+const _hoisted_1 = ["innerHTML"];
+const _hoisted_2 = {
   key: 0,
   class: "required-text"
 };
-const _hoisted_4 = {
+const _hoisted_3 = {
   key: 1,
   class: "evalute-label"
 };
-const _hoisted_5 = ["onClick"];
-const _hoisted_6 = /* @__PURE__ */ createTextVNode("\u67E5\u770B\u63D0\u793A ");
-const _hoisted_7 = {
+const _hoisted_4 = ["onClick"];
+const _hoisted_5 = /* @__PURE__ */ createTextVNode("\u67E5\u770B\u63D0\u793A ");
+const _hoisted_6 = {
   key: 1,
   class: "footer"
 };
-const _hoisted_8 = /* @__PURE__ */ createTextVNode("\u53D6\u6D88");
-const _hoisted_9 = /* @__PURE__ */ createTextVNode("\u4FDD\u5B58");
+const _hoisted_7 = /* @__PURE__ */ createTextVNode("\u53D6\u6D88");
+const _hoisted_8 = /* @__PURE__ */ createTextVNode("\u4FDD\u5B58");
 var script = /* @__PURE__ */ defineComponent({
   __name: "ScaleView",
   props: ScaleViewProps,
   emits: ["onCloseSetting", "submitNoRequest", "onSubmit"],
-  setup(__props, { emit }) {
+  setup(__props, { expose, emit }) {
     const props = __props;
-    const state = reactive({ ...ScaleViewState });
+    const { ScaleViewState } = getScaleViewState();
+    const state = reactive(ScaleViewState);
     const dialog = useDialog();
     const message = useMessage();
     const countdownDom = ref(null);
@@ -289,8 +289,16 @@ var script = /* @__PURE__ */ defineComponent({
     const cancel = () => {
       emit("onCloseSetting");
     };
+    const getScaleData = () => {
+      return { ...state };
+    };
+    expose({
+      getScaleData
+    });
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1, [
+      return openBlock(), createElementBlock("div", {
+        class: normalizeClass(["c-scale", { "c-scale-nobtn": unref(showSaveBtn) }])
+      }, [
         createCommentVNode(' <template v-if="state.spinning">\n      <n-spin :show="state.spinning" description="\u52A0\u8F7D\u4E2D"></n-spin>\n    </template> '),
         !state.spinning && !state.hasFrontAddress ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
           unref(noDataState).noData ? (openBlock(), createBlock(script$1, {
@@ -317,7 +325,9 @@ var script = /* @__PURE__ */ defineComponent({
                   ref_key: "formRef",
                   ref: formRef,
                   model: state.form,
-                  rules: state.rules
+                  rules: state.rules,
+                  "require-mark-placement": "left",
+                  class: "main"
                 }, {
                   default: withCtx(() => [
                     (openBlock(true), createElementBlock(Fragment, null, renderList(state.formArray, (item, index) => {
@@ -333,17 +343,17 @@ var script = /* @__PURE__ */ defineComponent({
                             createElementVNode("span", {
                               class: normalizeClass({ "scale-label-required": unref(isFormBoldOpen)(item) }),
                               innerHTML: unref(handleShowQuestionNumber)(item)
-                            }, null, 10, _hoisted_2),
-                            unref(isFormBoldOpen)(item) ? (openBlock(), createElementBlock("span", _hoisted_3, "(\u5FC5\u586B)")) : createCommentVNode("v-if", true),
-                            unref(showEvaluateLabel)(item) ? (openBlock(), createElementBlock("span", _hoisted_4, toDisplayString(unref(showEvaluateLabel)(item)), 1)) : createCommentVNode("v-if", true),
+                            }, null, 10, _hoisted_1),
+                            unref(isFormBoldOpen)(item) ? (openBlock(), createElementBlock("span", _hoisted_2, "(\u5FC5\u586B)")) : createCommentVNode("v-if", true),
+                            unref(showEvaluateLabel)(item) ? (openBlock(), createElementBlock("span", _hoisted_3, toDisplayString(unref(showEvaluateLabel)(item)), 1)) : createCommentVNode("v-if", true),
                             unref(showEvatip)(item) ? (openBlock(), createElementBlock("span", {
                               key: 2,
                               class: "evalute-tip",
                               onClick: ($event) => showEvaTipModal(item)
                             }, [
                               createVNode(unref(script$4), { "icon-class": "a-xitongtubiaotishi" }),
-                              _hoisted_6
-                            ], 8, _hoisted_5)) : createCommentVNode("v-if", true)
+                              _hoisted_5
+                            ], 8, _hoisted_4)) : createCommentVNode("v-if", true)
                           ]),
                           default: withCtx(() => [
                             (openBlock(), createBlock(resolveDynamicComponent(item.renderCom), mergeProps(unref(propsConfig)(item, index), {
@@ -365,10 +375,10 @@ var script = /* @__PURE__ */ defineComponent({
                   _: 1
                 }, 8, ["model", "rules"])
               ], 6),
-              unref(showSaveBtn) ? (openBlock(), createElementBlock("div", _hoisted_7, [
+              unref(showSaveBtn) ? (openBlock(), createElementBlock("div", _hoisted_6, [
                 createVNode(unref(NButton), { onClick: cancel }, {
                   default: withCtx(() => [
-                    _hoisted_8
+                    _hoisted_7
                   ]),
                   _: 1
                 }),
@@ -379,7 +389,7 @@ var script = /* @__PURE__ */ defineComponent({
                   type: "info"
                 }, {
                   default: withCtx(() => [
-                    _hoisted_9
+                    _hoisted_8
                   ]),
                   _: 1
                 }, 8, ["disabled"])) : createCommentVNode("v-if", true)
@@ -387,7 +397,7 @@ var script = /* @__PURE__ */ defineComponent({
             ], 64))
           ], 64))
         ], 64)) : createCommentVNode("v-if", true)
-      ]);
+      ], 2);
     };
   }
 });

package/es/packages/scale-view/src/components/{AnswerParse.mjs → AnswerParse.js}

@@ -1,4 +1,4 @@
-import script from './AnswerParse.vue_vue_type_script_setup_true_lang.mjs';
-export { default } from './AnswerParse.vue_vue_type_script_setup_true_lang.mjs';
+import script from './AnswerParse.vue_vue_type_script_setup_true_lang.js';
+export { default } from './AnswerParse.vue_vue_type_script_setup_true_lang.js';
 
 script.__file = "packages/scale-view/src/components/AnswerParse.vue";

package/es/packages/scale-view/src/components/{AnswerParse.vue_vue_type_script_setup_true_lang.mjs → AnswerParse.vue_vue_type_script_setup_true_lang.js}

@@ -1,5 +1,5 @@
 import { defineComponent, computed, openBlock, createElementBlock, normalizeClass, unref, createElementVNode, createVNode, createTextVNode, toDisplayString, createCommentVNode } from 'vue';
-import SvgIcon from 'cnhis-design-vue/es/src/components/SvgIcon';
+import SvgIcon from '../../../../src/components/SvgIcon';
 
 const _hoisted_1 = { class: "answer-res-wrap" };
 const _hoisted_2 = { class: "answer-res" };

package/es/packages/scale-view/src/components/{EvaluateCountdown.mjs → EvaluateCountdown.js}

@@ -1,4 +1,4 @@
-import script from './EvaluateCountdown.vue_vue_type_script_setup_true_lang.mjs';
-export { default } from './EvaluateCountdown.vue_vue_type_script_setup_true_lang.mjs';
+import script from './EvaluateCountdown.vue_vue_type_script_setup_true_lang.js';
+export { default } from './EvaluateCountdown.vue_vue_type_script_setup_true_lang.js';
 
 script.__file = "packages/scale-view/src/components/EvaluateCountdown.vue";

package/es/packages/scale-view/src/components/{EvaluateCountdown.vue_vue_type_script_setup_true_lang.mjs → EvaluateCountdown.vue_vue_type_script_setup_true_lang.js}

@@ -1,7 +1,7 @@
 import { defineComponent, reactive, onMounted, watch, openBlock, createElementBlock, normalizeClass, unref, createElementVNode, toDisplayString, createVNode, createCommentVNode, createTextVNode } from 'vue';
-import { useEvaluate } from '../hooks/use-evaluate.mjs';
+import { useEvaluate } from '../hooks/use-evaluate.js';
 import moment from 'moment';
-import SvgIcon from 'cnhis-design-vue/es/src/components/SvgIcon';
+import SvgIcon from '../../../../src/components/SvgIcon';
 
 const _hoisted_1 = { class: "answered-wrap" };
 var script = /* @__PURE__ */ defineComponent({

package/es/packages/scale-view/src/components/{EvaluatePage.mjs → EvaluatePage.js}

@@ -1,4 +1,4 @@
-import script from './EvaluatePage.vue_vue_type_script_setup_true_lang.mjs';
-export { default } from './EvaluatePage.vue_vue_type_script_setup_true_lang.mjs';
+import script from './EvaluatePage.vue_vue_type_script_setup_true_lang.js';
+export { default } from './EvaluatePage.vue_vue_type_script_setup_true_lang.js';
 
 script.__file = "packages/scale-view/src/components/EvaluatePage.vue";

package/es/packages/scale-view/src/components/EvaluatePage.vue.d.ts

@@ -120,7 +120,10 @@ declare const _default: import("vue").DefineComponent<{
             readonly default: true;
         };
         readonly onClick: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: MouseEvent) => void>>;
-        readonly nativeFocusBehavior: BooleanConstructor;
+        readonly nativeFocusBehavior: {
+            readonly type: BooleanConstructor;
+            readonly default: boolean;
+        };
         readonly theme: import("vue").PropType<import("naive-ui/es/_mixins").Theme<"Button", {
             heightTiny: string;
             heightSmall: string;
@@ -834,7 +837,10 @@ declare const _default: import("vue").DefineComponent<{
             readonly default: true;
         };
         readonly onClick: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(e: MouseEvent) => void>>;
-        readonly nativeFocusBehavior: BooleanConstructor;
+        readonly nativeFocusBehavior: {
+            readonly type: BooleanConstructor;
+            readonly default: boolean;
+        };
         readonly theme: import("vue").PropType<import("naive-ui/es/_mixins").Theme<"Button", {
             heightTiny: string;
             heightSmall: string;

package/es/packages/scale-view/src/components/{EvaluatePage.vue_vue_type_script_setup_true_lang.mjs → EvaluatePage.vue_vue_type_script_setup_true_lang.js}

@@ -1,5 +1,5 @@
 import { defineComponent, reactive, onMounted, openBlock, createElementBlock, createElementVNode, toDisplayString, createCommentVNode, unref, createVNode, withCtx, createTextVNode, Fragment } from 'vue';
-import { useEvaluate } from '../hooks/use-evaluate.mjs';
+import { useEvaluate } from '../hooks/use-evaluate.js';
 import moment from 'moment';
 import { NButton } from 'naive-ui';
 

package/es/packages/scale-view/src/components/LoadingCom.js

@@ -0,0 +1,7 @@
+import { render } from './LoadingCom.vue_vue_type_template_id_413329b0_lang.js';
+
+const script = {};
+script.render = render;
+script.__file = "packages/scale-view/src/components/LoadingCom.vue";
+
+export { script as default };

package/es/packages/scale-view/src/components/LoadingCom.vue_vue_type_template_id_413329b0_lang.js

@@ -0,0 +1,16 @@
+import { openBlock, createElementBlock, createStaticVNode } from 'vue';
+
+const _hoisted_1 = {
+  class: "n-base-loading n-base-suffix",
+  role: "img",
+  "aria-label": "loading"
+};
+const _hoisted_2 = /* @__PURE__ */ createStaticVNode('<div class="n-base-loading__transition-wrapper"><div class="n-base-loading__container"><div class="n-base-loading__container-layer"><div class="n-base-loading__container-layer-left"><svg class="n-base-loading__svg" viewBox="0 0 235.29411764705884 235.29411764705884" xmlns="http://www.w3.org/2000/svg"><circle fill="none" stroke="currentColor" stroke-width="24" stroke-linecap="round" cx="117.64705882352942" cy="117.64705882352942" r="88" stroke-dasharray="491" stroke-dashoffset="246"></circle></svg></div><div class="n-base-loading__container-layer-patch"><svg class="n-base-loading__svg" viewBox="0 0 235.29411764705884 235.29411764705884" xmlns="http://www.w3.org/2000/svg"><circle fill="none" stroke="currentColor" stroke-width="24" stroke-linecap="round" cx="117.64705882352942" cy="117.64705882352942" r="88" stroke-dasharray="491" stroke-dashoffset="246"></circle></svg></div><div class="n-base-loading__container-layer-right"><svg class="n-base-loading__svg" viewBox="0 0 235.29411764705884 235.29411764705884" xmlns="http://www.w3.org/2000/svg"><circle fill="none" stroke="currentColor" stroke-width="24" stroke-linecap="round" cx="117.64705882352942" cy="117.64705882352942" r="88" stroke-dasharray="491" stroke-dashoffset="246"></circle></svg></div></div></div></div>', 1);
+const _hoisted_3 = [
+  _hoisted_2
+];
+function render(_ctx, _cache) {
+  return openBlock(), createElementBlock("div", _hoisted_1, _hoisted_3);
+}
+
+export { render };

package/es/packages/scale-view/src/components/{NoData.mjs → NoData.js}

@@ -1,4 +1,4 @@
-import script from './NoData.vue_vue_type_script_setup_true_lang.mjs';
-export { default } from './NoData.vue_vue_type_script_setup_true_lang.mjs';
+import script from './NoData.vue_vue_type_script_setup_true_lang.js';
+export { default } from './NoData.vue_vue_type_script_setup_true_lang.js';
 
 script.__file = "packages/scale-view/src/components/NoData.vue";

package/es/packages/scale-view/src/components/{NoData.vue_vue_type_script_setup_true_lang.mjs → NoData.vue_vue_type_script_setup_true_lang.js}

@@ -1,8 +1,8 @@
 import { defineComponent, computed, openBlock, createElementBlock, unref, createCommentVNode, createElementVNode, toDisplayString } from 'vue';
-import noData from 'cnhis-design-vue/es/src/assets/img/nodata.png';
-import noPermission from 'cnhis-design-vue/es/src/assets/img/no-permission.png';
-import failure from 'cnhis-design-vue/es/src/assets/img/failure.png';
-import notfound from 'cnhis-design-vue/es/src/assets/img/notfound.png';
+import noData from '../../../../src/assets/img/nodata';
+import noPermission from '../../../../src/assets/img/no-permission';
+import failure from '../../../../src/assets/img/failure';
+import notfound from '../../../../src/assets/img/notfound';
 
 const _hoisted_1 = { class: "no-data-tip NoData-page" };
 const _hoisted_2 = ["src"];

package/es/packages/scale-view/src/components/formitem/{r-address.mjs → r-address.js}

@@ -1,7 +1,7 @@
 import { defineComponent, reactive, computed, createVNode, resolveComponent } from 'vue';
 import { NSelect, NInput } from 'naive-ui';
-import allData from './address.mjs';
-import vexutils from 'cnhis-design-vue/es/src/utils/vexutils';
+import allData from './address.js';
+import vexutils from '../../../../../src/utils/vexutils';
 
 var RAddress = defineComponent({
   name: "RAddress",
@@ -214,7 +214,7 @@ var RAddress = defineComponent({
     handleDef();
     return () => {
       return createVNode("div", {
-        "class": "scale-address"
+        "class": "c-scale-address"
       }, [createVNode("div", {
         "class": "field-row"
       }, [hasProvince.value && renderProvince(), hasCity.value && renderCity(), hasDistrict.value && renderDistrict()]), hasAddress.value && renderaddress()]);

package/es/packages/scale-view/src/components/formitem/{r-cascader.mjs → r-cascader.js}

@@ -1,10 +1,13 @@
 import { defineComponent, reactive, createVNode, resolveComponent } from 'vue';
-import { NCascader } from 'naive-ui';
+import { NCascader, NEmpty } from 'naive-ui';
+import script from '../LoadingCom.js';
 
 var RCascader = defineComponent({
   name: "RCascader",
   components: {
-    NCascader
+    NCascader,
+    NEmpty,
+    LoadingCom: script
   },
   props: {
     form: {
@@ -30,7 +33,8 @@ var RCascader = defineComponent({
   setup(props, context) {
     let state = reactive({
       cascaderValue: void 0,
-      curOptions: []
+      curOptions: [],
+      fetching: false
     });
     const backshowValue = (list, val) => {
       if (!list.length || !val || !val.length)
@@ -89,9 +93,15 @@ var RCascader = defineComponent({
         backshowValue(options, defVal);
         return;
       }
-      options = await props.getCascadeOptions(val);
-      state.curOptions = options;
-      backshowValue(options, defVal);
+      try {
+        state.fetching = true;
+        options = await props.getCascadeOptions(val);
+        state.curOptions = options;
+        backshowValue(options, defVal);
+        state.fetching = false;
+      } catch (err) {
+        state.fetching = false;
+      }
     };
     handleDef(props.item);
     const cascaderChange = (value, options, pathValues) => {
@@ -113,7 +123,9 @@ var RCascader = defineComponent({
         "show-path": true,
         "cascade": false,
         "on-update:value": cascaderChange
-      }, null);
+      }, {
+        empty: () => state.fetching ? createVNode(script, null, null) : createVNode(NEmpty, null, null)
+      });
     };
   }
 });

package/es/packages/scale-view/src/components/formitem/r-checkbox.d.ts

@@ -11,6 +11,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    inputLock: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "scaleChange"[], "scaleChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     form: {
         type: ObjectConstructor;
@@ -24,11 +28,16 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    inputLock: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     onScaleChange?: ((...args: any[]) => any) | undefined;
 }, {
     form: Record<string, any>;
     item: Record<string, any>;
     isLock: boolean;
+    inputLock: boolean;
 }>;
 export default _default;

package/es/packages/scale-view/src/components/formitem/{r-checkbox.mjs → r-checkbox.js}

@@ -2,8 +2,8 @@ import { defineComponent, reactive, watch, createVNode, resolveComponent, isVNod
 import { NCheckboxGroup, NCheckbox, NInput, NIcon } from 'naive-ui';
 import { api } from 'v-viewer';
 import { SearchOutline } from '@vicons/ionicons5';
-import vexutils from 'cnhis-design-vue/es/src/utils/vexutils';
-import chooseCommon from '../composables/choose-common.mjs';
+import vexutils from '../../../../../src/utils/vexutils';
+import chooseCommon from '../composables/choose-common.js';
 
 function _isSlot(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
@@ -30,6 +30,10 @@ var scriptCheckbox = defineComponent({
     isLock: {
       type: Boolean,
       default: false
+    },
+    inputLock: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ["scaleChange"],
@@ -51,12 +55,20 @@ var scriptCheckbox = defineComponent({
       handleOptions
     } = chooseCommon(props, state);
     const chooseStyleSetting = ((_b = (_a = props.item) == null ? void 0 : _a.setting) == null ? void 0 : _b.chooseStyleSetting) || 1;
-    const handlePreview = (url, i) => {
-      let imgs = state.curOptions.map((v) => v.imageUrl);
+    const handlePreview = (e, url) => {
+      e.preventDefault();
+      e.stopPropagation();
+      let imgs = state.curOptions.map((v) => v.imageUrl).filter(Boolean);
       if (!imgs.length)
         return;
+      let index = imgs.findIndex((v) => v === url);
+      let i = index < 0 ? 0 : index;
       api({
-        images: imgs
+        images: imgs,
+        options: {
+          toolbar: true,
+          initialViewIndex: i
+        }
       });
     };
     const handleCheckboxOther = (isOtherInput) => {
@@ -73,6 +85,35 @@ var scriptCheckbox = defineComponent({
         isSetObj: isCheckboxItem.value
       });
     };
+    const handleCheckboxDefModal = (item, curValue, options) => {
+      var _a2;
+      state.curOptions = handleOptions(options);
+      if (!options.length || !curValue || !curValue.length)
+        return;
+      let resArr = [];
+      let i = 0, x, len = curValue.length;
+      for (; i < len; i++) {
+        x = curValue[i];
+        if (x === "\u5176\u4ED6") {
+          state.othersText = x;
+          state.curCheckboxValue = ["other"];
+          !resArr.includes("other") && resArr.push("other");
+          continue;
+        }
+        let matchIndex = options.findIndex((v) => v.value === x);
+        if (matchIndex < 0) {
+          state.othersText = x;
+          !resArr.includes("other") && resArr.push("other");
+          continue;
+        }
+        let res = (_a2 = options[matchIndex]) == null ? void 0 : _a2.key;
+        if (resArr.indexOf(res) < 0) {
+          resArr.push(res);
+        }
+      }
+      state.curCheckboxValue = resArr;
+      handleCheckboxOther();
+    };
     const handleCheckboxDef = (item, curValue, options) => {
       var _a2;
       state.curOptions = handleOptions(options);
@@ -121,7 +162,11 @@ var scriptCheckbox = defineComponent({
       } else {
         defVal = valueDef;
       }
-      handleCheckboxDef(value, value.dbValue || defVal, options);
+      if (props.inputLock) {
+        handleCheckboxDefModal(value, value.dbValue || defVal, options);
+      } else {
+        handleCheckboxDef(value, value.dbValue || defVal, options);
+      }
     };
     watch(() => props.item, (value) => {
       if (!value || !Object.keys(value).length)
@@ -156,7 +201,7 @@ var scriptCheckbox = defineComponent({
         "size": "24",
         "color": "#fff",
         "component": SearchOutline,
-        "on-click": () => handlePreview(o.imageUrl)
+        "onClick": (e) => handlePreview(e, o.imageUrl)
       }, null)])]);
     };
     const renderPresuffix = (o, i) => {
@@ -170,7 +215,7 @@ var scriptCheckbox = defineComponent({
       }, [o.prefix]), createVNode(resolveComponent("n-input"), {
         "value": state.optionsPreSuffixObj[o.key],
         "onUpdate:value": ($event) => state.optionsPreSuffixObj[o.key] = $event,
-        "disabled": props.isLock,
+        "disabled": props.isLock || props.inputLock,
         "style": {
           color: choiceColor.value(o)
         },
@@ -195,7 +240,7 @@ var scriptCheckbox = defineComponent({
       return createVNode(resolveComponent("n-input"), {
         "value": state.othersText,
         "onUpdate:value": [($event) => state.othersText = $event, () => handleCheckboxOther(true)],
-        "disabled": props.isLock,
+        "disabled": props.isLock || props.inputLock,
         "style": {
           color: choiceColor.value(o)
         },

package/es/packages/scale-view/src/components/formitem/{r-collection.mjs → r-collection.js}

@@ -33,7 +33,6 @@ var RCollection = defineComponent({
       describe
     } = props.item || {};
     const options = ((_b = props.item) == null ? void 0 : _b.setting) || {};
-    console.log(props.item);
     const className = computed(() => {
       const type2 = options.promptType;
       return type2 ? `is-${type2}` : "";
@@ -67,8 +66,7 @@ var RCollection = defineComponent({
         "class": ["prompt-message", "c-scale-collection", className.value]
       }, [showIcon.value && createVNode(NIcon, {
         "class": "prompt-icon",
-        "size": "24",
-        "color": "#fff",
+        "size": "20",
         "component": AlertCircleOutline
       }, null), createVNode("div", {
         "class": "prompt-message-content "

package/es/packages/scale-view/src/components/formitem/{r-datetime.mjs → r-datetime.js}

@@ -1,6 +1,6 @@
 import { defineComponent, reactive, computed, createVNode, resolveComponent, createTextVNode } from 'vue';
 import { NTimePicker, NDatePicker } from 'naive-ui';
-import vexutils from 'cnhis-design-vue/es/src/utils/vexutils';
+import vexutils from '../../../../../src/utils/vexutils';
 import moment from 'moment';
 
 var scriptDatetime = defineComponent({
@@ -31,7 +31,8 @@ var scriptDatetime = defineComponent({
     const dateType = type === "DATE" ? "date" : (_e = (_d = props.item) == null ? void 0 : _d.setting) == null ? void 0 : _e.dateType;
     const timeFormat = "HH:mm:ss";
     const state = reactive({
-      rangeValue: [null, null]
+      rangeValue: [null, null],
+      dateValue: null
     });
     const useDateRangeType = computed(() => {
       if (dateType == "datetime")
@@ -39,13 +40,16 @@ var scriptDatetime = defineComponent({
       return "daterange";
     });
     const defaultValue = (val) => {
+      console.log(val, "time---val---");
       vexutils.isJSON(val) && (val = JSON.parse(val));
-      if (vexutils.isEmpty(val))
+      if (!val || vexutils.isEmpty(val))
         return;
       let value = JSON.parse(JSON.stringify(val));
       if (type === "TIME" || dateType == "time") {
-        if (startToStop != 1)
+        if (startToStop != 1) {
+          state.dateValue = val;
           return;
+        }
         if (!Array.isArray(value) || !value.length)
           return;
         let val0 = value[0] ? moment(value[0], timeFormat).valueOf() : "";
@@ -54,6 +58,8 @@ var scriptDatetime = defineComponent({
         let eV = val1 ? vexutils.isValidDate(new Date(val1)) ? val1 : null : null;
         state.rangeValue = [sV, eV];
         return;
+      } else {
+        state.dateValue = val;
       }
     };
     const disStartHours = (hour) => {
@@ -134,12 +140,16 @@ var scriptDatetime = defineComponent({
       }
       context.emit("scaleChange", [otherVal || "", formattedValue], props.item);
     };
+    const changeDate = (val, formattedValue) => {
+      context.emit("scaleChange", formattedValue, props.item);
+    };
     const renderTime = () => {
       return createVNode(resolveComponent("n-time-picker"), {
-        "formatted-value": props.form[props.item.val_key],
-        "onUpdate:formatted-value": ($event) => props.form[props.item.val_key] = $event,
+        "formatted-value": state.dateValue,
+        "onUpdate:formatted-value": ($event) => state.dateValue = $event,
         "clearable": true,
-        "disabled": props.isLock
+        "disabled": props.isLock,
+        "onUpdate:value": changeDate
       }, null);
     };
     const renderTimeRange = () => {
@@ -165,20 +175,22 @@ var scriptDatetime = defineComponent({
     };
     const renderDate = () => {
       return createVNode(resolveComponent("n-date-picker"), {
-        "formatted-value": props.form[props.item.val_key],
-        "onUpdate:formatted-value": ($event) => props.form[props.item.val_key] = $event,
+        "formatted-value": state.dateValue,
+        "onUpdate:formatted-value": ($event) => state.dateValue = $event,
         "type": dateType,
         "clearable": true,
-        "disabled": props.isLock
+        "disabled": props.isLock,
+        "onUpdate:value": changeDate
       }, null);
     };
     const renderDateRange = () => {
       return createVNode(resolveComponent("n-date-picker"), {
-        "formatted-value": props.form[props.item.val_key],
-        "onUpdate:formatted-value": ($event) => props.form[props.item.val_key] = $event,
+        "formatted-value": state.dateValue,
+        "onUpdate:formatted-value": ($event) => state.dateValue = $event,
         "type": useDateRangeType.value,
         "clearable": true,
-        "disabled": props.isLock
+        "disabled": props.isLock,
+        "onUpdate:value": changeDate
       }, null);
     };
     defaultValue(props.form[props.item.val_key]);