tenghui-ui 2.2.11 → 2.2.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tenghui-ui",
-  "version": "2.2.11",
+  "version": "2.2.13",
   "description": "vue 2x, tenghui-ui",
   "files": [
     "dist",

package/packages/form-item/src/index.vue

@@ -209,6 +209,12 @@
 					</el-tree>
 				</el-select>
 			</template>
+			<template v-else-if="type === 'checkbox'">
+				<span v-if="inlineLabel" class="inline_label" :style="{ width: labelWidth }">{{ inlineLabel }}</span>
+				<el-checkbox-group v-model="modelForm" v-bind="setDefaultAttrs($attrs)" v-on="$listeners">
+					<el-checkbox v-for="item in selectOption" :key="item.value" :label="item.value">{{ item.label }}</el-checkbox>
+				</el-checkbox-group>
+			</template>
 		</div>
 	</div>
 </template>
@@ -318,6 +324,7 @@ export default {
 		return {
 			modelForm: this.model,
 			bigOptions: [],
+			staticOptions: [],
 
 			// 特殊处理时使用标识
 			itemFlag: Math.ceil(Math.random() * 10000),
@@ -372,7 +379,9 @@ export default {
 					};
 				});
 			}
+
 			return tempArr;
+			// return [...this.staticOptions.filter(v => !tempArr.some(_v => _v.value == v.value)), ...tempArr];
 		},
 	},
 	created() {

package/packages/search/src/Record.vue

@@ -127,6 +127,11 @@ export default {
             this.$parent.$children.forEach(ref => {
                 const findItem = (item.labels || item).find(v => v.label == ref.label);
                 if (findItem) {
+                    if (Array.isArray(findItem.value)) {
+                        ref.staticOptions.splice(0, ref.staticOptions.length, ...findItem.value.map((v, i) => ({ label: findItem.valueLabel[i], value: v })))
+                    } else {
+                        ref.staticOptions.splice(0, ref.staticOptions.length, ...[{ label: findItem.valueLabel, value: findItem.value }])
+                    }
                     ref.modelForm = findItem.value;
                 } else if (ref.label) {
                     // ref.modelForm = '';

package/packages/search/src/index.vue

@@ -190,9 +190,15 @@ export default {
                     let valueLabel;
                     if (item.options && Object.entries(item.options).length > 0) {
                         if (Array.isArray(item.modelForm)) {
-                            valueLabel = item.modelForm.map(iv => item.selectOption.find(v => v.value == iv)?.label || iv)
+                            valueLabel = item.modelForm.map(iv => [...item.selectOption, ...item.staticOptions].find(v => v.value == iv)?.label || iv)
                         } else {
-                            valueLabel = item.selectOption.find(v => v.value == item.modelForm)?.label || item.modelForm
+                            valueLabel = [...item.selectOption, ...item.staticOptions].find(v => v.value == item.modelForm)?.label || item.modelForm
+                        }
+                    } else {
+                        if (Array.isArray(item.modelForm)) {
+                            valueLabel = item.modelForm.map(iv => item.staticOptions.find(v => v.value == iv)?.label || iv)
+                        } else {
+                            valueLabel = item.staticOptions.find(v => v.value == item.modelForm)?.label || item.modelForm
                         }
                     }