@zscreate/form-component 1.1.707 → 1.1.708

package/dist/form-component.css

@@ -3900,14 +3900,14 @@ span.CodeMirror-selectedtext { background: none; }
   align-items: center;
 }
 
-.title[data-v-7931a7e0] {
+.title[data-v-37de697e] {
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
   max-width: 620px;
   margin-right: 10px;
 }
-.dataTableSet[data-v-7931a7e0] .ant-table-placeholder {
+.dataTableSet[data-v-37de697e] .ant-table-placeholder {
   border-left: none !important;
   border-right: none !important;
   border-bottom: none !important;
@@ -3915,28 +3915,28 @@ span.CodeMirror-selectedtext { background: none; }
   padding-top: var(--paddingTop) !important;
   width: 99% !important;
 }
-.dataSetFormItem[data-v-7931a7e0] .ant-form-item-control {
+.dataSetFormItem[data-v-37de697e] .ant-form-item-control {
   margin: 0 !important;
   width: 100% !important;
 }
-.dataSetFormItem[data-v-7931a7e0] .ant-form-item-control-wrapper {
+.dataSetFormItem[data-v-37de697e] .ant-form-item-control-wrapper {
   display: initial !important;
 }
-.dataTableSet[data-v-7931a7e0] table {
+.dataTableSet[data-v-37de697e] table {
   border-left: none !important;
   border-right: none !important;
 }
-.dataSetFormItem[data-v-7931a7e0] .ant-form-explain {
+.dataSetFormItem[data-v-37de697e] .ant-form-explain {
   top: 49px !important;
   left: 50% !important;
 }
-.dataSetFormItem[data-v-7931a7e0] .ant-form-item-control-wrapper {
+.dataSetFormItem[data-v-37de697e] .ant-form-item-control-wrapper {
   width: 100% !important;
 }
-.dataTableSet[data-v-7931a7e0] .ant-table-tbody tr td:last-child {
+.dataTableSet[data-v-37de697e] .ant-table-tbody tr td:last-child {
   border-right: none !important;
 }
-.dataTableSet[data-v-7931a7e0] .ant-table-thead tr th:last-child {
+.dataTableSet[data-v-37de697e] .ant-table-thead tr th:last-child {
   border-right: none !important;
 }
 
@@ -5122,46 +5122,46 @@ div {
   align-items: center;
 }
 
-.t-border[data-v-c7b2c344] {
+.t-border[data-v-749a2baa] {
   border-right: 1px solid #333;
   border-bottom: 1px solid #333;
 }
-[data-v-c7b2c344] * {
+[data-v-749a2baa] * {
   font-size: var(--paperFontSize);
 }
-[data-v-c7b2c344] .custom_form_item {
+[data-v-749a2baa] .custom_form_item {
   height: -moz-fit-content;
   height: fit-content;
 }
-.save-pdf[data-v-c7b2c344] .ant-input {
+.save-pdf[data-v-749a2baa] .ant-input {
   border: none !important;
 }
-.save-pdf[data-v-c7b2c344] .ant-select-selection {
+.save-pdf[data-v-749a2baa] .ant-select-selection {
   border: none !important;
 }
-.save-pdf[data-v-c7b2c344] .ant-select-arrow svg {
+.save-pdf[data-v-749a2baa] .ant-select-arrow svg {
   display: none;
 }
-.save-pdf[data-v-c7b2c344] .ant-upload.ant-upload-select-picture-card {
+.save-pdf[data-v-749a2baa] .ant-upload.ant-upload-select-picture-card {
   display: none;
 }
-.save-pdf[data-v-c7b2c344] .anticon svg {
+.save-pdf[data-v-749a2baa] .anticon svg {
   display: none;
 }
-.save-pdf[data-v-c7b2c344] .ant-time-picker-input {
+.save-pdf[data-v-749a2baa] .ant-time-picker-input {
   border: none !important;
 }
-.save-pdf[data-v-c7b2c344] .ant-upload.ant-upload-select {
+.save-pdf[data-v-749a2baa] .ant-upload.ant-upload-select {
   display: none;
 }
 /**打印非固定高度标签 高度不确定bug**/
-.computed-wrap[data-v-c7b2c344] {
+.computed-wrap[data-v-749a2baa] {
   background: #f5f5f5;
 }
-.computed-wrap .item[data-v-c7b2c344] {
+.computed-wrap .item[data-v-749a2baa] {
   display: flex;
 }
-.computed-wrap .item > div[data-v-c7b2c344] {
+.computed-wrap .item > div[data-v-749a2baa] {
   height: 35px;
   line-height: 35px;
   flex: 1;
@@ -5169,130 +5169,130 @@ div {
   border-bottom: 1px solid #000;
   text-align: center;
 }
-.computed-wrap .item > div + div[data-v-c7b2c344] {
+.computed-wrap .item > div + div[data-v-749a2baa] {
   flex: 2;
 }
-.layout .paper[data-v-c7b2c344] {
+.layout .paper[data-v-749a2baa] {
   position: relative;
 }
-.layout .paper .form-title[data-v-c7b2c344] {
+.layout .paper .form-title[data-v-749a2baa] {
   text-align: center;
   font-weight: 600;
   font-size: 16px;
   min-height: 40px;
   line-height: 30px;
 }
-.row-item[data-v-c7b2c344] {
+.row-item[data-v-749a2baa] {
   height: -moz-fit-content;
   height: fit-content;
   /**打印非固定高度标签 高度不确定bug**/
 }
-.no-row-item[data-v-c7b2c344] {
+.no-row-item[data-v-749a2baa] {
   border-right: none;
   border-bottom: none;
 }
 /****page边框内的 ***/
-.page-border[data-v-c7b2c344] {
+.page-border[data-v-749a2baa] {
   background: #fff;
   box-sizing: border-box;
 }
-.page-border .row-item[data-v-c7b2c344]:first-child {
+.page-border .row-item[data-v-749a2baa]:first-child {
   border-top: 1px solid #000;
 }
-.page-border .row-item[data-v-c7b2c344] {
+.page-border .row-item[data-v-749a2baa] {
   border-left: 1px solid #000;
 }
-.page-border .item-bottom[data-v-c7b2c344] {
+.page-border .item-bottom[data-v-749a2baa] {
   border-bottom: 1px solid #000;
 }
-.page-border .row-item[data-v-c7b2c344]:not(:last-child) {
+.page-border .row-item[data-v-749a2baa]:not(:last-child) {
   position: relative;
 }
-.page-border li.sortable-chosen[data-v-c7b2c344] {
+.page-border li.sortable-chosen[data-v-749a2baa] {
   height: 2px !important;
   overflow: hidden !important;
   background: red !important;
 }
-.page-border .ant-time-picker-panel[data-v-c7b2c344] {
+.page-border .ant-time-picker-panel[data-v-749a2baa] {
   z-index: 200000 !important;
 }
-.page-border .ant-calendar-picker-container[data-v-c7b2c344] {
+.page-border .ant-calendar-picker-container[data-v-749a2baa] {
   z-index: 200000 !important;
 }
-[data-v-c7b2c344] .ant-time-picker-panel {
+[data-v-749a2baa] .ant-time-picker-panel {
   z-index: 9999 !important;
 }
-.ant-calendar-picker-container[data-v-c7b2c344] {
+.ant-calendar-picker-container[data-v-749a2baa] {
   z-index: 200000 !important;
 }
-[data-v-c7b2c344] .ant-form-item-children {
+[data-v-749a2baa] .ant-form-item-children {
   display: block;
 }
-[data-v-c7b2c344] .ant-form-item {
+[data-v-749a2baa] .ant-form-item {
   width: 100%;
   height: 100%;
   margin-bottom: 0;
   display: flex;
 }
-[data-v-c7b2c344] .ant-form-item .is_required::before {
+[data-v-749a2baa] .ant-form-item .is_required::before {
   content: "*";
   color: #f56c6c;
   margin-right: 4px;
 }
-[data-v-c7b2c344] .ant-form-item .ant-form-item-label {
+[data-v-749a2baa] .ant-form-item .ant-form-item-label {
   border-right: 1px solid #000;
 }
-[data-v-c7b2c344] .ant-form-item .ant-form-item-label label {
+[data-v-749a2baa] .ant-form-item .ant-form-item-label label {
   display: flex;
   justify-content: center;
   align-items: center;
   height: 100%;
 }
-[data-v-c7b2c344] .ant-form-item .ant-form-item-label > label.ant-form-item-no-colon::after {
+[data-v-749a2baa] .ant-form-item .ant-form-item-label > label.ant-form-item-no-colon::after {
   display: none;
 }
-[data-v-c7b2c344] .ant-form-item .ant-form-item-control-wrapper {
+[data-v-749a2baa] .ant-form-item .ant-form-item-control-wrapper {
   display: flex;
   align-items: center;
   text-align: left;
 }
-[data-v-c7b2c344] .ant-form-item .ant-form-item-control {
+[data-v-749a2baa] .ant-form-item .ant-form-item-control {
   width: 98%;
   margin: 0 auto;
 }
-[data-v-c7b2c344] .ant-form-item .is_required::before {
+[data-v-749a2baa] .ant-form-item .is_required::before {
   content: "*";
   color: #f56c6c;
   margin-right: 4px;
 }
-.row-table[data-v-c7b2c344] {
+.row-table[data-v-749a2baa] {
   display: flex;
 }
-.row-table[data-v-c7b2c344] .ant-spin-container,
-.row-table[data-v-c7b2c344] {
+.row-table[data-v-749a2baa] .ant-spin-container,
+.row-table[data-v-749a2baa] {
   display: flex;
   width: 100%;
 }
-.row-table[data-v-c7b2c344] .ant-spin-container .table-left,
-.row-table .table-left[data-v-c7b2c344] {
+.row-table[data-v-749a2baa] .ant-spin-container .table-left,
+.row-table .table-left[data-v-749a2baa] {
   width: 100px;
   text-align: center;
   border-right: 1px solid #333;
   border-bottom: 1px solid #333;
   position: relative;
 }
-.row-table[data-v-c7b2c344] .ant-spin-container .table-left p,
-.row-table .table-left p[data-v-c7b2c344] {
+.row-table[data-v-749a2baa] .ant-spin-container .table-left p,
+.row-table .table-left p[data-v-749a2baa] {
   position: absolute;
   top: 50%;
   left: 50%;
   transform: translate(-50%, -50%);
 }
-.row-table[data-v-c7b2c344] .ant-spin-container .table-right,
-.row-table .table-right[data-v-c7b2c344] {
+.row-table[data-v-749a2baa] .ant-spin-container .table-right,
+.row-table .table-right[data-v-749a2baa] {
   flex: 1;
 }
-.table-content[data-v-c7b2c344] {
+.table-content[data-v-749a2baa] {
   width: 100%;
   height: 40px;
   line-height: 40px;
@@ -5301,11 +5301,11 @@ div {
   border-bottom: 1px solid #333;
   border-right: 1px solid #333;
 }
-.sub-table-col[data-v-c7b2c344] {
+.sub-table-col[data-v-749a2baa] {
   display: flex;
   box-sizing: border-box;
 }
-.sub-table-col > span[data-v-c7b2c344] {
+.sub-table-col > span[data-v-749a2baa] {
   flex: 2;
   border-bottom: 1px solid #000;
   border-right: 1px solid #000;
@@ -5313,34 +5313,34 @@ div {
   line-height: 40px;
   text-align: center;
 }
-.sub-table-col > .last-one[data-v-c7b2c344] {
+.sub-table-col > .last-one[data-v-749a2baa] {
   width: 87px;
   flex: 0 0 87px;
   border-right: 1px solid #333;
   border-bottom: 1px solid #333;
 }
-.sub-table-col-no-border > span[data-v-c7b2c344] {
+.sub-table-col-no-border > span[data-v-749a2baa] {
   border: none;
   height: auto;
   width: 0;
 }
-.sub-table-col-no-border > .sub-table-title[data-v-c7b2c344]:last-child,
-.sub-table-col-no-border > .sub-table-item[data-v-c7b2c344]:last-child {
+.sub-table-col-no-border > .sub-table-title[data-v-749a2baa]:last-child,
+.sub-table-col-no-border > .sub-table-item[data-v-749a2baa]:last-child {
   border-right: none !important;
 }
-.sub-table-col-no-border > .last-one[data-v-c7b2c344] {
+.sub-table-col-no-border > .last-one[data-v-749a2baa] {
   width: 87px;
   flex: 0 0 87px;
   display: flex;
   justify-content: center;
   align-items: center;
 }
-.pagiAfter + .row-item[data-v-c7b2c344] {
+.pagiAfter + .row-item[data-v-749a2baa] {
   border-top-width: 1px;
   border-top-style: solid;
 }
 /* 选择所有后面还有其他非.hiddenWidget的.row-item元素的.hasWidgetAfter */
-.row-item:not(:last-child) .hasWidgetAfter[data-v-c7b2c344] {
+.row-item:not(:last-child) .hasWidgetAfter[data-v-749a2baa] {
   /* 为这些.hasWidgetAfter设置样式 */
   width: calc(100% + 1px);
   border-left-width: 1px;
@@ -5349,7 +5349,7 @@ div {
   border-right-style: solid;
   left: -1px;
 }
-.row-item:not(:last-child):has(+ .row-item.hiddenWidget) .hasWidgetAfter[data-v-c7b2c344] {
+.row-item:not(:last-child):has(+ .row-item.hiddenWidget) .hasWidgetAfter[data-v-749a2baa] {
   /* 为这些.hasWidgetAfter设置样式 */
   width: calc(100% + 1px);
   border-left: none;
@@ -5357,33 +5357,33 @@ div {
   left: -1px;
 }
 /*****无border *****/
-.no-border .page-border[data-v-c7b2c344] {
+.no-border .page-border[data-v-749a2baa] {
   border: none;
 }
-.no-border .page-border .row-item[data-v-c7b2c344]:not(:last-child) {
+.no-border .page-border .row-item[data-v-749a2baa]:not(:last-child) {
   border: none;
 }
-.no-border .page-border[data-v-c7b2c344] .ant-form-item .ant-form-item-label {
+.no-border .page-border[data-v-749a2baa] .ant-form-item .ant-form-item-label {
   border: none;
 }
-.table_border[data-v-c7b2c344] {
+.table_border[data-v-749a2baa] {
   border-bottom: 0;
   border-right: 0;
 }
 /*****无border *****/
-[data-v-c7b2c344] .ant-form-item-children > div > p,[data-v-c7b2c344] .ant-form-item-children > div > h1,[data-v-c7b2c344] .ant-form-item-children > div > h2,[data-v-c7b2c344] .ant-form-item-children > div > h3,[data-v-c7b2c344] .ant-form-item-children > div > h4,[data-v-c7b2c344] .ant-form-item-children > div > h5,[data-v-c7b2c344] .ant-form-item-children > div > table /deep/ .ant-form-item-children > div > pre {
+[data-v-749a2baa] .ant-form-item-children > div > p,[data-v-749a2baa] .ant-form-item-children > div > h1,[data-v-749a2baa] .ant-form-item-children > div > h2,[data-v-749a2baa] .ant-form-item-children > div > h3,[data-v-749a2baa] .ant-form-item-children > div > h4,[data-v-749a2baa] .ant-form-item-children > div > h5,[data-v-749a2baa] .ant-form-item-children > div > table /deep/ .ant-form-item-children > div > pre {
   margin: 10px 0;
   line-height: 1.5;
 }
-[data-v-c7b2c344] .ant-spin-dot {
+[data-v-749a2baa] .ant-spin-dot {
   font-size: 20px !important;
 }
-.form_skeleton[data-v-c7b2c344] {
+.form_skeleton[data-v-749a2baa] {
   display: block;
   width: 700px;
   margin: 55px auto;
 }
-.form_skeleton[data-v-c7b2c344] .ant-skeleton-title {
+.form_skeleton[data-v-749a2baa] .ant-skeleton-title {
   margin: 0 auto;
 }
 

package/dist/form-component.umd.js

@@ -71309,7 +71309,7 @@ let getFileExt = filename => {
 /* harmony import */ var _util_mathUtils__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(29414);
 /* harmony import */ var _util_util__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(78393);
 /* harmony import */ var _layoutItem__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(92241);
-/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(96718);
+/* harmony import */ var _components_index__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(15062);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(15934);
 /* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_19___default = /*#__PURE__*/__webpack_require__.n(pubsub_js__WEBPACK_IMPORTED_MODULE_19__);
 /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(9274);
@@ -72450,7 +72450,7 @@ let getFileExt = filename => {
         }
         this.tableModel[tableModel] = gen;
         this.tableModel[tableModel]["options"]["defaultValue"] = this.models[gen.model];
-        if (gen.options.defaultAddRow && (!this.models[gen.model] || Array.isArray(this.models[gen.model]) && this.models[gen.model].length === 0)) {
+        if (gen.options.defaultAddRow && !gen.options.disabled && (!this.models[gen.model] || Array.isArray(this.models[gen.model]) && this.models[gen.model].length === 0)) {
           this.addToTableData(gen, gen.model, 'addModel');
         }
         this.tableInitByModel(tableModel);
@@ -73042,6 +73042,8 @@ let getFileExt = filename => {
             }
           })];
           this.rules[widget.model] = rules;
+        } else if (widget.options && (widget.options.minValue || widget.options.maxValue)) {
+          this.rules[widget.model] = [];
         }
       }
     },
@@ -76146,23 +76148,26 @@ const API = '/form/formdesiger/countLeaveDays';
 /* harmony import */ var core_js_modules_es_iterator_map_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_iterator_map_js__WEBPACK_IMPORTED_MODULE_6__);
 /* harmony import */ var core_js_modules_es_iterator_reduce_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(19818);
 /* harmony import */ var core_js_modules_es_iterator_reduce_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_iterator_reduce_js__WEBPACK_IMPORTED_MODULE_7__);
-/* harmony import */ var core_js_modules_es_json_parse_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(4609);
-/* harmony import */ var core_js_modules_es_json_parse_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_parse_js__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(94111);
-/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_9__);
-/* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(62691);
-/* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_10__);
-/* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(15934);
-/* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(pubsub_js__WEBPACK_IMPORTED_MODULE_11__);
-/* harmony import */ var _form_api_manage__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(5335);
-/* harmony import */ var _validateByApiMinxins__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(24096);
-/* harmony import */ var _zscreate_formula__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(64257);
-/* harmony import */ var _zscreate_formula__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(_zscreate_formula__WEBPACK_IMPORTED_MODULE_14__);
-/* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(76391);
-/* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(moment__WEBPACK_IMPORTED_MODULE_15__);
-/* harmony import */ var lodash_es__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(44150);
-/* harmony import */ var lodash_es__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(64461);
-/* harmony import */ var _form_utils_util__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(97031);
+/* harmony import */ var core_js_modules_es_iterator_some_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(89312);
+/* harmony import */ var core_js_modules_es_iterator_some_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_iterator_some_js__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var core_js_modules_es_json_parse_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(4609);
+/* harmony import */ var core_js_modules_es_json_parse_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_parse_js__WEBPACK_IMPORTED_MODULE_9__);
+/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(94111);
+/* harmony import */ var core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_json_stringify_js__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(62691);
+/* harmony import */ var core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_replace_all_js__WEBPACK_IMPORTED_MODULE_11__);
+/* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(15934);
+/* harmony import */ var pubsub_js__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(pubsub_js__WEBPACK_IMPORTED_MODULE_12__);
+/* harmony import */ var _form_api_manage__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(5335);
+/* harmony import */ var _validateByApiMinxins__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(24096);
+/* harmony import */ var _zscreate_formula__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(64257);
+/* harmony import */ var _zscreate_formula__WEBPACK_IMPORTED_MODULE_15___default = /*#__PURE__*/__webpack_require__.n(_zscreate_formula__WEBPACK_IMPORTED_MODULE_15__);
+/* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(76391);
+/* harmony import */ var moment__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(moment__WEBPACK_IMPORTED_MODULE_16__);
+/* harmony import */ var lodash_es__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(44150);
+/* harmony import */ var lodash_es__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(64461);
+/* harmony import */ var _form_utils_util__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(97031);
+
 
 
 
@@ -76225,7 +76230,7 @@ __webpack_require__.g.dictData = {};
       default: false
     }
   },
-  mixins: [_validateByApiMinxins__WEBPACK_IMPORTED_MODULE_13__/* ["default"] */ .A],
+  mixins: [_validateByApiMinxins__WEBPACK_IMPORTED_MODULE_14__/* ["default"] */ .A],
   data() {
     return {
       pubsubSign: null,
@@ -76325,7 +76330,7 @@ __webpack_require__.g.dictData = {};
     currUserInfo() {
       var _this$formContext2;
       const currUserInfo = this === null || this === void 0 || (_this$formContext2 = this.formContext) === null || _this$formContext2 === void 0 ? void 0 : _this$formContext2.currUserInfo;
-      return (0,lodash_es__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .A)(currUserInfo) ? undefined : currUserInfo;
+      return (0,lodash_es__WEBPACK_IMPORTED_MODULE_18__/* ["default"] */ .A)(currUserInfo) ? undefined : currUserInfo;
     },
     isDisabled() {
       return !this.isdisabled && this.widget.options.disabled;
@@ -76429,7 +76434,7 @@ __webpack_require__.g.dictData = {};
     }
   },
   methods: {
-    publish: (pubsub_js__WEBPACK_IMPORTED_MODULE_11___default().publish),
+    publish: (pubsub_js__WEBPACK_IMPORTED_MODULE_12___default().publish),
     // 发布方法
     parseInt: parseInt,
     // 取整
@@ -76439,16 +76444,20 @@ __webpack_require__.g.dictData = {};
       if (widget.options.maxValue || widget.options.minValue) {
         if (this.tableKey) {
           if (!this.rules[this.tableKey][this.widget.model]) this.rules[this.tableKey][this.widget.model] = [];
-          this.rules[this.tableKey][this.widget.model].push({
-            validator: this.validateNumRange,
-            trigger: "change"
-          });
+          if (!this.rules[this.tableKey][this.widget.model].some(r => r.validator === this.validateNumRange)) {
+            this.rules[this.tableKey][this.widget.model].push({
+              validator: this.validateNumRange,
+              trigger: "change"
+            });
+          }
         } else {
           if (!this.rules[this.widget.model]) this.rules[this.widget.model] = [];
-          this.rules[this.widget.model].push({
-            validator: this.validateNumRange,
-            trigger: "change"
-          });
+          if (!this.rules[this.widget.model].some(r => r.validator === this.validateNumRange)) {
+            this.rules[this.widget.model].push({
+              validator: this.validateNumRange,
+              trigger: "change"
+            });
+          }
         }
       } else {
         // 清空最多最少选
@@ -76459,7 +76468,7 @@ __webpack_require__.g.dictData = {};
         // }
       }
     },
-    timeout: _form_utils_util__WEBPACK_IMPORTED_MODULE_18__.timeout,
+    timeout: _form_utils_util__WEBPACK_IMPORTED_MODULE_19__.timeout,
     async validateNumRange(rule, value, callback) {
       await this.timeout(0);
       // rule.field.split('.')[1]修复this.tableIndex拿到的不对的问题，待排查☆
@@ -76580,7 +76589,7 @@ __webpack_require__.g.dictData = {};
       this.initFormLinkage(); //初始化联动
     },
     initFormLinkage() {
-      this.publish_linkage = pubsub_js__WEBPACK_IMPORTED_MODULE_11___default().subscribe('formLinkage_' + this.widget.model, (key, data) => {
+      this.publish_linkage = pubsub_js__WEBPACK_IMPORTED_MODULE_12___default().subscribe('formLinkage_' + this.widget.model, (key, data) => {
         // console.log(key, data)
         if (data.type === 'update') {
           /** 某些值不能变为空字符串，只能变为空数组 */
@@ -76601,7 +76610,7 @@ __webpack_require__.g.dictData = {};
       });
     },
     m_subscribe(key, val) {
-      if (!(pubsub_js__WEBPACK_IMPORTED_MODULE_11___default().calc_record)) (pubsub_js__WEBPACK_IMPORTED_MODULE_11___default().calc_record) = {};
+      if (!(pubsub_js__WEBPACK_IMPORTED_MODULE_12___default().calc_record)) (pubsub_js__WEBPACK_IMPORTED_MODULE_12___default().calc_record) = {};
     },
     calc_run(isFirstRun, msgData = {}) {
       let invalids = false;
@@ -76619,7 +76628,7 @@ __webpack_require__.g.dictData = {};
       const keys = Object.keys(models);
       const formulaModels = keys.reduce((prev, curr) => {
         const key = `_widget_${curr}`;
-        prev[key] = (0,lodash_es__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .A)(models[curr]);
+        prev[key] = (0,lodash_es__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .A)(models[curr]);
         const tableDatas = tableArr.filter(item => item[0] === key);
         if (tableDatas && Array.isArray(models[curr])) {
           tableDatas.forEach(tableData => {
@@ -76642,12 +76651,12 @@ __webpack_require__.g.dictData = {};
         ...msgData,
         that: this
       };
-      let result = _zscreate_formula__WEBPACK_IMPORTED_MODULE_14__.FormulaInstance.RUN(formula, formulaModels);
+      let result = _zscreate_formula__WEBPACK_IMPORTED_MODULE_15__.FormulaInstance.RUN(formula, formulaModels);
       if ([NaN].includes(result)) {
         result = '';
       }
       if (Object.prototype.toString.call(result).includes('Date')) {
-        result = moment__WEBPACK_IMPORTED_MODULE_15___default()(result).format(this.widget.options.format || 'YYYY-MM-DD');
+        result = moment__WEBPACK_IMPORTED_MODULE_16___default()(result).format(this.widget.options.format || 'YYYY-MM-DD');
       }
       console.log('result: ', result);
       this.dataModel = result;
@@ -76676,7 +76685,7 @@ __webpack_require__.g.dictData = {};
         }, 100);
         relyWidgets.forEach(item => {
           if (item.includes('.')) item = item.split('.').slice(-1)[0];
-          pubsub_js__WEBPACK_IMPORTED_MODULE_11___default().subscribe('calc_' + item.replace('_widget_', ''), (key, data) => {
+          pubsub_js__WEBPACK_IMPORTED_MODULE_12___default().subscribe('calc_' + item.replace('_widget_', ''), (key, data) => {
             setTimeout(() => {
               this.calc_run(false, data);
               console.log(this, key, data);
@@ -76692,7 +76701,7 @@ __webpack_require__.g.dictData = {};
           console.log('timecount', ++timecount);
         }
         if (["grid", "grid-lay-out", "all-lay-out", 'table'].includes(this.widget.type)) return;
-        this.pubsubSign = pubsub_js__WEBPACK_IMPORTED_MODULE_11___default().subscribe(subscribeKey, (msg, data) => {
+        this.pubsubSign = pubsub_js__WEBPACK_IMPORTED_MODULE_12___default().subscribe(subscribeKey, (msg, data) => {
           console.log('isClickByUser', data.isClickByUser);
           if (data.hasOwnProperty('updateModel') && data.updateModel) {
             // 用于脚本里面精准更新model 避免通过监听models值来更新 model
@@ -76736,7 +76745,7 @@ __webpack_require__.g.dictData = {};
     pulishMsg(val, isClickByUser = false) {
       setTimeout(() => {
         let relateOptions = this.widget.options.relateOptions;
-        pubsub_js__WEBPACK_IMPORTED_MODULE_11___default().publish('calc_' + this.widget.model, {
+        pubsub_js__WEBPACK_IMPORTED_MODULE_12___default().publish('calc_' + this.widget.model, {
           msg: {
             val
           },
@@ -76749,7 +76758,7 @@ __webpack_require__.g.dictData = {};
             let publishKey = this.tableKey ? this.tableIndex + '_' + item.publishKey : item.publishKey; //子表单联动
             if (item.isTableChild === false) publishKey = item.publishKey; // 非子表单; false 兼容之前的逻辑;  之前为 ""
             console.log("pul--form" + index);
-            pubsub_js__WEBPACK_IMPORTED_MODULE_11___default().publish(publishKey, {
+            pubsub_js__WEBPACK_IMPORTED_MODULE_12___default().publish(publishKey, {
               ...item,
               msg: val,
               isClickByUser,
@@ -76876,8 +76885,8 @@ __webpack_require__.g.dictData = {};
         } else {
           params.formDataId = '';
         }
-        let currHttpAction = _form_api_manage__WEBPACK_IMPORTED_MODULE_12__/* .getAction */ .Th;
-        if (onlyurl_type === 'POST') currHttpAction = _form_api_manage__WEBPACK_IMPORTED_MODULE_12__/* .postAction */ .vd;
+        let currHttpAction = _form_api_manage__WEBPACK_IMPORTED_MODULE_13__/* .getAction */ .Th;
+        if (onlyurl_type === 'POST') currHttpAction = _form_api_manage__WEBPACK_IMPORTED_MODULE_13__/* .postAction */ .vd;
         currHttpAction(this.widget.options.onlyurl, params).then(res => {
           if (res.result && !this.widget.options.disabled) {
             callback(new Error(res.message));
@@ -76921,10 +76930,10 @@ __webpack_require__.g.dictData = {};
   },
   destroyed() {
     if (this.pubsubSign) {
-      pubsub_js__WEBPACK_IMPORTED_MODULE_11___default().unsubscribe(this.pubsubSign);
+      pubsub_js__WEBPACK_IMPORTED_MODULE_12___default().unsubscribe(this.pubsubSign);
     }
     if (this.publish_linkage) {
-      pubsub_js__WEBPACK_IMPORTED_MODULE_11___default().unsubscribe(this.publish_linkage);
+      pubsub_js__WEBPACK_IMPORTED_MODULE_12___default().unsubscribe(this.publish_linkage);
     }
   }
 });
@@ -77127,7 +77136,7 @@ module.exports = {
 
 /***/ },
 
-/***/ 96718
+/***/ 15062
 (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -78415,7 +78424,7 @@ if(templist.includes('匹配条件字段的值')){
   components: {
     JEllipsis: JEllipsis,
     codemirror: vue_codemirror.codemirror,
-    layoutForPaper: () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 14314))
+    layoutForPaper: () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 25327))
   },
   props: {
     datalist: {
@@ -116634,9 +116643,9 @@ var DepartSelector_widgetDesign_component = (0,componentNormalizer/* default */.
   widgetSetup: DepartSelector_widgetSetup,
   widgetDesign: DepartSelector_widgetDesign
 });
-;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/DataTable/component.vue?vue&type=template&id=7931a7e0&scoped=true
-var componentvue_type_template_id_7931a7e0_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item",style:({ height: _vm.widget.options.height + 'px', overflow: 'hidden', '--paddingTop': _vm.paddingTop, 'border-bottom': _vm.isScroll ? '1px solid rgb(209, 210, 214)' : 'none' }),attrs:{"id":_vm.widget.key}},[_c('a-form-model-item',{ref:_vm.widget.model,staticClass:"dataSetFormItem",attrs:{"colon":false,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[_c('div',{style:({ width: _vm.widget.options.labelWidth + 164 + 'px', lineHeight: '50px', 'text-align': 'center', color: _vm.config.color, position: 'relative', display: 'flex', 'justify-content': 'center', 'align-items': 'center' })},[(_vm.widget.options.required)?_c('span',{staticStyle:{"color":"#f56c6c","margin-right":"4px"}},[_vm._v("*")]):_vm._e(),_c('div',{directives:[{name:"ellipsis",rawName:"v-ellipsis",value:(1),expression:"1"}],staticClass:"title"},[_vm._v(_vm._s(_vm.widget.name))]),(!_vm.widget.options.disabled)?_c('a-button',{attrs:{"type":"primary","icon":"plus","size":"small"},on:{"click":_vm.addTableData}},[_vm._v("请选择数据")]):_vm._e()],1),_c('a-table',{staticClass:"dataTableSet",attrs:{"columns":_vm.columns,"dataSource":_vm.dataSource,"bordered":!_vm.widget.options.noBorder,"pagination":false,"rowKey":_vm.widget.options.defaultTableKey,"scroll":_vm.isScroll ? { y: _vm.widget.options.height - 103 + 'px', x: _vm.columns.map(function (item) { return item.width ? item.width : 0; }).reduce(function (a, b) { return a + b; }, 0) < 751 ? false : _vm.columns.map(function (item) { return item.width ? item.width : 0; }).reduce(function (a, b) { return a + b; }, 0)  + 'px'} : { x: this.columns.map(function (item) { return item.width ? item.width : 0; }).reduce(function (a, b) { return a + b; }, 0) < 751 ? false : this.columns.map(function (item) { return item.width ? item.width : 0; }).reduce(function (a, b) { return a + b; }, 0)  + 'px' }}})],1),_c('addDataSetTable',{ref:"addDataSetTable",attrs:{"defaultId":_vm.widget.options.defaultSQL && _vm.widget.options.defaultSQL.querySql ? _vm.widget.options.defaultSQL.querySql : '',"rowKey":_vm.widget.options.defaultTableKey},on:{"ok":_vm.addTable}})],1):_vm._e()}
-var componentvue_type_template_id_7931a7e0_scoped_true_staticRenderFns = []
+;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/DataTable/component.vue?vue&type=template&id=37de697e&scoped=true
+var componentvue_type_template_id_37de697e_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.widget)?_c('div',{staticClass:"custom_form_item",style:({ height: _vm.widget.options.height + 'px', overflow: 'hidden', '--paddingTop': _vm.paddingTop, 'border-bottom': _vm.isScroll ? '1px solid rgb(209, 210, 214)' : 'none' }),attrs:{"id":_vm.widget.key}},[_c('a-form-model-item',{ref:_vm.widget.model,staticClass:"dataSetFormItem",attrs:{"colon":false,"wrapperCol":_vm.wrapperCol,"prop":_vm.tableKey ? (_vm.tableKey + "." + _vm.tableIndex + "." + (_vm.widget.model)) : _vm.widget.model,"rules":_vm.tableKey ? _vm.rules[_vm.tableKey][_vm.widget.model] : _vm.rules[_vm.widget.model]}},[_c('div',{style:({ width: _vm.widget.options.labelWidth + 164 + 'px', lineHeight: '50px', 'text-align': 'center', color: _vm.config.color, position: 'relative', display: 'flex', 'justify-content': 'center', 'align-items': 'center' })},[(_vm.widget.options.required)?_c('span',{staticStyle:{"color":"#f56c6c","margin-right":"4px"}},[_vm._v("*")]):_vm._e(),_c('div',{directives:[{name:"ellipsis",rawName:"v-ellipsis",value:(1),expression:"1"}],staticClass:"title"},[_vm._v(_vm._s(_vm.widget.name))]),(!_vm.widget.options.disabled)?_c('a-button',{attrs:{"type":"primary","icon":"plus","size":"small"},on:{"click":_vm.addTableData}},[_vm._v("请选择数据")]):_vm._e()],1),_c('a-table',{staticClass:"dataTableSet",attrs:{"columns":_vm.columns,"dataSource":_vm.dataSource,"bordered":!_vm.widget.options.noBorder,"pagination":false,"rowKey":_vm.widget.options.defaultTableKey,"scroll":_vm.isScroll ? { y: _vm.widget.options.height - 103 + 'px', x: _vm.columns.map(function (item) { return item.width ? item.width : 0; }).reduce(function (a, b) { return a + b; }, 0) < 751 ? false : _vm.columns.map(function (item) { return item.width ? item.width : 0; }).reduce(function (a, b) { return a + b; }, 0)  + 'px'} : { x: this.columns.map(function (item) { return item.width ? item.width : 0; }).reduce(function (a, b) { return a + b; }, 0) < 751 ? false : this.columns.map(function (item) { return item.width ? item.width : 0; }).reduce(function (a, b) { return a + b; }, 0)  + 'px' }}})],1),_c('addDataSetTable',{ref:"addDataSetTable",attrs:{"defaultId":_vm.widget.options.defaultSQL && _vm.widget.options.defaultSQL.querySql ? _vm.widget.options.defaultSQL.querySql : '',"rowKey":_vm.widget.options.defaultTableKey},on:{"ok":_vm.addTable}})],1):_vm._e()}
+var componentvue_type_template_id_37de697e_scoped_true_staticRenderFns = []
 
 
 ;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/addDataSetTable.vue?vue&type=template&id=00aabf06&scoped=true
@@ -116993,7 +117002,7 @@ var addDataSetTable_component = (0,componentNormalizer/* default */.A)(
       confirmLoading: false,
       departNames: "",
       departIds: "",
-      dataModel: "",
+      dataModel: [],
       dataSource: [],
       columns: []
     };
@@ -117145,10 +117154,10 @@ var addDataSetTable_component = (0,componentNormalizer/* default */.A)(
 });
 ;// ./src/form/modules/components/DataTable/component.vue?vue&type=script&lang=js
  /* harmony default export */ const components_DataTable_componentvue_type_script_lang_js = (DataTable_componentvue_type_script_lang_js); 
-;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/DataTable/component.vue?vue&type=style&index=0&id=7931a7e0&prod&lang=less&scoped=true
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/DataTable/component.vue?vue&type=style&index=0&id=37de697e&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/components/DataTable/component.vue?vue&type=style&index=0&id=7931a7e0&prod&lang=less&scoped=true
+;// ./src/form/modules/components/DataTable/component.vue?vue&type=style&index=0&id=37de697e&prod&lang=less&scoped=true
 
 ;// ./src/form/modules/components/DataTable/component.vue
 
@@ -117161,19 +117170,19 @@ var addDataSetTable_component = (0,componentNormalizer/* default */.A)(
 
 var DataTable_component_component = (0,componentNormalizer/* default */.A)(
   components_DataTable_componentvue_type_script_lang_js,
-  componentvue_type_template_id_7931a7e0_scoped_true_render,
-  componentvue_type_template_id_7931a7e0_scoped_true_staticRenderFns,
+  componentvue_type_template_id_37de697e_scoped_true_render,
+  componentvue_type_template_id_37de697e_scoped_true_staticRenderFns,
   false,
   null,
-  "7931a7e0",
+  "37de697e",
   null
   
 )
 
 /* harmony default export */ const DataTable_component = (DataTable_component_component.exports);
-;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/DataTable/widgetSetup.vue?vue&type=template&id=41a14e6e&scoped=true
-var widgetSetupvue_type_template_id_41a14e6e_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"control"},[_c('div',{staticClass:"form_wrap"},[_c('div',{staticClass:"form"},[_c('a-form-model-item',{ref:"title",attrs:{"label":"默认值","prop":"title"}},[_c('div',[_c('a-button',{attrs:{"type":"primary","disabled":_vm.isFormDesignSQL},on:{"click":_vm.openDefaultValueWithSql}},[_vm._v("关联数据集")])],1)]),_c('a-form-model-item',{attrs:{"label":"字段联动"}},[_c('a-button',{attrs:{"type":"primary"},on:{"click":_vm.showModal}},[_vm._v("联动配置")])],1),_c('a-form-model-item',{attrs:{"label":"数据集唯一key"}},[_c('a-input',{model:{value:(_vm.widget.options.defaultTableKey),callback:function ($$v) {_vm.$set(_vm.widget.options, "defaultTableKey", $$v)},expression:"widget.options.defaultTableKey"}})],1),_c('a-form-model-item',{attrs:{"label":"是否单选"}},[_c('a-switch',{model:{value:(_vm.widget.options.radio),callback:function ($$v) {_vm.$set(_vm.widget.options, "radio", $$v)},expression:"widget.options.radio"}})],1)],1),_c('form-data-bind-modal',{ref:"formDataBindModal",on:{"okSubStr":_vm.okSubStr}}),_c('relate-sub-modal',{ref:"relateSubModal",attrs:{"datalist":_vm.datalist,"widget":_vm.widget},on:{"okSubStr":_vm.okSubStr}}),_c('select-role-modal',{ref:"selectRoleModal",on:{"ok":_vm.handleRoleOk}}),_c('datasetManagement',{ref:"datasetManagement",on:{"setDateOk":_vm.setDateOk}})],1)])}
-var widgetSetupvue_type_template_id_41a14e6e_scoped_true_staticRenderFns = []
+;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/DataTable/widgetSetup.vue?vue&type=template&id=25c062f0&scoped=true
+var widgetSetupvue_type_template_id_25c062f0_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"control"},[_c('div',{staticClass:"form_wrap"},[_c('div',{staticClass:"form"},[_c('a-form-model-item',{ref:"title",attrs:{"label":"默认值","prop":"title"}},[_c('div',[_c('a-button',{attrs:{"type":"primary","disabled":_vm.isFormDesignSQL},on:{"click":_vm.openDefaultValueWithSql}},[_vm._v("关联数据集")])],1)]),_c('a-form-model-item',{attrs:{"label":"字段联动"}},[_c('a-button',{attrs:{"type":"primary"},on:{"click":_vm.showModal}},[_vm._v("联动配置")])],1),_c('a-form-model-item',{attrs:{"label":"数据集唯一key"}},[_c('a-input',{model:{value:(_vm.widget.options.defaultTableKey),callback:function ($$v) {_vm.$set(_vm.widget.options, "defaultTableKey", $$v)},expression:"widget.options.defaultTableKey"}})],1),_c('a-form-model-item',{attrs:{"label":"是否单选"}},[_c('a-switch',{model:{value:(_vm.widget.options.radio),callback:function ($$v) {_vm.$set(_vm.widget.options, "radio", $$v)},expression:"widget.options.radio"}})],1),_c('a-form-model-item',{attrs:{"label":"规则配置"}},[_c('a-input-number',{staticStyle:{"width":"45%"},attrs:{"min":1,"precision":0,"placeholder":"最少选"},model:{value:(_vm.widget.options.minValue),callback:function ($$v) {_vm.$set(_vm.widget.options, "minValue", $$v)},expression:"widget.options.minValue"}}),_vm._v(" - "),_c('a-input-number',{staticStyle:{"width":"45%"},attrs:{"min":Number(_vm.widget.options.minValue || 1),"precision":0,"placeholder":"最多选"},model:{value:(_vm.widget.options.maxValue),callback:function ($$v) {_vm.$set(_vm.widget.options, "maxValue", $$v)},expression:"widget.options.maxValue"}})],1)],1),_c('form-data-bind-modal',{ref:"formDataBindModal",on:{"okSubStr":_vm.okSubStr}}),_c('relate-sub-modal',{ref:"relateSubModal",attrs:{"datalist":_vm.datalist,"widget":_vm.widget},on:{"okSubStr":_vm.okSubStr}}),_c('select-role-modal',{ref:"selectRoleModal",on:{"ok":_vm.handleRoleOk}}),_c('datasetManagement',{ref:"datasetManagement",on:{"setDateOk":_vm.setDateOk}})],1)])}
+var widgetSetupvue_type_template_id_25c062f0_scoped_true_staticRenderFns = []
 
 
 ;// ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.4.1@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/components/DataTable/widgetSetup.vue?vue&type=script&lang=js
@@ -117215,6 +117224,11 @@ var widgetSetupvue_type_template_id_41a14e6e_scoped_true_staticRenderFns = []
 //
 //
 //
+//
+//
+//
+//
+//
 //
 
 
@@ -117330,11 +117344,11 @@ var widgetSetupvue_type_template_id_41a14e6e_scoped_true_staticRenderFns = []
 ;
 var DataTable_widgetSetup_component = (0,componentNormalizer/* default */.A)(
   components_DataTable_widgetSetupvue_type_script_lang_js,
-  widgetSetupvue_type_template_id_41a14e6e_scoped_true_render,
-  widgetSetupvue_type_template_id_41a14e6e_scoped_true_staticRenderFns,
+  widgetSetupvue_type_template_id_25c062f0_scoped_true_render,
+  widgetSetupvue_type_template_id_25c062f0_scoped_true_staticRenderFns,
   false,
   null,
-  "41a14e6e",
+  "25c062f0",
   null
   
 )
@@ -135541,7 +135555,7 @@ var staticRenderFns = []
 
 
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 1014 modules
-var components = __webpack_require__(96718);
+var components = __webpack_require__(15062);
 ;// ./node_modules/_thread-loader@3.0.4@thread-loader/dist/cjs.js!./node_modules/_babel-loader@8.4.1@babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/common/Modals/CorrectionItem.vue?vue&type=script&lang=js
 //
 //
@@ -137774,7 +137788,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /***/ },
 
-/***/ 14314
+/***/ 25327
 (__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -137786,7 +137800,7 @@ __webpack_require__.d(__webpack_exports__, {
   "default": () => (/* binding */ layoutForPaper)
 });
 
-;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/layout/layoutForPaper.vue?vue&type=template&id=c7b2c344&scoped=true
+;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/layout/layoutForPaper.vue?vue&type=template&id=749a2baa&scoped=true
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-spin',{staticClass:"layout layout-input-all-setting",class:{ 'no-border': !_vm.data.config.border, 'save-pdf': _vm.showLine, 'ant-form-noBorder': _vm.data.config.componentsNoBorder },style:({ 'overflow-x': _vm.data.config.layout === 'horizontal' ? 'auto' : 'initial' }),attrs:{"spinning":_vm.formLoading,"tip":_vm.formLoadingTip}},[(_vm.pageLoading && _vm.showLayoutLoading)?_c('div',{class:{ form_skeleton: _vm.pageLoading }},[(_vm.pageLoading)?_c('a-skeleton',{attrs:{"active":"","loading":_vm.pageLoading,"paragraph":{ rows: 12 }}}):_vm._e()],1):_vm._e(),_c('a-form-model',{ref:"Form",attrs:{"hideRequiredMark":true,"model":_vm.models,"rules":_vm.rules,"wrapper-col":{}},on:{"update:rules":function($event){_vm.rules=$event},"validate":_vm.validate}},_vm._l((_vm.widgetList),function(list,listindex){return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.widgetList[0].length > 0),expression:"widgetList[0].length > 0"}],key:listindex,staticClass:"paper",style:(_vm.contentStyle)},[(listindex == 0)?_vm._t("default"):_vm._e(),(listindex == 0)?_c('div',{staticClass:"form-title",style:(Object.assign({}, _vm.formNameStyle))},[_c('span',{staticStyle:{"font-size":"inherit"},domProps:{"innerHTML":_vm._s(_vm.data.config.formNameLeftContent || '')}}),_vm._v(_vm._s(_vm.data.config.formName)),_c('span',{staticStyle:{"font-size":"inherit"},domProps:{"innerHTML":_vm._s(_vm.data.config.formNameRightContent || '')}})]):_vm._e(),(_vm.value && _vm.value.formIndex)?_c('div',{staticStyle:{"text-align":"right","font-weight":"bold"}},[_vm._v(_vm._s(_vm.value.formIndex))]):_vm._e(),(_vm.data.config.pageHeader && listindex === 0)?_c('div',{style:(_vm.data.config.headerHeight),domProps:{"innerHTML":_vm._s(_vm.data.config.pageHeader)}}):_vm._e(),_c('div',{staticClass:"page-border",style:({ borderColor: _vm.data.config.borderColor })},[_vm._l((list),function(widget,index){return [(widget.type == 'table')?[(
                   widget.options.layoutModel === 'auto' ||
                   widget.options.layoutModel === undefined
@@ -137833,15 +137847,15 @@ var staticRenderFns = []
 var layoutForPapervue_type_script_lang_js = __webpack_require__(49218);
 ;// ./src/form/modules/layout/layoutForPaper.vue?vue&type=script&lang=js
  /* harmony default export */ const layout_layoutForPapervue_type_script_lang_js = (layoutForPapervue_type_script_lang_js/* default */.A); 
-;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=1&id=c7b2c344&prod&lang=less&scoped=true
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/_less-loader@5.0.0@less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=1&id=749a2baa&prod&lang=less&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=1&id=c7b2c344&prod&lang=less&scoped=true
+;// ./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=1&id=749a2baa&prod&lang=less&scoped=true
 
-;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=2&id=c7b2c344&prod&lang=css
+;// ./node_modules/_mini-css-extract-plugin@2.10.2@mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/_css-loader@6.11.0@css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@6.2.1@postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=2&id=749a2baa&prod&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=2&id=c7b2c344&prod&lang=css
+;// ./src/form/modules/layout/layoutForPaper.vue?vue&type=style&index=2&id=749a2baa&prod&lang=css
 
 // EXTERNAL MODULE: ./node_modules/_vue-loader@15.11.1@vue-loader/lib/runtime/componentNormalizer.js
 var componentNormalizer = __webpack_require__(64008);
@@ -137861,7 +137875,7 @@ var component = (0,componentNormalizer/* default */.A)(
   staticRenderFns,
   false,
   null,
-  "c7b2c344",
+  "749a2baa",
   null
   
 )
@@ -137943,7 +137957,7 @@ var component = (0,componentNormalizer/* default */.A)(
 
 /* harmony default export */ const CorrectionModal = (component.exports);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 1014 modules
-var components = __webpack_require__(96718);
+var components = __webpack_require__(15062);
 // EXTERNAL MODULE: ./node_modules/_pubsub-js@1.9.5@pubsub-js/src/pubsub.js
 var pubsub = __webpack_require__(15934);
 var pubsub_default = /*#__PURE__*/__webpack_require__.n(pubsub);
@@ -139135,7 +139149,7 @@ var vuedraggable_umd_default = /*#__PURE__*/__webpack_require__.n(vuedraggable_u
 // EXTERNAL MODULE: ./src/api/manage.js
 var manage = __webpack_require__(5335);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 1014 modules
-var components = __webpack_require__(96718);
+var components = __webpack_require__(15062);
 // EXTERNAL MODULE: ./src/form/util/Bus.js
 var Bus = __webpack_require__(31227);
 // EXTERNAL MODULE: ./src/form/modules/config/hnkj.js
@@ -155817,7 +155831,7 @@ function toString(value) {
 (module) {
 
 "use strict";
-module.exports = {"rE":"1.1.707"};
+module.exports = {"rE":"1.1.708"};
 
 /***/ }
 
@@ -169432,7 +169446,7 @@ var SvgIcon_component = (0,componentNormalizer/* default */.A)(
 
 /* harmony default export */ const SvgIcon = (SvgIcon_component.exports);
 // EXTERNAL MODULE: ./src/form/modules/layout/layoutForPaper.vue + 6 modules
-var layoutForPaper = __webpack_require__(14314);
+var layoutForPaper = __webpack_require__(25327);
 // EXTERNAL MODULE: ./src/form/modules/layout/layoutItem.vue + 10 modules
 var layoutItem = __webpack_require__(92241);
 ;// ./node_modules/_vue-loader@15.11.1@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/_vue-loader@15.11.1@vue-loader/lib/index.js??vue-loader-options!./src/form/modules/Container.vue?vue&type=template&id=3c2ba7a1
@@ -170391,7 +170405,9 @@ const advanceComponents = [{
     defaulcanView: true,
     canView: true,
     height: 300,
-    relateOptions: []
+    relateOptions: [],
+    minValue: '',
+    maxValue: ''
   }
 }];
 const layoutComponents = [{
@@ -170894,7 +170910,7 @@ var es_array_unshift = __webpack_require__(7702);
 // EXTERNAL MODULE: ./src/form/util/util.js
 var util_util = __webpack_require__(78393);
 // EXTERNAL MODULE: ./src/form/modules/components/index.js + 1014 modules
-var components = __webpack_require__(96718);
+var components = __webpack_require__(15062);
 // EXTERNAL MODULE: ./src/form/modules/widgetFormItem.vue + 5 modules
 var widgetFormItem = __webpack_require__(62887);
 // EXTERNAL MODULE: ./src/form/modules/WidgetIdeaSignItem.vue + 5 modules
@@ -183271,7 +183287,7 @@ var formula_edit_component = (0,componentNormalizer/* default */.A)(
     }
   },
   components: {
-    layoutForPaper: () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 14314)),
+    layoutForPaper: () => Promise.resolve(/* import() */).then(__webpack_require__.bind(__webpack_require__, 25327)),
     FormulaEdit: formula_edit
   },
   data() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zscreate/form-component",
-  "version": "1.1.707",
+  "version": "1.1.708",
   "private": false,
   "description": "",
   "main": "dist/form-component.umd.js",